From 931682f926b00cd08154daedb9fa1c78d77e541a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 27 Dec 2014 10:01:17 +1030 Subject: [PATCH] Fixes #7327 --- code/game/objects/items/weapons/RCD.dm | 9 +++++++-- code/game/turfs/simulated/walls.dm | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index fb79d5307f..ff7d010b14 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -1,6 +1,6 @@ //Contains the rapid construction device. /obj/item/weapon/rcd - name = "rapid construction device (RCD)" + name = "rapid construction device" desc = "A device used to rapidly build walls and floors." icon = 'icons/obj/items.dmi' icon_state = "rcd" @@ -23,6 +23,9 @@ var/canRwall = 0 var/disabled = 0 +/obj/item/weapon/rcd/attack() + return 0 + /obj/item/weapon/rcd/examine() ..() if(src.type == /obj/item/weapon/rcd && loc == usr) @@ -96,7 +99,7 @@ else if(deconstruct && istype(T,/turf/simulated/wall)) build_delay = deconstruct ? 50 : 40 build_cost = 5 - build_type = (canRwall && istype(T,/turf/simulated/wall/r_wall)) ? "wall" : null + build_type = (!canRwall && istype(T,/turf/simulated/wall/r_wall)) ? null : "wall" build_turf = /turf/simulated/floor else if(istype(T,/turf/simulated/floor)) build_delay = deconstruct ? 50 : 20 @@ -124,6 +127,8 @@ return 0 working = 0 + if(build_delay && (!user.Adjacent(T) || user.get_active_hand() != src || user.stat || user.restrained())) + return 0 if(build_turf) T.ChangeTurf(build_turf) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index c206c42c82..74149103b3 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -470,6 +470,8 @@ place_poster(W,user) return + else if(istype(W,/obj/item/weapon/rcd)) //I bitterly resent having to write this. ~Z + return else return attack_hand(user) return