From c71e890264ff011c69b068cd366cfb5c05260b76 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Mon, 30 Jan 2017 16:04:21 -0500
Subject: [PATCH] GOOD REPO YES GREAT CONTINUUS INTEGRATION YES YS

---
 code/modules/paperwork/photography.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 00210dbc749..74bebe2561a 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -499,8 +499,8 @@
 	if(istype(I, /obj/item/weapon/photo))
 		if(!displayed)
 			var/obj/item/weapon/photo/P = I
-			user.unEquip(P)
-			P.forceMove(src)
+			if(!user.transferItemToLoc(P, src))
+				return
 			displayed = P
 			update_icon()
 		else
@@ -587,7 +587,8 @@
 	else if(istype(O, /obj/item/weapon/photo))
 		if(!framed)
 			var/obj/item/weapon/photo/P = O
-			user.unEquip(P)
+			if(!user.transferItemToLoc(P, src))
+				return
 			P.forceMove(src)
 			framed = P
 			update_icon()