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
..
AdminbusTab	MapManager warning cleanup client edition (#36766)	2025-05-15 01:38:51 +02:00
AdminTab	Cleanup various admin buttons (#36312)	2025-04-17 03:02:41 +02:00
AtmosTab	Admin UI localization (#29340)	2024-06-22 23:05:33 +10:00
ObjectsTab	Fix admin objects tab (#39832)	2025-08-22 15:37:51 -07:00
PanicBunkerTab	Panic Bunker uses minutes not hours (#28805)	2024-06-09 22:45:47 +02:00
PlayerTab	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
RoundTab.xaml	Add a safety net to the round controls in the Admin window. (#37836)	2025-05-25 22:37:21 -04:00
RoundTab.xaml.cs	Add a safety net to the round controls in the Admin window. (#37836)	2025-05-25 22:37:21 -04:00
ServerTab.xaml	tweak: add confirm to server restart button (#37849)	2025-05-27 19:44:15 -04:00
ServerTab.xaml.cs	tweak: add confirm to server restart button (#37849)	2025-05-27 19:44:15 -04:00