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	БЗ и хилиум (#808)	2024-12-09 22:07:58 +03:00
Events	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-11 18:58:14 +03:00
BasicStationEventSchedulerSystem.cs	Toolshed refactor (#33598)	2024-12-21 17:45:48 +11:00
EventManagerSystem.cs	fix a station event weighting bug (#33584)	2024-12-05 22:52:02 -06:00
RampingStationEventSchedulerSystem.cs	refactor event schedulers to use explicit game rules (#29320)	2024-08-14 15:21:01 +10:00