Vigers Ray 4c5854ea7b Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/_strings/administration/smites.ftl # Resources/Locale/en-US/_strings/reagents/frostoil.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/migration.yml		2025-02-04 04:18:31 +03:00
..
KnockedDownComponent.cs	minor stun refactor (#18752)	2023-08-06 02:19:47 -06:00
SharedStunbatonSystem.cs	ItemToggle system expansion (#22369)	2023-12-24 17:11:05 +11:00
SharedStunSystem.cs	После падения нету автоподнятия	2024-12-31 05:55:08 +03:00
SlowedDownComponent.cs	minor stun refactor (#18752)	2023-08-06 02:19:47 -06:00
StunbatonComponent.cs	Fix stunbaton component namespace (#34790)	2025-01-31 15:43:07 +01:00
StunnedComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
StunOnContactComponent.cs	Goliath mob (#30839)	2024-08-18 12:22:36 -04:00