From 90fcb11d1d88a61d81d34128585563c8f19a409f Mon Sep 17 00:00:00 2001
From: Admiral-Obvious-001
 <89495925+Admiral-Obvious-001@users.noreply.github.com>
Date: Sun, 29 Mar 2026 16:16:24 -0700
Subject: [PATCH 1/2] Enables Auto-Whitelisting (#43349)

* Uncomments whitelist conditions.

* Webedit ops for 30 day leadup for notes
---
 Resources/Prototypes/wizardsDenWhitelists.yml | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/wizardsDenWhitelists.yml b/Resources/Prototypes/wizardsDenWhitelists.yml
index 8b8420622a..51cbd1bc2f 100644
--- a/Resources/Prototypes/wizardsDenWhitelists.yml
+++ b/Resources/Prototypes/wizardsDenWhitelists.yml
@@ -1,4 +1,4 @@
-# This is the whitelist used for Wizard's Den Salamander
+# This is the whitelist used for Wizard's Den Salamander
 
 - type: playerConnectionWhitelist
   id: salamanderMrpWhitelist
@@ -19,21 +19,21 @@
     range: 90 # 90 Days
     action: Deny
     includeSecret: false
-#  - !type:ConditionNotesPlaytimeRange # Deny for >=3 low severity notes in the last 14 days
-#    includeExpired: false
-#    minimumSeverity: 1 # Low
-#    minimumNotes: 3
-#    range: 14 # 14 Days
-#    action: Deny
-#    includeSecret: false
+  - !type:ConditionNotesPlaytimeRange # Deny for >=3 low severity notes in the last 14 days
+    includeExpired: false
+    minimumSeverity: 1 # Low
+    minimumNotes: 3
+    range: 30 # 30 Days
+    action: Deny
+    includeSecret: false
   - !type:ConditionManualWhitelistMembership # Allow whitelisted players
     action: Allow
   - !type:ConditionPlayerCount # Allow when <= 15 players are online
     minimumPlayers: 0
     maximumPlayers: 15
     action: Allow
-  #- !type:ConditionPlaytime
-  #  minimumPlaytime: 1200 # 20 hours to be whitelisted
-  #  action: Deny
+  - !type:ConditionPlaytime
+    minimumPlaytime: 1200 # 20 hours to be whitelisted
+    action: Deny
   - !type:ConditionAlwaysMatch
     action: Deny

From 31a2c1176fad813d2bc0fb61ae6d32db0a16bbe4 Mon Sep 17 00:00:00 2001
From: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
Date: Mon, 30 Mar 2026 00:38:09 +0100
Subject: [PATCH 2/2] Adjust naming rules to allow give any job with a custom
 name leniancy (#43217)

Amend rules, first attempt
---
 .../Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
index 97880466d4..6816570d93 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
@@ -6,7 +6,7 @@
   - Usernames, objects, random characters, very "low effort" names, "meta" names, or otherwise implausible names cannot be used as names. See examples below.
   - Admin rulings on IC names are final and disputes should be done through the forums, not by refusing to comply with an admin
 
-  Clowns and mimes are exempt from the prohibition on titles/honorifics, and have loosened restrictions on low effort and implausible names.
+  Jobs that have a custom name option in the loadout (e.g. clowns, mimes, cyborgs, etc) are exempt from the prohibition on titles/honorifics, and have loosened restrictions on low effort and implausible names.
 
   ## Clarification on "Meta" Names
   Meta names are ones which attempt to take advantage of some game mechanic or game design choice. "Urist McHands" is a meta name because it is the default name used for admin spawned humans. "Operator Whiskey" is a meta name because it follows the naming pattern of nuclear operatives. This rule is not intended to prevent things like nuclear operatives using a fake ID with names that appear to be nuclear operative names if they decide that they want to do that.