[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 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-28 14:44:32 +00:00
committed by GitHub
co-authored by Ryll Ryll Gandalf2k15
parent 3a1315edb7
commit 6a192731eb
5 changed files with 8 additions and 17 deletions
+3 -6
View File
@@ -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]