Vigers Ray a5a2bbd386 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi/meta.json		2025-04-17 06:26:03 +03:00
..
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Managers	Hide some map related logs from clients (#27127)	2024-04-19 15:26:21 +10:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 00:07:59 +03:00
UI	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 06:26:03 +03:00
AdminNameOverlay.cs	Role subtypes (#35359)	2025-04-16 19:04:48 +02: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