NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge stable into master (#43396)

Browse source 
* Enables Auto-Whitelisting (#43349)

* Uncomments whitelist conditions.

* Webedit ops for 30 day leadup for notes

* Adjust naming rules to allow give any job with a custom name leniancy (#43217)

Amend rules, first attempt

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Admiral-Obvious-001 <89495925+Admiral-Obvious-001@users.noreply.github.com>
Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
This commit is contained in:
slarticodefast 2026-03-30 02:03:34 +02:00 • committed by GitHub
commit aa00efccb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Resources/Prototypes/wizardsDenWhitelists.yml
View file

@ -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

2
Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
View file

@ -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.