Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln		2024-08-28 16:40:36 +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' into upstream-sync	2024-08-28 16:40:36 +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