diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 7a65d579b8e..72a94d3086c 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -139,8 +139,9 @@ icon_state = "rainbow" item_state = "rainbowgloves" item_color = "rainbow" - clown - item_color = "clown" + +/obj/item/clothing/gloves/color/rainbow/clown + item_color = "clown" /obj/item/clothing/gloves/color/blue name = "blue gloves" @@ -170,11 +171,11 @@ item_state = "graygloves" item_color="grey" - rd - item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way. +/obj/item/clothing/gloves/color/grey/rd + item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way. - hop - item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way. +/obj/item/clothing/gloves/color/grey/hop + item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way. /obj/item/clothing/gloves/color/light_brown name = "light brown gloves" @@ -190,8 +191,8 @@ item_state = "browngloves" item_color="brown" - cargo - item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way. +/obj/item/clothing/gloves/color/brown/cargo + item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way. /obj/item/clothing/gloves/color/latex name = "latex gloves" @@ -219,8 +220,8 @@ item_state = "wgloves" item_color="mime" - redcoat - item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way. +/obj/item/clothing/gloves/color/white/redcoat + item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way. /obj/item/clothing/gloves/color/captain diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 8dcada2f7e8..2da4ef66ac8 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -52,7 +52,7 @@ if(!ishuman(user)) return TRUE var/mob/living/carbon/human/H = user - if(H.gloves) + if(H.gloves && !H.gloves.transfer_prints) //exclude fingerless gloves, rings, bracers, etc. return TRUE if(PIERCEIMMUNE in H.dna.species.species_traits) return TRUE