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
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
Dispenser	Add limited-reagent dispensers (#23907)	2024-01-17 16:43:48 -05:00
EntitySystems	Fixes debug assertion thrown when spiking with pills (#34813)	2025-02-02 20:38:34 +01:00
Events	Fix formatting IDE0055 warnings in VS Code (#33669)	2024-12-01 12:51:26 +11:00
Reaction	Fix reagents with ReagentData being duplicated (#30983)	2024-08-16 12:47:53 +02:00
Reagent	Better DNA forensics & ReagentData (#26699)	2024-08-09 09:27:27 +10:00
InjectOverTimeEvent.cs	Syringe gun! (#32112)	2024-10-23 00:03:42 +11:00
MetabolismMovespeedModifierSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ReactiveSystem.cs	Turn ReagentEffects into generic EntityEffects (#28168)	2024-06-30 13:43:43 +10:00
SharedChemistryGuideDataSystem.cs	Chem guidebook (#17123)	2023-06-04 15:45:02 -05:00
SharedChemMaster.cs	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
SharedReagentDispenser.cs	Reagent dispenser UI (Again) (#27958)	2024-05-13 17:46:16 -04:00
SharedSolutionHeater.cs	Hotplate overhaul (#17586)	2023-06-24 14:09:24 -04:00
SharedTransferAmount.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
SolutionScannerSystem.cs	Add chemical scanning goggles (#18373)	2023-08-01 15:57:22 -04:00
SolutionVisuals.cs	Added sink (#14348)	2023-06-30 18:10:47 -04:00