Vigers Ray 5d2cdd3f44 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Server/Roles/Jobs/JobSystem.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Entities/Objects/Tools/lighters.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/categories.yml # Resources/Prototypes/Recipes/Lathes/machine_boards.yml # Resources/Prototypes/Species/vox.yml		2025-04-21 08:56:50 +03:00
..
AutoRechargeComponent.cs	Action charges refactor (#33993)	2025-04-18 13:45:48 +10:00
DeleteWithoutChargesComponent.cs	фиксы апстрима	2025-04-19 02:33:41 +03:00
LimitedChargesComponent.cs	Restore LimitedChargesComponent.MaxCharges default value to 3 (#36778)	2025-04-20 12:20:57 -07:00