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
..
alerts.yml	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
categories.yml	Remove AlertType and AlertCategory (#27933)	2024-05-23 22:43:04 -04:00
magboots.yml	Minor alert locale (#22926)	2023-12-24 14:13:02 -05:00
mood.yml	ayo (#545)	2024-10-30 10:42:02 +03:00
ninja.yml	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
revenant.yml	Fix texture sprite specifiers to RSI PNGs (#39783)	2025-08-22 22:21:23 +02:00
rooted.yml	Add Diona rooting (#32782)	2025-06-04 12:52:59 +02:00
vampire.yml	update gargantua abilities	2024-12-12 21:13:35 +02:00