Upstream sync #2785
Merged
Upstream sync #2785
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]>
Co-authored-by: PJBot <[email protected]>
changed description
Co-authored-by: PJBot <[email protected]>
* Modifies label sprites and adds label visuals to closets * Removes redundant GenericVisualizer component
* Christmasift Omega station. * Add cryosleeper to bridge.
Christmasified Packed station.
* mostly done but there's a bug with spawning * RandomGlobalSpawnSpellEvent now actually works * Summon Guns/Magic is working * Added sound, cap gun, and auto pick up * Added all requested changes/fixes from reviews * Halving cooldowns
* butcherable surgery caps * readded cardboard box * butcherable now? * butcherable now? * one day ill figure this out * changed label of hyperzine syringe * removed the thing in hats.yml that wasn't supposed to be here * Update Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml --------- Co-authored-by: slarticodefast <[email protected]>
* Shift Air Alarm sprites to better reflect their direction * Fix two frames of west-facing sprite being one pixel off * Indicate that sprites are no longer exactly tgstation's
Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario
* Changes the Server Worker job icon to a bowtie. * Removes grey from icon to better fit existing art. * Updated ID card sprite. * Edit respective meta.json files.
removed fun
# Conflicts: # .github/labeler.yml # Content.Client/Lobby/UI/CharacterSetupGui.xaml # Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/ServerInfo/Guidebook/Science/Cyborgs.xml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json # Resources/Textures/Structures/Windows/mining.rsi/full.png # Resources/Textures/Structures/Windows/mining.rsi/meta.json # Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png # Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/plasma_window.rsi/full.png # Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/tinted_window.rsi/full.png # Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png # Resources/Textures/Structures/Windows/uranium_window.rsi/full.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/window.rsi/full.png # Resources/Textures/Structures/Windows/window.rsi/meta.json # Resources/Textures/Structures/Windows/window.rsi/window0.png # Resources/Textures/Structures/Windows/window.rsi/window1.png # Resources/Textures/Structures/Windows/window.rsi/window2.png # Resources/Textures/Structures/Windows/window.rsi/window3.png # Resources/Textures/Structures/Windows/window.rsi/window4.png # Resources/Textures/Structures/Windows/window.rsi/window5.png # Resources/Textures/Structures/Windows/window.rsi/window6.png # Resources/Textures/Structures/Windows/window.rsi/window7.png # Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png # Resources/migration.yml
github-actions
bot
added
Status: Needs Review
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.
Описание PR
Почему / Баланс
Технические детали
Медиа
Требования
Критические изменения
Список изменений