[Tweak] Upstream sync #917
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
It's simple. We kill the heisentest
It's simple. We kill the heisentest
* Fix some rounds failing to end due to mind roles Fixes #32791 This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo(). This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set. The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype. I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception. I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix. * At least one maintainer approved this tiny PR without reading it, not naming names.
Fix tech anomaly nexttimer (#32805) Co-authored-by: metalgearsloth <[email protected]>
* fix ninja bomb component check * remove TryGetRole
Fix: Plushies no longer delete items when recycled (#32838) fix Co-authored-by: beck-thompson <[email protected]>
Update submodule This fixes an important memory leak.
Co-authored-by: slarticodefast <[email protected]>
…n-14 into staging
…n-14 into staging
…tem. (#32942) Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
* Add debug messages to traitor activation * more debug
* green * fix material arbitrage * lighter
* Initial commit * Review feedback changes * ProtoId * TempCommit * First attempt to have client alerts * Review changes
* jumpsuit detailening * jumpskirt stuff * meta.json * update meta.json * meta.json fix fix * meta.json fix fix fix
* init * cleanup * Oops! Forgot something * addressing changes * guh * guh 2.0 * some cleanup * all bless the intellicard * Yippee * small locale thing * changes + small bugfix --------- Co-authored-by: slarticodefast <[email protected]>
vape small fix
* Sec Shell Gun Craftability Hotfix * Capital Fix
…on-14 into HotFixtoMaster
Add a check to see the APC is powered before turning the emitter on.
* improve BiomeDunGen * forgot lol * Update DungeonJob.PostGenBiome.cs * Update DungeonJob.PostGenBiome.cs
* Make droppers respect closed/sealed * Combine nested * Optimize conditions a bit
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 203e31c merging into aa350c0 Resources/Textures/Clothing/Back/Backpacks/captain.rsi
Resources/Textures/Clothing/Back/Duffels/captain.rsi
Resources/Textures/Clothing/Back/Satchels/captain.rsi
Resources/Textures/Clothing/Hands/Gloves/captain.rsi
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi
Resources/Textures/Clothing/Head/Hats/capcap.rsi
Resources/Textures/Clothing/Head/Hats/captain.rsi
Resources/Textures/Clothing/Mask/gascaptain.rsi
Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi
Resources/Textures/Interface/Alerts/walking.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.
Крутой апстрим
Лавовый биом экспедиций наконец-то исправлен! (наверное?)
🆑