Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Mindshield/MindShieldSystem.cs # Content.Shared/Gravity/SharedGravitySystem.cs # Content.Shared/Implants/SharedSubdermalImplantSystem.cs # Resources/Locale/en-US/_strings/traits/traits.ftl # Resources/Prototypes/Entities/Clothing/Shoes/misc.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-08-23 23:10:05 +03:00
..
DNAData.cs	Better DNA forensics & ReagentData (#26699)	2024-08-09 09:27:27 +10:00
ReagentData.cs	Allow solutions to store extra reagent data (#19323)	2023-09-05 07:55:10 +10:00
ReagentId.cs	feat: make ReagentId hash by value (#39494)	2025-08-11 15:44:10 -07:00
ReagentPrototype.cs	Cleanup: Un-hardcode reagents standout (#39752)	2025-08-19 10:40:21 -04:00
ReagentQuantity.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-13 14:13:30 +03:00