From d46608590f1fd0657ad563de965513a7c30685c9 Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:49:46 +0800
Subject: [PATCH] Fixes things

---
 code/modules/games/cards.dm    | 6 +++---
 code/modules/power/lighting.dm | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 7efb6460b75..488966a8320 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -252,7 +252,7 @@
 
 /obj/item/pack/attack_self(mob/user as mob)
 	user.visible_message("<span class='notice'>[name] rips open the [src]!</span>", "<span class='notice'>You rips open the [src]!</span>")
-	var/obj/item/cardhand/H = new()
+	var/obj/item/cardhand/H = new(get_turf(user))
 
 	H.cards += cards
 	cards.Cut()
@@ -260,7 +260,7 @@
 	qdel(src)
 
 	H.update_icon()
-	user.put_in_active_hand(H)
+	user.put_in_hands(H)
 
 /obj/item/cardhand
 	name = "hand of cards"
@@ -370,7 +370,7 @@
 	var/datum/playingcard/card = pickablecards[pickedcard]
 
 	var/obj/item/cardhand/H = new(get_turf(src))
-	user.put_in_active_hand(H)
+	user.put_in_hands(H)
 	H.cards += card
 	cards -= card
 	H.parentdeck = parentdeck
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index df12267015f..05a7b4f563c 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -484,7 +484,7 @@
 
 
 	// create a light tube/bulb item and put it in the user's hand
-	var/obj/item/light/L = new light_type()
+	var/obj/item/light/L = new light_type(get_turf(user))
 	L.status = status
 	L.rigged = rigged
 	L.brightness_range = brightness_range
@@ -499,7 +499,7 @@
 	L.update()
 	L.add_fingerprint(user)
 
-	user.put_in_active_hand(L)	//puts it in our active hand
+	user.put_in_hands(L)	//puts it in our active hand
 
 	status = LIGHT_EMPTY
 	update()