Morb0 782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusEffects/job.yml # Resources/Prototypes/StatusEffects/security.yml # Resources/Textures/Decals/bricktile.rsi/white_box.png		2024-04-12 02:17:14 +03:00
..
ConnectionManager.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00
GrantConnectBypassCommand.cs	Add new "grant_connect_bypass" admin command (#26771)	2024-04-09 17:25:21 +02:00