fish-station/Content.Client/Administration
Vigers Ray fba2af74b3 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/labeler.yml
#	.github/workflows/labeler-needsreview.yml
#	.github/workflows/labeler-untriaged.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
#	Resources/Prototypes/tags.yml
#	Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
#	Resources/migration.yml
2024-11-15 14:52:30 +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 Scale text in admin player overlay (#31503) 2024-08-27 16:43:47 +02:00
UI Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-11-15 14:52:30 +03:00
AdminNameOverlay.cs Scale text in admin player overlay (#31503) 2024-08-27 16:43:47 +02:00
QuickDialogSystem.cs make dialog window not evil (#24677) 2024-02-01 23:56:40 +11:00