forked from space-syndicate/space-station-14
# Conflicts: # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Shared/Localizations/ContentLocalizationManager.cs # Resources/Audio/Weapons/Guns/Gunshots/attributions.yml # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml