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
..
Commands	Toolshed refactor (#33598)	2024-12-21 17:45:48 +11:00
Components	Fix replayghost spawning location (#30252)	2024-07-22 20:32:30 +01:00
Events	Add job whitelist system (#28085)	2024-06-01 05:08:31 -07:00
Systems	Фикс спавна за нежелаемые роли	2024-12-13 03:36:48 +03:00
StationConfig.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00