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
..
SharedBloodstreamSystem.cs	Added Hemophilia Trait (#38224)	2025-08-21 03:02:54 +02:00
SharedBodySystem.Body.cs	Обновление хирургии (#1375)	2025-07-08 05:14:23 -04:00
SharedBodySystem.cs	Фиксы апстрима (#2778)	2025-08-15 12:45:53 +03:00
SharedBodySystem.Organs.cs	replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)	2024-08-04 15:38:53 +10:00
SharedBodySystem.Parts.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
SharedInternalsSystem.cs	Use distinct action labels for toggling internals on and off. (#36073)	2025-06-02 13:09:45 +02:00
SharedMetabolizerSystem.cs	Stasis bed cleanup and bugfixes. (#38762)	2025-07-06 02:59:31 +02:00
StomachSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00