From 687ca1e5bc4fbf3dddd79bfe890e2fa268e79fe3 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Tue, 1 Jul 2025 14:37:04 +1000 Subject: [PATCH] DeltaV updated whitelist system (#4010) * DeltaV updated whitelist system * Add whitelist to roles * Clean whitelist slightly * Update whitelist_tiers.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * Update ninja.yml * Fix whitelist for nyano jobs * Update ninja.yml * keep fixing requirements * Make edits as requested * adjust role whitelists and tiers * readd commented antag section * Update prisonguard.yml * account for whitelist fuckery * Update role-whitelist.ftl * Update role-whitelist.ftl Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * Update whitelist_tiers.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * Update security_cadet.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * add guidebook entry * Update newplayer.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * temp comment out whitelist reqs * Update nukeops.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * account for review requests * Update newplayer.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --------- Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../Locale/en-US/_DV/guidebook/guides.ftl | 1 + Resources/Locale/en-US/job/role-whitelist.ftl | 3 +- .../Roles/Jobs/Epistemics/forensicmantis.yml | 1 - .../Roles/Jobs/Security/prisonguard.yml | 1 - .../Prototypes/_DV/Guidebook/newplayer.yml | 4 ++ Resources/Prototypes/_DV/whitelist_tiers.yml | 71 +++++++++++-------- .../Guidebook/_DV/NewPlayer/Whitelist.xml | 6 ++ 7 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 Resources/Prototypes/_DV/Guidebook/newplayer.yml create mode 100644 Resources/ServerInfo/Guidebook/_DV/NewPlayer/Whitelist.xml diff --git a/Resources/Locale/en-US/_DV/guidebook/guides.ftl b/Resources/Locale/en-US/_DV/guidebook/guides.ftl index 02c2a63a9d5..a0f6ab519c1 100644 --- a/Resources/Locale/en-US/_DV/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_DV/guidebook/guides.ftl @@ -26,6 +26,7 @@ guide-entry-deltav-rule-s10 = S10. You resolve conflicts between orders. guide-entry-alert-levels = Alert Levels guide-entry-justice = Justice +guide-entry-whitelist = Whitelist guide-entry-glimmer-creatures = Glimmer Creatures diff --git a/Resources/Locale/en-US/job/role-whitelist.ftl b/Resources/Locale/en-US/job/role-whitelist.ftl index 3149f182b6a..8b722471108 100644 --- a/Resources/Locale/en-US/job/role-whitelist.ftl +++ b/Resources/Locale/en-US/job/role-whitelist.ftl @@ -1 +1,2 @@ -role-not-whitelisted = You are not whitelisted to play this role. +# role-not-whitelisted = You are not whitelisted to play this role. # DeltaV - add further details to whitelist blurb +role-not-whitelisted = To play this role, apply for a whitelist on our Discord or email trianglevee@aol.com diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 969af6df595..ce938715c09 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -14,7 +14,6 @@ supervisors: job-supervisors-rd antagAdvantage: 4 # DeltaV - Protolathe, Psionics, Has an objective item, anomaly stuff, glimmer factor canBeAntag: true # DeltaV - Mantis is no longer a Detective - # whitelistRequired: true access: - Research - Maintenance diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index a4f1af721d7..01d2b4f928f 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -15,7 +15,6 @@ icon: "JobIconPrisonGuard" supervisors: job-supervisors-warden setPreference: true -# whitelistRequired: true access: - Security #- Brig #Delta V: Removed brig access diff --git a/Resources/Prototypes/_DV/Guidebook/newplayer.yml b/Resources/Prototypes/_DV/Guidebook/newplayer.yml new file mode 100644 index 00000000000..585f0dff089 --- /dev/null +++ b/Resources/Prototypes/_DV/Guidebook/newplayer.yml @@ -0,0 +1,4 @@ +- type: guideEntry + id: Whitelist + name: guide-entry-whitelist + text: "/ServerInfo/Guidebook/_DV/NewPlayer/Whitelist.xml" diff --git a/Resources/Prototypes/_DV/whitelist_tiers.yml b/Resources/Prototypes/_DV/whitelist_tiers.yml index e5b7c69574f..3bdd186aa0a 100644 --- a/Resources/Prototypes/_DV/whitelist_tiers.yml +++ b/Resources/Prototypes/_DV/whitelist_tiers.yml @@ -1,55 +1,64 @@ -- type: whitelistTier - id: GreyTier - name: Grey Tier - color: "#c3c3c3" - jobs: - - SalvageSpecialist - - SecurityCadet - - ForensicMantis - - Prisoner - - Gladiator - - Lawyer - - Prosecutor - - Clerk - - Borg - - type: whitelistTier id: BlueTier - name: Blue Tier + name: Command color: "#3498db" jobs: - - CentralCommandOfficial + - ChiefMedicalOfficer + - ChiefEngineer - HeadOfPersonnel - Quartermaster - - ChiefEngineer - - ChiefMedicalOfficer - ResearchDirector - - ChiefJustice + - Warden - type: whitelistTier id: RedTier - name: Red Tier + name: Security color: "#e74c3c" jobs: - - SecurityOfficer - - Warden - - Detective - Brigmedic + - Clerk + - Detective - PrisonGuard + - Prosecutor - SecurityBorg + - SecurityCadet + - SecurityOfficer -- type: whitelistTier - id: PurpleTier - name: Purple Tier - color: "#c000e6" - jobs: - - HeadOfSecurity +# BEGIN COMMENT - removed until functional + +#- type: whitelistTier +# id: PurpleTier +# name: Antagonist Whitelist +# color: "#c000e6" +# jobs: +# - CosmicAntagColossus +# - CosmicAntagCultist +# - Dragon +# - Fugitive +# - InitialInfected +# - ListeningPost +# - Nukeops +# - NukeopsCommander +# - NukeopsMedic +# - ParadoxAnomaly +# - ParadoxClone +# - Recruiter +# - RoboNeuroticist +# - SpaceNinja +# - SynthesisSpecialist +# - Thief +# - Traitor +# - TraitorSleeper + +# END COMMENT - type: whitelistTier id: Gold Tier - name: Gold Tier + name: Gold color: "#e6c200" jobs: - Captain - StationAi + - HeadOfSecurity + - ChiefJustice diff --git a/Resources/ServerInfo/Guidebook/_DV/NewPlayer/Whitelist.xml b/Resources/ServerInfo/Guidebook/_DV/NewPlayer/Whitelist.xml new file mode 100644 index 00000000000..eca64e089f2 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_DV/NewPlayer/Whitelist.xml @@ -0,0 +1,6 @@ + +# Whitelist +A portion of roles on DeltaV servers - primarily [textlink="Security" link="Security"] and [textlink="Command" link="Command"] roles - are locked behind an in-game whitelist; you will not be able to play these roles unless you successfully apply for them. + +For information on the whitelist tiers available and how to apply, please head to the [textlink="whitelisting forum on our Discord" link="https://discord.com/channels/968983104247185448/1387670020376625233"], or the wiki page on whitelisting at [textlink="https://wiki.deltav.gay/view/Whitelist" link="https://wiki.deltav.gay/view/Whitelist"]. +