Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
Electronics	Add door electronics access configuration menu (#17778)	2024-04-01 17:06:13 +11:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
AirlockWireStatus.cs	Holopads (#32711)	2024-12-17 20:18:15 +01:00
DoorEvents.cs	fix airlocks inconsistently auto-closing after unbolting (#33524)	2024-11-25 15:26:54 +11:00