diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 448ea34b5f3..df4e50d63ba 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -211,8 +211,8 @@
 
 	..()
 
-/obj/item/deck/attack_self()
-	shuffle()
+/obj/item/deck/attack_self(mob/user)
+	shuffle(user)
 
 
 /obj/item/deck/verb/verb_shuffle()
@@ -220,10 +220,9 @@
 	set name = "Shuffle"
 	set desc = "Shuffle the cards in the deck."
 	set src in view(1)
-	shuffle()
+	shuffle(usr)
 
-/obj/item/deck/proc/shuffle()
-	var/mob/living/user = usr
+/obj/item/deck/proc/shuffle(mob/user)
 	if (cooldown < world.time - 10) // 15 ticks cooldown
 		var/list/newcards = list()
 		while(cards.len)
diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm
index 4ba7b264981..5489bb05fd5 100644
--- a/code/modules/games/tarot.dm
+++ b/code/modules/games/tarot.dm
@@ -80,8 +80,7 @@
 			P.back_icon = "dark_back_tarot"
 			cards += P
 
-/obj/item/deck/dark_tarot/shuffle()
-	var/mob/living/user = usr
+/obj/item/deck/dark_tarot/shuffle(mob/user)
 	if (cooldown < world.time - 10)
 		var/list/newcards = list()
 		while(cards.len)