From f65ac4fce9b2649a8284e7caa8e52abfae2be350 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 8 Apr 2019 10:49:56 +1000
Subject: [PATCH] Fixes deck of cards bringing up unnecesary prompt when picked
 up

---
 code/modules/games/cards.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index e9b3ae537e4..08d762e0932 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -254,8 +254,9 @@
 
 	return
 
-/obj/item/weapon/deck/verb_pickup(mob/user as mob) // Snowflaked so pick up verb work as intended
-	if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
+/obj/item/weapon/deck/verb_pickup() // Snowflaked so pick up verb work as intended
+	var/mob/user = usr
+	if((istype(user) && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
 		if(!istype(usr, /mob/living/simple_mob))
 			if( !usr.get_active_hand() )		//if active hand is empty
 				var/mob/living/carbon/human/H = user