From 62ddab926fabbe0ef4aba870b9c86ecd56dd0988 Mon Sep 17 00:00:00 2001 From: Firecage Date: Thu, 15 Jan 2015 03:31:56 +0200 Subject: [PATCH 1/3] Fixes amount of mineral gotten from deconstructing tables --- code/game/objects/structures/tables_racks.dm | 22 +++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 30317abac0e..f941a594c07 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -25,6 +25,8 @@ var/framestack = /obj/item/stack/rods var/buildstack = /obj/item/stack/sheet/metal var/busy = 0 + var/buildstackamount = 1 + var/framestackamount = 2 /obj/structure/table/New() ..() @@ -333,8 +335,12 @@ /obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user) if(destroy_type == TBL_DESTROY) - new framestack(src.loc) - new buildstack(src.loc) + var/frameamount = framestack + for(var/i = 1, i <= framestackamount, i++) + new frameamount(get_turf(src)) + var/buildamount = buildstack + for(var/i = 1, i <= buildstackamount, i++) + new buildamount(get_turf(src)) qdel(src) return @@ -343,7 +349,9 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) new frame(src.loc) - new buildstack(src.loc) + var/buildamount = buildstack + for(var/i = 1, i <= buildstackamount, i++) + new buildamount(get_turf(src)) qdel(src) return @@ -351,8 +359,12 @@ user << "Now deconstructing [src]." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 40)) - new framestack(src.loc) - new buildstack(src.loc) + var/frameamount = framestack + for(var/i = 1, i <= framestackamount, i++) + new frameamount(get_turf(src)) + var/buildamount = buildstack + for(var/i = 1, i <= buildstackamount, i++) + new buildamount(get_turf(src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src) return From 7fdd0556bbb502194be651323184ac228729af1b Mon Sep 17 00:00:00 2001 From: Firecage Date: Thu, 15 Jan 2015 17:55:51 +0200 Subject: [PATCH 2/3] Updates to table/table frame deconstruction --- code/game/objects/structures/table_frames.dm | 15 +++++++-------- code/game/objects/structures/tables_racks.dm | 15 +++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 5e4e26cbabd..40a0c409663 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -17,6 +17,8 @@ density = 0 anchored = 0 layer = 2.8 + var/framestack = /obj/item/stack/rods + var/framestackamount = 2 /obj/structure/table_frame/attackby(var/obj/item/I, mob/user) if(istype(I, /obj/item/weapon/wrench)) @@ -24,7 +26,8 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/rods(src.loc) + for(var/i = 1, i <= framestackamount, i++) + new framestack(get_turf(src)) qdel(src) return if(istype(I, /obj/item/stack/sheet/plasteel)) @@ -60,16 +63,12 @@ name = "wooden table frame" desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this." icon_state = "wood_frame" + framestack = /obj/item/stack/sheet/mineral/wood + framestackamount = 2 /obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user) if(istype(I, /obj/item/weapon/wrench)) - user << "Now disassembling [src]." - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - if(do_after(user, 30)) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/sheet/mineral/wood(src.loc) - qdel(src) - return + ..() if(istype(I, /obj/item/stack/sheet/mineral/wood)) var/obj/item/stack/sheet/mineral/wood/W = I user << "Now adding [W] to [src]." diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index f941a594c07..3042fc6c383 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -335,12 +335,10 @@ /obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user) if(destroy_type == TBL_DESTROY) - var/frameamount = framestack for(var/i = 1, i <= framestackamount, i++) - new frameamount(get_turf(src)) - var/buildamount = buildstack + new framestack(get_turf(src)) for(var/i = 1, i <= buildstackamount, i++) - new buildamount(get_turf(src)) + new buildstack(get_turf(src)) qdel(src) return @@ -349,9 +347,8 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) new frame(src.loc) - var/buildamount = buildstack for(var/i = 1, i <= buildstackamount, i++) - new buildamount(get_turf(src)) + new buildstack(get_turf(src)) qdel(src) return @@ -359,12 +356,10 @@ user << "Now deconstructing [src]." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 40)) - var/frameamount = framestack for(var/i = 1, i <= framestackamount, i++) - new frameamount(get_turf(src)) - var/buildamount = buildstack + new framestack(get_turf(src)) for(var/i = 1, i <= buildstackamount, i++) - new buildamount(get_turf(src)) + new buildstack(get_turf(src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src) return From dc602f9d573ca7d242c5ac651d4d35efb08c59a5 Mon Sep 17 00:00:00 2001 From: Firecage Date: Fri, 16 Jan 2015 15:38:31 +0200 Subject: [PATCH 3/3] Indentation fix. How did that single space instead of the tab worl anyway... --- code/game/objects/structures/table_frames.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 40a0c409663..9955c1c7b4b 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -68,7 +68,7 @@ /obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user) if(istype(I, /obj/item/weapon/wrench)) - ..() + ..() if(istype(I, /obj/item/stack/sheet/mineral/wood)) var/obj/item/stack/sheet/mineral/wood/W = I user << "Now adding [W] to [src]."