diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 6773acea106..8b8794348bd 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -146,26 +146,26 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi //Krav Maga Gloves -/obj/item/clothing/gloves/krav_maga - desc = "These gloves can teach you to perform Krav Maga using nanochips." - name = "black gloves" - icon_state = "black" - item_state = "bgloves" +/obj/item/clothing/gloves/color/black/krav_maga + can_be_cut = 0 var/datum/martial_art/krav_maga/style = new -/obj/item/clothing/gloves/krav_maga/equipped(mob/user, slot) +/obj/item/clothing/gloves/color/black/krav_maga/equipped(mob/user, slot) if(!ishuman(user)) return if(slot == slot_gloves) var/mob/living/carbon/human/H = user style.teach(H,1) -/obj/item/clothing/gloves/krav_maga/dropped(mob/user) +/obj/item/clothing/gloves/color/black/krav_maga/dropped(mob/user) if(!ishuman(user)) return var/mob/living/carbon/human/H = user if(H.get_item_by_slot(slot_gloves) == src) style.remove(H) -/obj/item/clothing/gloves/krav_maga/sec//more obviously named, given to sec +/obj/item/clothing/gloves/color/black/krav_maga/sec//more obviously named, given to sec name = "krav maga gloves" + desc = "These gloves can teach you to perform Krav Maga using nanochips." + icon_state = "fightgloves" + item_state = "fightgloves" \ No newline at end of file diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 8802473baee..5482288733b 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -36,6 +36,7 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT burn_state = FIRE_PROOF + var/can_be_cut = 1 /obj/item/clothing/gloves/color/black/hos item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. @@ -45,6 +46,9 @@ /obj/item/clothing/gloves/color/black/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wirecutters)) + if(!can_be_cut) + ..() + return if(icon_state == initial(icon_state)) //only if not dyed user << "You snip the fingertips off of [src]." playsound(user.loc,'sound/items/Wirecutter.ogg', rand(10,50), 1) diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index e5ba014bc8b..5171de38dce 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -40,7 +40,7 @@ Head of Security uniform = /obj/item/clothing/under/rank/head_of_security shoes = /obj/item/clothing/shoes/jackboots suit = /obj/item/clothing/suit/armor/hos/trenchcoat - gloves = /obj/item/clothing/gloves/krav_maga/sec + gloves = /obj/item/clothing/gloves/color/black/krav_maga/sec head = /obj/item/clothing/head/HoS/beret glasses = /obj/item/clothing/glasses/hud/security/sunglasses suit_store = /obj/item/weapon/gun/energy/gun @@ -98,7 +98,7 @@ Warden uniform = /obj/item/clothing/under/rank/warden shoes = /obj/item/clothing/shoes/jackboots suit = /obj/item/clothing/suit/armor/vest/warden - gloves = /obj/item/clothing/gloves/krav_maga/sec + gloves = /obj/item/clothing/gloves/color/black/krav_maga/sec head = /obj/item/clothing/head/warden glasses = /obj/item/clothing/glasses/hud/security/sunglasses r_pocket = /obj/item/device/assembly/flash/handheld @@ -207,7 +207,7 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") belt = /obj/item/device/pda/security ears = /obj/item/device/radio/headset/headset_sec/alt uniform = /obj/item/clothing/under/rank/security - gloves = /obj/item/clothing/gloves/krav_maga/sec + gloves = /obj/item/clothing/gloves/color/black/krav_maga/sec head = /obj/item/clothing/head/helmet/sec suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/jackboots diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 7ed5ea8a069..f8a6c510b68 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 3a85304173d..244c3c21aaa 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ