From 28405c7c2d2bca57265a5f86a714d4fa525fd044 Mon Sep 17 00:00:00 2001
From: Unknown <Sam.Croswell@gmail.com>
Date: Mon, 12 Nov 2018 23:24:52 -0500
Subject: [PATCH] Card Deck Fix

---
 code/modules/games/cards.dm | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 459d8d144f5..a24f947a25a 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -220,24 +220,20 @@
 	if(M.incapacitated() || !Adjacent(M))
 		return
 
-	if(over_object == M)
+	if(over_object == M || istype(over_object, /obj/screen))
 		if(!remove_item_from_storage(M))
 			M.unEquip(src)
-		M.put_in_hands(src)
+		if(over_object != M)
+			switch(over_object.name)
+				if("r_hand")
+					M.put_in_r_hand(src)
+				if("l_hand")
+					M.put_in_l_hand(src)
+		else
+			M.put_in_hands(src)
 
-	else if(istype(over_object, /obj/screen))
-		switch(over_object.name)
-			if("r_hand")
-				if(!remove_item_from_storage(M))
-					M.unEquip(src)
-				M.put_in_r_hand(src)
-			if("l_hand")
-				if(!remove_item_from_storage(M))
-					M.unEquip(src)
-				M.put_in_l_hand(src)
-
-	add_fingerprint(M)
-	usr.visible_message("<span class='notice'>[usr] picks up the deck.</span>")
+		add_fingerprint(M)
+		usr.visible_message("<span class='notice'>[usr] picks up the deck.</span>")
 
 /obj/item/pack
 	name = "Card Pack"