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
..
Marker	Replace obsolete EntityWhitelist IsValid usages (#28465)	2024-06-01 23:10:24 -04:00
Melee	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +03:00
Misc	fix grappling hooks getting bricked (#32738)	2024-10-17 09:32:32 +11:00
Ranged	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
Reflect	Фиксы рефлекта	2024-12-05 14:59:30 +03:00