From 6c158fc4e26d28559ae66259d928ad41c9d7e81b Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 21 Feb 2016 15:22:11 +0200 Subject: [PATCH] Fixes #149 Sanity checks forever. --- code/modules/paperwork/faxmachine.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index b9d8dbed46d..cd5779626a3 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -97,9 +97,12 @@ var/list/sent_faxes = list() //cache for faxes that have been sent by the admins else if(href_list["remove"]) if(copyitem) - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) - usr << "You take \the [copyitem] out of \the [src]." + copyitem.loc = loc + if (get_dist(usr, src) < 2) + usr.put_in_hands(copyitem) + usr << "You take \the [copyitem] out of \the [src]." + else + usr << "You eject \the [copyitem] from \the [src]." copyitem = null updateUsrDialog()