Vigers Ray 5e89b697f6 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Explosion/EntitySystems/ExplosionSystem.cs # Resources/Maps/_Sunrise/Station/marathon.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/GameRules/events.yml # Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json		2025-08-25 03:48:48 +03:00
..
Components	Move HeadstandComponent to Shared (#39377)	2025-08-04 23:00:19 +02:00
Managers	Killed a resolve in ClientAdminManager (#39863)	2025-08-24 00:49:44 +02:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
UI	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
AdminNameOverlay.cs	Stop network serializing prototypes (#38602)	2025-06-26 19:27:23 -04:00
OverlayOptions.cs	Role subtypes (#35359)	2025-04-16 19:04:48 +02:00
QuickDialogSystem.cs	make dialog window not evil (#24677)	2024-02-01 23:56:40 +11:00