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
..
defib.rsi	Add clearer defib cooldowns! (#31251)	2024-12-20 22:26:56 +01:00
defibsmall.rsi	Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720)	2024-10-30 10:15:30 +01:00
defibsyndi.rsi	Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720)	2024-10-30 10:15:30 +01:00
firstaidkits.rsi	Fix license and copyright being swapped in firstaidkits.rsi (#4191)	2021-06-16 15:52:48 +02:00
handheldcrewmonitor.rsi	Revert "Remove handheld crew monitor (#24761)" (#25439)	2024-02-22 22:00:35 +11:00
healing_toolbox.rsi	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00
healthanalyzer.rsi	Remove the blue tint from the health analyzer (#26101)	2024-03-13 22:04:29 -04:00
hypospray.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
implanter.rsi	Added implanter sprite (#20758)	2023-10-18 13:18:54 -04:00
medical.rsi	Added Tourniquets to stop bleeds (#23198)	2024-02-09 17:57:42 -08:00
medipen.rsi	Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720)	2024-10-30 10:15:30 +01:00
Morgue/bodybags.rsi	You can now see paper on crates (with color!) (#26834)	2024-04-14 13:39:02 +10:00
mouth_swab.rsi	replace incorrectly licensed sprites (#13463)	2023-01-14 14:56:11 +11:00
Surgery	Хирургия (#607)	2024-11-13 04:05:51 +03:00
syndi_implanter.rsi	Darken syndicate implanter sprite (#23622)	2024-01-06 11:10:56 -05:00
syndihandheldcrewmonitor.rsi	Revert "Remove handheld crew monitor (#24761)" (#25439)	2024-02-22 22:00:35 +11:00
syndihypo.rsi	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00