From 9f80fbe68b7d23fe6d0ab15e9bc01b1ab29e2775 Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 10 Jun 2019 05:20:54 -0400 Subject: [PATCH] Coloring gloves? Not on my watch! --- code/datums/traits/negative.dm | 2 +- code/modules/clothing/gloves/color.dm | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 0f6d6001c5..43be1fa2a7 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -60,7 +60,7 @@ if("Scientist") heirloom_type = /obj/item/toy/plush/slimeplushie if("Assistant") - heirloom_type = /obj/item/clothing/gloves/color/yellow/cut/family + heirloom_type = /obj/item/clothing/gloves/cut/family if("Chaplain") heirloom_type = /obj/item/camera/spooky/family if("Captain") diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 82cfd84b43..0cd96eaebc 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -32,15 +32,17 @@ . = ..() siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75) -/obj/item/clothing/gloves/color/yellow/cut +/obj/item/clothing/gloves/cut desc = "These gloves would protect the wearer from electric shock.. if the fingers were covered." name = "fingerless insulated gloves" icon_state = "yellowcut" item_state = "yglovescut" siemens_coefficient = 1 permeability_coefficient = 1 + resistance_flags = NONE + transfer_prints = TRUE -/obj/item/clothing/gloves/color/yellow/cut/family +/obj/item/clothing/gloves/cut/family desc = "The old gloves your great grandfather stole from Engineering, many moons ago. They've seen some tough times recently." name = "fingerless insulated gloves" @@ -49,7 +51,7 @@ if(can_be_cut && icon_state == initial(icon_state))//only if not dyed to_chat(user, "You snip the fingertips off of [src].") I.play_tool_sound(src) - new /obj/item/clothing/gloves/color/yellow/cut(drop_location()) + new /obj/item/clothing/gloves/cut(drop_location()) qdel(src) ..() @@ -58,7 +60,7 @@ if(can_be_cut && icon_state == initial(icon_state))//only if not dyed to_chat(user, "You snip the fingertips off of [src].") I.play_tool_sound(src) - new /obj/item/clothing/gloves/color/yellow/cut(drop_location()) + new /obj/item/clothing/gloves/cut(drop_location()) qdel(src) ..()