From e33490d80aa356e5c8970bdff506d374884ca483 Mon Sep 17 00:00:00 2001 From: volas Date: Sat, 30 Nov 2013 23:54:06 +0400 Subject: [PATCH] Fixes: AI won't steal fax, and mice won't flip tables anymore. --- code/WorkInProgress/kilakk/fax.dm | 11 +++++++---- code/game/objects/structures/tables_racks.dm | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/kilakk/fax.dm b/code/WorkInProgress/kilakk/fax.dm index 7ab0440a6b..3ec6df2125 100644 --- a/code/WorkInProgress/kilakk/fax.dm +++ b/code/WorkInProgress/kilakk/fax.dm @@ -84,10 +84,13 @@ if(href_list["remove"]) if(tofax) - tofax.loc = usr.loc - usr.put_in_hands(tofax) - usr << "You take the paper out of \the [src]." - tofax = null + if(!ishuman(usr)) + usr << "You can't do it." + else + tofax.loc = usr.loc + usr.put_in_hands(tofax) + usr << "You take the paper out of \the [src]." + tofax = null if(href_list["scan"]) if (scan) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 16c5be21a8..e5dc20b3e1 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -423,6 +423,8 @@ set desc = "Flips a non-reinforced table" set category = "Object" set src in oview(1) + if(ismouse(usr)) + return if (!can_touch(usr)) return if(!flip(get_cardinal_dir(usr,src)))