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
..
ActiveDoAfterComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
DoAfter.cs	Simplify DoAfterArgs behavior for movement and distance checks (#25226)	2024-03-19 21:09:00 +11:00
DoAfterArgs.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
DoAfterComponent.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
DoAfterEvent.cs	You can now pry multiple tiles at once (#29231)	2024-06-21 00:05:40 +10:00
SharedDoAfterSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
SharedDoAfterSystem.Update.cs	EVENT BASED WEIGHTLESSNESS (#37971)	2025-08-19 14:35:09 -04:00