From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Sun, 2 Mar 2025 06:18:43 +0000 (+1000)
Subject: Merge branch 'master' of ssh://github.com/space-wizards/space-station-14
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=074d06af293f0818a15caea5ee2e452cbefd123b;p=space-station-14.git

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

074d06af293f0818a15caea5ee2e452cbefd123b
diff --cc Resources/Prototypes/Guidebook/rules.yml
index 59ba795359,6bbfbf9174..8e5c34fd57
--- a/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"