From 7cb26893e1905be62b2e320eb05146242f803d4f Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Mon, 31 Jul 2017 19:06:22 -0500
Subject: [PATCH] Redoes how gloves prevent fingerprints

---
 code/game/atoms.dm                            | 7 +++----
 code/modules/clothing/clothing.dm             | 1 +
 code/modules/clothing/gloves/color.dm         | 3 ++-
 code/modules/clothing/gloves/miscellaneous.dm | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e0bf45d97b..3b642ffd2f 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -298,10 +298,9 @@ its easier to just keep the beam vertical.
 
 		//Deal with gloves the pass finger/palm prints.
 		if(!ignoregloves)
-			if(H.gloves != src)
-				if(prob(75) && istype(H.gloves, /obj/item/clothing/gloves/sterile))
-					return 0
-				else if(H.gloves && !istype(H.gloves, /obj/item/clothing/gloves/sterile))
+			if(H.gloves && H.gloves != src)
+				var/obj/item/clothing/gloves/G = H.gloves
+				if(!prob(G.fingerprint_chance))
 					return 0
 
 		//More adminstuffz
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index f55352b76d..04dff36efa 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -184,6 +184,7 @@
 	var/wired = 0
 	var/obj/item/weapon/cell/cell = 0
 	var/overgloves = 0
+	var/fingerprint_chance = 0	//How likely the glove is to let fingerprints through
 	body_parts_covered = HANDS
 	slot_flags = SLOT_GLOVES
 	attack_verb = list("challenged")
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index cd7b38e977..94ed2c9f87 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -86,4 +86,5 @@
 obj/item/clothing/gloves/fingerless
 	desc = "A pair of gloves that don't actually cover the fingers."
 	name = "fingerless gloves"
-	icon_state = "fingerlessgloves"
\ No newline at end of file
+	icon_state = "fingerlessgloves"
+	fingerprint_chance = 100
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 0470717b5c..0c20f37679 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -56,6 +56,7 @@
 	siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
 	permeability_coefficient = 0.01
 	germ_level = 0
+	fingerprint_chance = 25
 //	var/balloonPath = /obj/item/latexballon
 
 //TODO: Make inflating gloves a thing