From 5b627cc763c004fde7a03269df9be07f4516d2ed Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 9 Jul 2015 23:07:28 +0300 Subject: [PATCH 1/2] Fixes #9939 --- code/modules/tables/tables.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 1ee34e9d80..11f2f033b7 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -176,6 +176,10 @@ user << "Plate \the [src] before reinforcing it!" return + if(flipped) + user << "Put \the [src] back in place before reinforcing it!" + return + reinforced = common_material_add(S, user, "reinforc") if(reinforced) update_desc() From 199393576688dff639a338be5c3a859057c0d0f1 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 9 Jul 2015 23:17:06 +0300 Subject: [PATCH 2/2] Fixes #9899 --- code/game/machinery/wall_frames.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 60867d1c2a..b7f98667dc 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -7,6 +7,7 @@ var/build_machine_type var/refund_amt = 2 var/refund_type = /obj/item/stack/material/steel + var/reverse = 0 //if resulting object faces opposite its dir (like light fixtures) /obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) @@ -22,7 +23,12 @@ if (get_dist(on_wall,usr)>1) return - var/ndir = get_dir(on_wall,usr) + var/ndir + if(reverse) + ndir = get_dir(usr,on_wall) + else + ndir = get_dir(on_wall,usr) + if (!(ndir in cardinal)) return @@ -61,6 +67,7 @@ icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" build_machine_type = /obj/machinery/light_construct + reverse = 1 /obj/item/frame/light/small name = "small light fixture frame"