From 6d96a566095e8f0983f580407d8b1c37b856b5bc Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sat, 20 Apr 2019 20:34:10 +0200 Subject: [PATCH 1/2] Unequip jumpsuits by clicking --- code/modules/clothing/clothing.dm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 484151de797..56c0dcaa70e 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -634,31 +634,8 @@ BLIND // can't see anything A.attack_hand(user) return - if(ishuman(usr) && src.loc == user) //make it harder to accidentally undress yourself - return - ..() -/obj/item/clothing/under/MouseDrop(obj/over_object as obj) - if(ishuman(usr)) - //makes sure that the clothing is equipped so that we can't drag it into our hand from miles away. - if(!(src.loc == usr)) - return - if(!( usr.restrained() ) && !( usr.stat ) && ( over_object )) - if(!usr.canUnEquip(src)) - to_chat(usr, "[src] appears stuck on you!") - return - switch(over_object.name) - if("r_hand") - usr.unEquip(src) - usr.put_in_r_hand(src) - if("l_hand") - usr.unEquip(src) - usr.put_in_l_hand(src) - src.add_fingerprint(usr) - return - return - /obj/item/clothing/under/examine(mob/user) ..(user) switch(src.sensor_mode) From c30f360bda59cebc886771f50faf517b3a5063af Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sat, 20 Apr 2019 20:43:50 +0200 Subject: [PATCH 2/2] Remove accessory check, as it does nothing --- code/modules/clothing/clothing.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 56c0dcaa70e..9613ce173af 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -627,15 +627,6 @@ BLIND // can't see anything ..() -/obj/item/clothing/under/attack_hand(mob/user as mob) - //only forward to the attached accessory if the clothing is equipped (not in a storage) - if(accessories.len && src.loc == user) - for(var/obj/item/clothing/accessory/A in accessories) - A.attack_hand(user) - return - - ..() - /obj/item/clothing/under/examine(mob/user) ..(user) switch(src.sensor_mode)