From 27e7dabed7b387ca751b0ad3544a0c6e53c4ed7c Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Thu, 29 Dec 2016 21:46:20 -0500 Subject: [PATCH] Pick up that paper Photocopiers and Fax Machines will now attempt to place the removed source material into the hand of the user... if they are human only. --- code/modules/paperwork/faxmachine.dm | 3 +++ code/modules/paperwork/photocopier.dm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index f06856b6069..6fbd805f6b0 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -110,6 +110,9 @@ var/list/alldepartments = list() if(href_list["paper"]) if(copyitem) copyitem.forceMove(get_turf(src)) + if(ishuman(usr)) + if(!usr.get_active_hand()) + usr.put_in_hands(copyitem) to_chat(usr, "You eject \the [copyitem] from \the [src].") copyitem = null else diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index c32aa4b3979..d333ed1cf47 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -80,6 +80,9 @@ else if(href_list["remove"]) if(copyitem) copyitem.forceMove(get_turf(src)) + if(ishuman(usr)) + if(!usr.get_active_hand()) + usr.put_in_hands(copyitem) to_chat(usr, "You take \the [copyitem] out of \the [src].") copyitem = null updateUsrDialog()