From ad6a4a672202168ff03d9eef6f102bd226f6ff64 Mon Sep 17 00:00:00 2001 From: Swag McYolosteinen Date: Tue, 20 Jan 2015 18:06:50 +0100 Subject: [PATCH] Fixes reversed photocopier wrenching messages & phasing through walls. --- code/modules/paperwork/photocopier.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index e044c689742..8f9bb4c1fc6 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -252,13 +252,16 @@ user << "This cartridge is not yet ready for replacement! Use up the rest of the toner." else if(istype(O, /obj/item/weapon/wrench)) + if(isinspace()) + user << "There's nothing to fasten [src] to!" + return playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You start [anchored ? "wrenching" : "unwrenching"] [src]" + user << "You start [anchored ? "unwrenching" : "wrenching"] [src]" if(do_after(user, 20)) if(gc_destroyed) return + user << "You [anchored ? "unwrench" : "wrench"] [src]." anchored = !anchored - user << "You [anchored ? "wrench" : "unwrench"] [src]." else if(istype(O, /obj/item/weapon/grab)) //For ass-copying. var/obj/item/weapon/grab/G = O @@ -342,6 +345,8 @@ /obj/machinery/photocopier/proc/copier_blocked() if(gc_destroyed) return + if(loc.density) + return 1 for(var/atom/movable/AM in loc) if(AM == src) continue