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
..
Airlocks	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
assembly.rsi
edge_door_hazard.rsi	Firelock temperature and pressure warning lights (#28339)	2025-04-21 18:39:28 -04:00
effects.rsi
MineralDoors	Fun with cardboard! (#37363)	2025-08-06 12:58:07 -04:00
secret_door.rsi	Fix Secret Door Sprites (#37914)	2025-05-30 20:11:48 +02:00
Shutters	Exo Station - Upstream Playtest Version (#33144)	2025-06-15 12:10:22 -07:00
turnstile.rsi	Turnstiles (#36313)	2025-04-24 13:39:40 +02:00
web_door.rsi	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windoors	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00