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
..
ChemicalAmmoSystem.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
FlyBySoundSystem.cs
GunSystem.AutoFire.cs	Changes to "Burst" firemode; Drozd, WT550 and C20-r (#31292)	2024-11-06 15:39:16 +01:00
GunSystem.Ballistic.cs	Implement some field-level deltas (#28242)	2024-12-21 15:54:11 +11:00
GunSystem.Battery.cs	Фикс осмотра урона боеприпасов и указание типа модификатора	2024-12-07 07:38:35 +03:00
GunSystem.Cartridges.cs	Фикс осмотра урона боеприпасов и указание типа модификатора	2024-12-07 07:38:35 +03:00
GunSystem.cs	Ой, бесконечные патроны.	2024-12-07 08:23:03 +03:00
GunSystem.Revolver.cs	Code cleanup: Dirty(Comp) (#26238)	2024-03-19 23:27:02 -04:00
GunSystem.Solution.cs	Implement some field-level deltas (#28242)	2024-12-21 15:54:11 +11:00