Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557)
* nerfs butterfingers, throws in bonus preorder exclusive cancel button * Update debug.dm
This commit is contained in:
committed by
CitadelStationBot
parent
c6f227fc18
commit
49a5a5cddc
@@ -688,10 +688,13 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
|
||||
|
||||
var/dresscode = robust_dress_shop()
|
||||
|
||||
if(!dresscode)
|
||||
return
|
||||
|
||||
SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
for (var/obj/item/I in M.get_equipped_items())
|
||||
qdel(I)
|
||||
if(dresscode)
|
||||
if(dresscode != "Naked")
|
||||
M.equipOutfit(dresscode)
|
||||
|
||||
M.regenerate_icons()
|
||||
@@ -700,7 +703,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
|
||||
message_admins("<span class='adminnotice'>[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode].</span>")
|
||||
|
||||
/client/proc/robust_dress_shop()
|
||||
var/list/outfits = list("Naked","Custom","As Job...")
|
||||
var/list/outfits = list("Cancel","Naked","Custom","As Job...")
|
||||
var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job)
|
||||
for(var/path in paths)
|
||||
var/datum/outfit/O = path //not much to initalize here but whatever
|
||||
@@ -714,7 +717,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
|
||||
if (outfits[dresscode])
|
||||
dresscode = outfits[dresscode]
|
||||
|
||||
if(dresscode == "Naked")
|
||||
if(dresscode == "Cancel")
|
||||
return
|
||||
|
||||
if (dresscode == "As Job...")
|
||||
|
||||
Reference in New Issue
Block a user