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
..
CargoSystem.Bounty.cs	Add history tab to bounty console (#33932)	2025-01-30 09:27:36 -08:00
CargoSystem.cs	feat: now when research is unlocked in console, approver of reasearch is radio-ed too (#31170)	2024-09-03 23:01:38 +10:00
CargoSystem.Orders.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-02-04 04:18:31 +03:00
CargoSystem.Shuttle.cs	upstream	2024-09-16 12:40:23 +03:00
CargoSystem.Telepad.cs	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
PriceGunSystem.cs	Added pricegun sound (#34119)	2025-01-02 17:46:13 +01:00
PricingSystem.cs	.NET 9 forward compatibility changes (#33421)	2024-11-20 11:17:45 +11:00