Upstream20241009 #113
Merged
Upstream20241009 #113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…n, added law boards to AI upload room (space-wizards#32608) * Fixed space-wizards#32443 and space-wizards#30375 * Fixed duplicate ID issue, and added lawboards to resolve space-wizards#32581 * Removed Overlord board and added Crewsimov * Removed invalid UserInterface component
disable auto publish
Add two additional checks to prevent FTLing
…ace-wizards#32428) Extra fun if it's something that can trigger multiple times
…#32423) * Change the syndicate charge to start a timer on signal * Actually add the component in question * Add default link for TimerStart signal
* Update migration.yml * Update Resources/migration.yml Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
removed double walls and cable fucks
engineers forced to do work, sobbing
* fixes for cog * ok fixed that
* Add_Poppy&Lily * Add_FlowerWreath * Add_Headflowers Sprites, meta, prototype * Id_Changes * Changes * Update_Sprite * Desc_Change * Scale_Change * Sprite_Scaling
Fully revert Clown Waddling (revival of space-wizards#29161) A sad day, see space-wizards#29156 for discussion
sec apcs and ai core wiring
…pace-wizards#32429) * Make minibomb explosion resistant and trigger timer on damage * Tune damage behaviour and threshold for minibomb
* add * remove invalids * fix * yes
* Fix cryo locale again * yeep
Update curtains.yml
…pace-wizards#32683) changed punctuation for jobs, added proper capitalization and comma usa
Replace D10 with a D20
* swap omega and delta particle colours * remove upgrade doafter * explicit syndicate chip description * Syndicate CHIMP stealth * fast projectile speed * 10 to 12 shots * buff heat dmg * upgrade chip mentions omega particle * Revert "remove upgrade doafter" This reverts commit 8a32198. * Revert "explicit syndicate chip description" This reverts commit c803c77. * Revert "Syndicate CHIMP stealth" This reverts commit 698a108. * Revert "10 to 12 shots" This reverts commit 858ac03. * Revert "swap omega and delta particle colours" This reverts commit 4c000b2. * Revert "buff heat dmg" This reverts commit 02a8690.
* first commit * Licence fix * rosysyntax licence change (permission granted!) * simplify * Better wording
* initial commit * Delta review
* First commit * increase price by one tc
* Job title localization * Correcting fields
FluffMe
added
the
Maintenance
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Big upstream merge from WizDen master for Oct. 9, 2024