From 6a192731eb83da20d8d4c58c88af7f90f806de6e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 28 Feb 2021 15:44:32 +0100 Subject: [PATCH] [MIRROR] Fixes ERT Briefing Officer Outfit pref (#3664) * Fixes ERT Briefing Officer Outfit pref (#57069) I was dumb in #56345 and committed a suggestion from a maintainer without actually checking what it did, leading to the part where you select what outfit you want in your preferences to not actually let you select an outfit. This also removes the can_be_admin_equipped var from outfit datums, apparently it was supposed to be used for outfits that were only supposed to be spawned in certain ways or some nonsense, but nothing actually used it so bye bye * Fixes ERT Briefing Officer Outfit pref * Update preferences.dm Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Co-authored-by: Gandalf2k15 --- code/datums/outfit.dm | 3 --- code/modules/admin/verbs/debug.dm | 9 +++------ code/modules/client/preferences.dm | 5 ++--- code/modules/clothing/chameleon.dm | 3 +-- .../modules/customization/modules/client/preferences.dm | 5 ++--- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 35d1584d502..8286fa6c4a3 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -108,9 +108,6 @@ /// Any clothing accessory item var/accessory = null - /// Set to FALSE if your outfit requires runtime parameters - var/can_be_admin_equipped = TRUE - /** * extra types for chameleon outfit changes, mostly guns * diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 602aa3366fc..f13c6ddf477 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -534,8 +534,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that for(var/path in paths) var/datum/outfit/O = path //not much to initalize here but whatever - if(initial(O.can_be_admin_equipped)) - outfits[initial(O.name)] = path + outfits[initial(O.name)] = path var/dresscode = input("Select outfit", "Robust quick dress shop") as null|anything in baseoutfits + sortList(outfits) if (isnull(dresscode)) @@ -549,8 +548,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/list/job_outfits = list() for(var/path in job_paths) var/datum/outfit/O = path - if(initial(O.can_be_admin_equipped)) - job_outfits[initial(O.name)] = path + job_outfits[initial(O.name)] = path dresscode = input("Select job equipment", "Robust quick dress shop") as null|anything in sortList(job_outfits) dresscode = job_outfits[dresscode] @@ -562,8 +560,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/list/plasmaman_outfits = list() for(var/path in plasmaman_paths) var/datum/outfit/O = path - if(initial(O.can_be_admin_equipped)) - plasmaman_outfits[initial(O.name)] = path + plasmaman_outfits[initial(O.name)] = path dresscode = input("Select plasmeme equipment", "Robust quick dress shop") as null|anything in sortList(plasmaman_outfits) dresscode = plasmaman_outfits[dresscode] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f9d8231df1e..52d73695770 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1529,9 +1529,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("briefoutfit") var/list/valid_paths = list() - for(var/datum/outfit/iter_outfit in subtypesof(/datum/outfit)) - if(initial(iter_outfit.can_be_admin_equipped)) - valid_paths[initial(iter_outfit.name)] = path + for(var/datum/outfit/outfit_path as anything in subtypesof(/datum/outfit)) + valid_paths[initial(outfit_path.name)] = outfit_path var/new_outfit = input(user, "Choose your briefing officer outfit:", "Game Preference") as null|anything in valid_paths new_outfit = valid_paths[new_outfit] if(new_outfit) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 438ccb4a181..2452c0c0d1e 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -83,8 +83,7 @@ standard_outfit_options = list() for(var/path in subtypesof(/datum/outfit/job)) var/datum/outfit/O = path - if(initial(O.can_be_admin_equipped)) - standard_outfit_options[initial(O.name)] = path + standard_outfit_options[initial(O.name)] = path sortTim(standard_outfit_options, /proc/cmp_text_asc) outfit_options = standard_outfit_options diff --git a/modular_skyrat/modules/customization/modules/client/preferences.dm b/modular_skyrat/modules/customization/modules/client/preferences.dm index f38c259c615..d798e4b28ca 100644 --- a/modular_skyrat/modules/customization/modules/client/preferences.dm +++ b/modular_skyrat/modules/customization/modules/client/preferences.dm @@ -2345,9 +2345,8 @@ GLOBAL_LIST_INIT(food, list( if("briefoutfit") var/list/valid_paths = list() - for(var/datum/outfit/iter_outfit in subtypesof(/datum/outfit)) - if(initial(iter_outfit.can_be_admin_equipped)) - valid_paths[initial(iter_outfit.name)] = path + for(var/datum/outfit/outfit_path as anything in subtypesof(/datum/outfit)) + valid_paths[initial(outfit_path.name)] = outfit_path var/new_outfit = input(user, "Choose your briefing officer outfit:", "Game Preference") as null|anything in valid_paths new_outfit = valid_paths[new_outfit] if(new_outfit)