From 8587ee9550f017c87cb992ed676f10eb4b3f25b1 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 24 Sep 2013 19:00:50 -0400 Subject: [PATCH] Fix the eternal snipping bug --- code/modules/clothing/gloves/stungloves.dm | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm index ea3dd1dc3f4..0aa5e3e0168 100644 --- a/code/modules/clothing/gloves/stungloves.dm +++ b/code/modules/clothing/gloves/stungloves.dm @@ -33,25 +33,28 @@ user << "[src] already have a cell." else if(istype(W, /obj/item/weapon/wirecutters)) - if("exclude" in species_restricted) - name = "mangled [name]" - species_restricted -= "Unathi" - species_restricted -= "Tajaran" - species_restricted += "stunglove" + wired = null - wired = null - - if(cell) - cell.updateicon() - cell.loc = get_turf(src.loc) - cell = null + if(cell) + cell.updateicon() + cell.loc = get_turf(src.loc) + cell = null + if(clipped == 0) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("\red [user] snips the fingertips off [src].","\red You snip the fingertips off [src].") - + clipped = 1 + if("exclude" in species_restricted) + name = "mangled [name]" + desc = "[desc] They have had the fingertips cut off of them." + species_restricted -= "Unathi" + species_restricted -= "Tajaran" + species_restricted += "stunglove" + else if(clipped == 1) + user << "[src] have already been clipped!" update_icon() - return + return if(cell) cell.updateicon()