From 5e54f3810352b819b740db8a23c62a697b430dbd Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 28 Jul 2016 23:58:25 -0400 Subject: [PATCH 1/2] FOOOOOOOOOOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXX --- code/modules/clothing/clothing.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index afc11b0acf8..466f01b27db 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -179,6 +179,7 @@ BLIND // can't see anything attack_verb = list("challenged") var/transfer_prints = FALSE var/pickpocket = 0 //Master pickpocket? + var/clipped = 0 strip_delay = 20 put_on_delay = 40 species_fit = list("Vox") @@ -190,6 +191,21 @@ BLIND // can't see anything /obj/item/clothing/gloves/proc/Touch() return +/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/weapon/wirecutters)) + if(!clipped) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + user.visible_message("[user] snips the fingertips off [src].","You snip the fingertips off [src].") + clipped = 1 + name = "mangled [name]" + desc = "[desc] They have had the fingertips cut off of them." + update_icon() + else + to_chat(user, "[src] have already been clipped!") + return + else + ..() + /obj/item/clothing/under/proc/set_sensors(mob/user as mob) var/mob/M = user if(istype(M, /mob/dead/)) return From 0cb31c70c271fa7023126e3ac7e223a30bb70b15 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 29 Jul 2016 18:05:48 -0400 Subject: [PATCH 2/2] Mangled fingerless gloves or fethas attempts to address black gloves --- code/modules/clothing/gloves/color.dm | 1 + code/modules/clothing/gloves/miscellaneous.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 76bfbdfd394..2d8878af829 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -80,6 +80,7 @@ if(pickpocket) F.pickpocket = 1 qdel(src) + return ..() /obj/item/clothing/gloves/color/orange diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index feae32b9085..2b265c06751 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -9,6 +9,7 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT strip_delay = 40 put_on_delay = 20 + clipped = 1 /obj/item/clothing/gloves/cyborg desc = "beep boop borp"