From 41b638bd334a777709f1f7f218816e2c8e44c625 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Sat, 21 Sep 2019 21:34:08 +0200
Subject: [PATCH 1/3] Gloves stuff

---
 code/modules/clothing/gloves/color.dm    | 21 +++++++++++----------
 code/modules/hydroponics/grown/nettle.dm |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

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

From 8bd7ad4adb33933f72bf251d766a7ca8a6fcc462 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Sat, 21 Sep 2019 22:32:49 +0200
Subject: [PATCH 2/3] derp, remember to test your code, kids

---
 code/modules/hydroponics/grown/nettle.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 2da4ef66ac8..3f4b56a6f25 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -52,8 +52,10 @@
 	if(!ishuman(user))
 		return TRUE
 	var/mob/living/carbon/human/H = user
-	if(H.gloves && !H.gloves.transfer_prints) //exclude fingerless gloves, rings, bracers, etc.
-		return TRUE
+	if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves))
+		var/obj/item/clothing/gloves/G = H.gloves //exclude fingerless gloves, rings, bracers, etc.
+		if(!G.transfer_prints)
+			return TRUE
 	if(PIERCEIMMUNE in H.dna.species.species_traits)
 		return TRUE
 	var/organ = ((H.hand ? "l_":"r_") + "arm")

From 5961a9898cb8625f86ff207c9b341384670b09ff Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Sun, 22 Sep 2019 06:27:56 +0200
Subject: [PATCH 3/3] removes nettle stuff

---
 code/modules/hydroponics/grown/nettle.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 3f4b56a6f25..8dcada2f7e8 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -52,10 +52,8 @@
 	if(!ishuman(user))
 		return TRUE
 	var/mob/living/carbon/human/H = user
-	if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves))
-		var/obj/item/clothing/gloves/G = H.gloves //exclude fingerless gloves, rings, bracers, etc.
-		if(!G.transfer_prints)
-			return TRUE
+	if(H.gloves)
+		return TRUE
 	if(PIERCEIMMUNE in H.dna.species.species_traits)
 		return TRUE
 	var/organ = ((H.hand ? "l_":"r_") + "arm")