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
..
Pools	New mid pop station: Loop (#33697)	2024-12-19 02:38:22 -07:00
amber.yml	Amber Station - Added Evac Shuttle (#33743)	2024-12-06 01:39:25 -07:00
arenas.yml	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
bagel.yml	let bagel be played at max pop (#33769)	2024-12-07 14:24:16 -07:00
box.yml	boxstation AI update (#31771)	2024-09-03 00:29:26 -06:00
centcomm.yml	Тразитный хаб и играбельное ЦК (#51)	2024-06-09 16:39:56 +03:00
cog.yml	Updated cog (Maints edition) (#31935)	2024-09-07 13:58:16 -06:00
core.yml	Update Core (#31774)	2024-09-03 00:46:47 -06:00
debug.yml	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
fland.yml	fland update (#31803)	2024-09-03 14:05:52 -06:00
gate.yml	Gate map (#32032)	2024-12-17 13:06:33 +03:00
loop.yml	New mid pop station: Loop (#33697)	2024-12-19 02:38:22 -07:00
marathon.yml	marathon update (#31804)	2024-09-03 14:06:00 -06:00
meta.yml	Meta (#31785)	2024-09-03 04:05:44 -06:00
oasis.yml	upstream	2024-09-16 12:40:23 +03:00
omega.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-21 06:29:09 +03:00
packed.yml	packed update (#31807)	2024-09-03 14:08:27 -06:00
reach.yml	Adds a salvage jobspawn to reach (#31712)	2024-09-01 22:37:02 -06:00
saltern.yml	Fixing Botanist role numbers in various stations - V2 (#29581)	2024-07-21 01:23:27 -06:00
salvage.yml	anonymize salvage wrecks (#31087)	2024-08-17 15:09:21 +10:00
train.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-17 17:27:37 +03:00