Merge branch 'master' of ssh://github.com/space-wizards/space-station-14

diff --cc Content.Shared/Localizations/ContentLocalizationManager.cs
Simple merge

diff --cc Resources/Prototypes/Guidebook/rules.yml
index 59ba795359d4407f5c7f57b3c39fc4d8a14f4ec3,6bbfbf91741b5c4603f3708b584d593d4cfb4c57..8e5c34fd57d285b4a4cb748b1679199cfc98ed6a
--- 1/Resources/Prototypes/Guidebook/rules.yml
--- 2/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@@ -427,11 -376,4 +376,10 @@@
    id: BanDurations
    name: guide-entry-rules-ban-durations
    ruleEntry: true
-   priority: 100
    text: "/ServerInfo/Guidebook/ServerRules/BanDurations.xml"
 +
 +- type: guideEntry
 +  id: SMoARuleset
 +  name: guide-entry-rules-SMoA
 +  ruleEntry: true
 +  text: "/ServerInfo/Guidebook/ServerRules/PR.xml"