From c02574c8c7c1777bb358939d06c3d331c7b31299 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 19 Sep 2014 20:04:20 -0400 Subject: [PATCH] Removes stungloves --- baystation12.dme | 1 - code/modules/clothing/clothing.dm | 18 ++++++++++++++++++ code/modules/clothing/gloves/boxing.dm | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index 3f02c6ad164..3076131096d 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -758,7 +758,6 @@ #include "code\modules\clothing\gloves\color.dm" #include "code\modules\clothing\gloves\miscellaneous.dm" #include "code\modules\clothing\gloves\ninja.dm" -#include "code\modules\clothing\gloves\stungloves.dm" #include "code\modules\clothing\head\collectable.dm" #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\helmet.dm" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index fd04046e254..9bd9e779c3c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -199,6 +199,24 @@ BLIND // can't see anything /obj/item/clothing/gloves/proc/Touch(var/atom/A, var/proximity) return 0 // return 1 to cancel attack_hand() +/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user) + if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + if (clipped) + user << "The [src] have already been clipped!" + update_icon() + return + + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + user.visible_message("\red [user] cuts the fingertips off of the [src].","\red You cut the fingertips off of the [src].") + + clipped = 1 + name = "mangled [name]" + desc = "[desc]
They have had the fingertips cut off of them." + if("exclude" in species_restricted) + species_restricted -= "Unathi" + species_restricted -= "Tajaran" + return + //Head /obj/item/clothing/head name = "head" diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index 0865c31e942..02a34b41928 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -4,6 +4,12 @@ icon_state = "boxing" item_state = "boxing" +/obj/item/clothing/gloves/boxing/attackby(obj/item/weapon/W, mob/user) + if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + user << "That won't work." //Nope + return + ..() + /obj/item/clothing/gloves/boxing/green icon_state = "boxinggreen" item_state = "boxinggreen"