Ghostrole Whitelist Cleanup (#14064)

This commit is contained in:
Werner
2022-05-23 12:43:28 +02:00
committed by GitHub
parent 39a114c7ec
commit a61e7d63cb
9 changed files with 43 additions and 25 deletions

View File

@@ -22,8 +22,6 @@
var/count = 0 //How ofen has this spawner been used
var/req_perms = null //What permission flags are required to use this spawner
var/req_perms_edit = R_ADMIN
var/req_head_whitelist = FALSE //If a head of staff whitelist is required
var/req_species_whitelist = null //Name/Datum of the species whitelist that is required, or null
var/enabled = TRUE //If the spawnpoint is enabled
var/enable_chance = null //If set to a value other than null, has the set chance to become enabled
var/enable_dmessage = TRUE //The message to send to deadchat if the ghostspawner is enabled or TRUE for a default message
@@ -63,17 +61,10 @@
if(loc_type == GS_LOC_ATOM && !length(spawn_atoms))
return "No spawn atoms available"
if(req_head_whitelist && !check_whitelist(user))
return "Missing Head of Staff Whitelist"
var/ban_reason = jobban_isbanned(user,jobban_job)
if(jobban_job && ban_reason)
return "[ban_reason]"
if(req_species_whitelist)
if(!is_alien_whitelisted(user, req_species_whitelist))
return "Missing Species Whitelist"
if(observers_only && !isobserver(user))
return "Observers Only"

View File

@@ -28,8 +28,6 @@
name = "Kataphract-Hopeful Klaxan"
desc = "Display honour in everything you do. Be an excellent person. Learn how to be a proper Kataphract by your fellow Unathi."
max_count = 1
uses_species_whitelist = TRUE
req_species_whitelist = SPECIES_VAURCA_WARRIOR
spawnpoints = list("kataphract_klax")
@@ -42,8 +40,6 @@
name = "Kataphract Knight"
desc = "Display honour in everything you do. Be an excellent person. Be a co-leader of the Kataphract Chapter, along with the other knight."
max_count = 2
uses_species_whitelist = TRUE
req_species_whitelist = SPECIES_UNATHI
mob_name_prefix = "Saa "

View File

@@ -18,7 +18,6 @@
special_role = "Kosmostrelki"
respawn_flag = null
extra_languages = list(LANGUAGE_SIIK_MAAS)
uses_species_whitelist = FALSE
away_site = TRUE
/datum/ghostspawner/human/pra_cosmonaut/commissar
@@ -33,7 +32,6 @@
outfit = /datum/outfit/admin/pra_cosmonaut/commissar
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
req_species_whitelist = SPECIES_TAJARA
/datum/outfit/admin/pra_cosmonaut
name = "Kosmostrelki"

View File

@@ -37,7 +37,5 @@
max_count = 1
outfit = /datum/outfit/admin/ert/fsf/synth
mob_name_prefix = null
uses_species_whitelist = TRUE
req_species_whitelist = SPECIES_IPC
possible_species = list(SPECIES_IPC)

View File

@@ -22,10 +22,8 @@
mob_name_prefix = "Alm."
max_count = 1
uses_species_whitelist = TRUE
outfit = /datum/outfit/admin/ert/pra_cosmonaut/commissar
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
req_species_whitelist = SPECIES_TAJARA
/datum/ghostspawner/human/ert/pra_cosmonaut/leader
@@ -70,4 +68,4 @@
max_count = 1
outfit = /datum/outfit/admin/ert/pra_cosmonaut/engineer
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)

View File

@@ -20,8 +20,6 @@
max_count = 1
outfit = /datum/outfit/admin/ert/kataphract/klax
mob_name_prefix = "Zosaa "
uses_species_whitelist = TRUE
req_species_whitelist = SPECIES_VAURCA_WARRIOR // Kataphract K'lax would be more difficult
possible_species = list(SPECIES_VAURCA_WARRIOR)
extra_languages = list(LANGUAGE_VAURCA)

View File

@@ -18,7 +18,6 @@
assigned_role = "Zeng-Hu Survivor"
special_role = "Zeng-Hu Survivor"
respawn_flag = null
uses_species_whitelist = TRUE
/datum/outfit/admin/zenghu_survivor
name = "Zeng-Hu Employee"

View File

@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Arrow768
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- backend: "Removes the \"inbuilt\ whitelist handling of the ghost roles. -> That is changed via config."

View File

@@ -15,7 +15,6 @@
special_role = "Grand Romanovich Host"
respawn_flag = null
req_species_whitelist = SPECIES_TAJARA
extra_languages = list(LANGUAGE_SIIK_MAAS)
/datum/outfit/admin/grand_romanovich_host
@@ -138,4 +137,4 @@
/datum/outfit/admin/random/casino_patron
l_ear = /obj/item/device/radio/headset/ship
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1)
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1)