Vigers Ray 0c1e15e516 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Info/LinkBanner.cs # Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl # Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml		2024-11-26 17:50:59 +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-26 17:50:59 +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