Merge Stable 16/10/24 #440
Merged
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
Add two additional checks to prevent FTLing
…2428) Extra fun if it's something that can trigger multiple times
* 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 <[email protected]> --------- Co-authored-by: lzk <[email protected]>
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 #29161) A sad day, see #29156 for discussion
sec apcs and ai core wiring
…#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
…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 8a321980b7a384daca06215656494e0c116e7333. * Revert "explicit syndicate chip description" This reverts commit c803c773739a61fc5b3a6cb90810622a6d5846c9. * Revert "Syndicate CHIMP stealth" This reverts commit 698a108580892addabf8d51494a72e1ee651b8e6. * Revert "10 to 12 shots" This reverts commit 858ac0392be0549eb0a288648413d1020cabae1a. * Revert "swap omega and delta particle colours" This reverts commit 4c000b2f110a5d35f317cb61cb5b03ea32841ad5. * Revert "buff heat dmg" This reverts commit 02a8690dafbd41631b098e51ef9afba5b6ee6ac4.
|
RSI Diff Bot; head commit d7bd224 merging into 302f8c2 Resources/Textures/Clothing/Head/Misc/hairflower.rsi
Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi
|
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.
No description provided.