From 98293e1aa97af21f64301cbb1ea206296090f64d Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sat, 12 Oct 2024 16:43:13 +0200
Subject: [PATCH] gunshot residue should only be on clothing/human (#16446)

* should only be on clothing

* .
---
 code/modules/pda/pda.dm                     | 2 --
 code/modules/projectiles/guns/projectile.dm | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index 1d4c860136e..f279b415200 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -79,8 +79,6 @@ var/global/list/obj/item/pda/PDAs = list()
 	var/list/notifying_programs = list()
 	var/retro_mode = 0
 
-	var/gunshot_residue // VOREstation edit: prevents wrist PDA from preventing gun use
-
 /obj/item/pda/examine(mob/user)
 	. = ..()
 	if(Adjacent(user))
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 20fb358a741..77d0f56bc1f 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -86,7 +86,7 @@
 	if(chambered.leaves_residue)
 		var/mob/living/carbon/human/H = loc
 		if(istype(H))
-			if(!H.gloves)
+			if(!istype(H.gloves, /obj/item/clothing))
 				H.gunshot_residue = chambered.caliber
 			else
 				var/obj/item/clothing/G = H.gloves