From 49a5a5cddcd1caa8620c7c07750ddadce37e8344 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 19 Jan 2018 15:15:14 +0000 Subject: [PATCH] Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557) * nerfs butterfingers, throws in bonus preorder exclusive cancel button * Update debug.dm --- code/modules/admin/verbs/debug.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 9eff4d8bc7..e038f1ca38 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -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("[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode].") /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...")