From 26b8eb33fd56e9126593132aa27c40b89c3e1344 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 May 2012 23:25:35 +0300 Subject: [PATCH] Minor stuff for photos Making copiers copy them properly New photos will appear in your hand, rather than on the ground --- code/WorkInProgress/Ported/Bureaucracy/copier.dm | 2 +- code/game/objects/items/weapons/cameras.dm | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/WorkInProgress/Ported/Bureaucracy/copier.dm b/code/WorkInProgress/Ported/Bureaucracy/copier.dm index 0e6911c6b6e..8808e605ffa 100644 --- a/code/WorkInProgress/Ported/Bureaucracy/copier.dm +++ b/code/WorkInProgress/Ported/Bureaucracy/copier.dm @@ -134,7 +134,7 @@ P.name = template.name P.desc = template.desc P.icon = template.icon - P.img = template.img + P.img = template:img sleep(30) job_num_copies -= 1 diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm index a4f12d5b597..6dc9aad252f 100644 --- a/code/game/objects/items/weapons/cameras.dm +++ b/code/game/objects/items/weapons/cameras.dm @@ -193,7 +193,10 @@ y_c-- x_c = x_c - 3 - var/obj/item/weapon/photo/P = new/obj/item/weapon/photo( get_turf(src) ) + var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() + P.loc = usr.loc + if(!user.get_inactive_hand()) + usr.put_in_inactive_hand(P) var/icon/small_img = icon(temp) var/icon/ic = icon('items.dmi',"photo") small_img.Scale(8,8)