From ee9814465c5e9e10300f90493d5460ea3a8b9205 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Tue, 13 Sep 2016 17:11:57 -0400 Subject: [PATCH] Fixes a bit of brasscode --- code/game/machinery/doors/windowdoor.dm | 9 ++------- code/game/objects/structures/tables_racks.dm | 1 + code/game/objects/structures/window.dm | 9 +++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5c4c0435d3f..50edc96d054 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -346,17 +346,12 @@ /obj/machinery/door/window/clockwork/New(loc, set_dir) ..() - if(set_dir) - var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/door/window, get_turf(src)) - setDir(set_dir) - E.setDir(set_dir) - made_glow = TRUE - debris += new/obj/item/stack/sheet/brass(src) + debris += new/obj/item/stack/sheet/brass(src, 2) change_construction_value(2) /obj/machinery/door/window/clockwork/setDir(direct) if(!made_glow) - var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/window/single, get_turf(src)) + var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/door/window, get_turf(src)) E.setDir(direct) made_glow = TRUE ..() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 1d452fdc76c..9a9e11d2091 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -391,6 +391,7 @@ icon = 'icons/obj/smooth_structures/brass_table.dmi' icon_state = "brass_table" frame = /obj/structure/table_frame/brass + framestack = /obj/item/stack/sheet/brass buildstack = /obj/item/stack/sheet/brass framestackamount = 1 buildstackamount = 1 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index efcc4ec6499..9b076bcd5c2 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -516,19 +516,20 @@ /obj/structure/window/reinforced/clockwork/New(loc, direct) ..() + for(var/obj/item/I in debris) + debris -= I + qdel(I) if(!fulltile) if(direct) var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/window/single, get_turf(src)) setDir(direct) E.setDir(direct) made_glow = TRUE + debris += new/obj/item/stack/sheet/brass(src, 1) else PoolOrNew(/obj/effect/overlay/temp/ratvar/window, get_turf(src)) made_glow = TRUE - for(var/obj/item/I in debris) - debris -= I - qdel(I) - debris += new/obj/item/stack/sheet/brass(src) + debris += new/obj/item/stack/sheet/brass(src, 2) change_construction_value(fulltile ? 3 : 2) /obj/structure/window/reinforced/clockwork/setDir(direct)