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
..
BluespaceLockerSystem.cs	Clean up all missing EntitySystem proxy method uses (#38353)	2025-06-26 16:50:49 -07:00
CursedEntityStorageSystem.cs	Storage warnings cleanup (#36196)	2025-04-18 13:47:17 +10:00
EntityStorageSystem.cs	predict morgue and crematorium (#39293)	2025-08-21 16:49:50 -07:00
ItemCounterSystem.cs	Clean up all missing EntitySystem proxy method uses (#38353)	2025-06-26 16:50:49 -07:00
ItemMapperSystem.cs
SpawnItemsOnUseSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
SpawnTableOnUseSystem.cs	UseInHandEvent cleanup (#35231)	2025-02-18 23:27:30 +11:00
StorageSystem.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
StorageSystem.Fill.cs	Fix storage fill giving no reason for failing (#27122)	2024-04-18 23:24:13 -04:00