From b76e6050c1f4e17f5e28cbaf3a8f9d9880855dac Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Fri, 6 Dec 2019 00:14:28 -0600 Subject: [PATCH 01/10] Panel open sprites for the Stacking machine and the stacking unit console --- icons/obj/machines/mining_machines.dmi | Bin 4139 -> 4500 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 28d608125d70aac951964a6b3b9832d9fa03db02..b9e79adcddb9dd3a32c4e4506dc91a08e7327bef 100644 GIT binary patch delta 4238 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 A?*IS* From 07e8a842de4e8cc7a4e04c6b4c55d4bfcd05e3ca Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Fri, 6 Dec 2019 00:14:51 -0600 Subject: [PATCH 02/10] Reworked stacking machines --- code/modules/mining/machine_stacking.dm | 59 ++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 2392d22bdb2d..6dbad4f59c99 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -61,6 +61,12 @@ src.updateUsrDialog() return +/obj/machinery/mineral/stacking_unit_console/attackby(obj/item/W, mob/user, params) + if(default_deconstruction_screwdriver(user, "console-open", "console", W)) + updateUsrDialog() + return + if(default_deconstruction_crowbar(W)) + return /**********************Mineral stacking unit**************************/ @@ -81,6 +87,18 @@ var/stack_amt = 50 //amount to stack before releassing var/datum/component/remote_materials/materials var/force_connect = FALSE + var/io = 0 //This is used for determining whether we change the Input or Output + +/obj/machinery/mineral/stacking_machine/examine(mob/user) + . = ..() + . += "Currently outputting stacks at [stack_amt] sheets" + if(panel_open) + . += {"The I/O is set to change [io ? "output" : "input"] currently. +Input is [dir2text(input_dir)] +Output is [dir2text(output_dir)] +There is a dial that can be turned by hand to change direction. +The I/O setting can be changed with a multitool to change what the dial controls +There are some bolts to limit stack size."} /obj/machinery/mineral/stacking_machine/Initialize(mapload) . = ..() @@ -88,16 +106,54 @@ materials = AddComponent(/datum/component/remote_materials, "stacking", mapload, FALSE, mapload && force_connect) /obj/machinery/mineral/stacking_machine/HasProximity(atom/movable/AM) + if(panel_open || !powered()) + return if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir)) process_sheet(AM) /obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M) if(istype(M)) - if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console)) + if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console) && !panel_open) CONSOLE = M.buffer CONSOLE.machine = src to_chat(user, "You link [src] to the console in [M]'s buffer.") return TRUE + if(panel_open) + io = !io + to_chat(user, "You set the I/O to change [io ? "output" : "input"].") + return TRUE + +/obj/machinery/mineral/stacking_machine/attack_hand(mob/user) + if(panel_open &&(io == 0)) + input_dir = turn(input_dir, -90) + if(input_dir == output_dir) //Input and output can't be the same or you create the immovable sheet. + input_dir = turn(input_dir, -90) + to_chat(user, "You set [src]'s input to take from the [dir2text(input_dir)].") + return + else if (panel_open && (io == 1)) + output_dir = turn(output_dir, -90) + if(input_dir == output_dir) + output_dir = turn(output_dir, -90) + to_chat(user, "You set [src]'s output to drop stacks [dir2text(output_dir)].") + return + return TRUE + + +/obj/machinery/mineral/stacking_machine/wrench_act(mob/living/user, obj/item/wrench/W) + if(istype(W)&&panel_open) + var/stsize = input(user, "How much should [src] stack to? (1-50)", "Stack size") as null|num + if(stsize && (stsize > 1 && stsize <= 50)) + stack_amt = stsize + to_chat(user, "[src] will now output [stack_amt] items at a time.") + return + return TRUE + +/obj/machinery/mineral/stacking_machine/attackby(obj/item/W, mob/user, params) + if(default_deconstruction_screwdriver(user, "stacker-open", "stacker", W)) + updateUsrDialog() + return + if(default_deconstruction_crowbar(W)) + return /obj/machinery/mineral/stacking_machine/proc/process_sheet(obj/item/stack/sheet/inp) var/key = inp.merge_type @@ -120,3 +176,4 @@ var/obj/item/stack/sheet/out = new inp.type(null, stack_amt) unload_mineral(out) storage.amount -= stack_amt + From c55478c910c043926142acc8b54e265558245b40 Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Sat, 7 Dec 2019 12:20:28 -0600 Subject: [PATCH 03/10] Adjusts the machine by one pixel --- icons/obj/machines/mining_machines.dmi | Bin 4500 -> 4500 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index b9e79adcddb9dd3a32c4e4506dc91a08e7327bef..ed2580befc6c03e4993438b72f7dad555ad94265 100644 GIT binary patch delta 3855 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 BbZGzp delta 3855 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 wry5g+e Date: Sat, 7 Dec 2019 12:24:45 -0600 Subject: [PATCH 04/10] Minimum can now be 1 --- code/modules/mining/machine_stacking.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 6dbad4f59c99..19af62427c1f 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -142,7 +142,7 @@ There are some bolts to limit stack size."} /obj/machinery/mineral/stacking_machine/wrench_act(mob/living/user, obj/item/wrench/W) if(istype(W)&&panel_open) var/stsize = input(user, "How much should [src] stack to? (1-50)", "Stack size") as null|num - if(stsize && (stsize > 1 && stsize <= 50)) + if(stsize && (stsize > 0 && stsize <= 50)) stack_amt = stsize to_chat(user, "[src] will now output [stack_amt] items at a time.") return From 3665f955c2497bfe60dc74e58cf6e8173bcf01ee Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Sat, 7 Dec 2019 16:21:50 -0600 Subject: [PATCH 05/10] 1 SHEETS fixed --- code/modules/mining/machine_stacking.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 19af62427c1f..22f66a6c0b60 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -91,7 +91,10 @@ /obj/machinery/mineral/stacking_machine/examine(mob/user) . = ..() - . += "Currently outputting stacks at [stack_amt] sheets" + if(stack_amt != 1) + . += {"Currently outputting stacks at [stack_amt] sheets"} + else if(stack_amt == 1) + . += {"Currently outputting stacks at [stack_amt] sheet"} if(panel_open) . += {"The I/O is set to change [io ? "output" : "input"] currently. Input is [dir2text(input_dir)] @@ -144,8 +147,11 @@ There are some bolts to limit stack size."} var/stsize = input(user, "How much should [src] stack to? (1-50)", "Stack size") as null|num if(stsize && (stsize > 0 && stsize <= 50)) stack_amt = stsize - to_chat(user, "[src] will now output [stack_amt] items at a time.") - return + if(stack_amt != 1) + to_chat(user, "[src] is now set to output [stack_amt] sheets") + else if(stack_amt == 1) + to_chat(user, "[src] is now set to output [stack_amt] sheet") + return return TRUE /obj/machinery/mineral/stacking_machine/attackby(obj/item/W, mob/user, params) From d99c96ddcd1f89ae4eabe623bd57af149017c720 Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Fri, 3 Jan 2020 14:59:11 -0600 Subject: [PATCH 06/10] Return ..() and a bit of organizing I wish I knew this from the beginning instead of wasting everyone's time like this. --- code/modules/mining/machine_stacking.dm | 97 +++++++++++++------------ 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 22f66a6c0b60..c3c1f823292d 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -70,7 +70,6 @@ /**********************Mineral stacking unit**************************/ - /obj/machinery/mineral/stacking_machine name = "stacking machine" icon = 'icons/obj/machines/mining_machines.dmi' @@ -89,6 +88,7 @@ var/force_connect = FALSE var/io = 0 //This is used for determining whether we change the Input or Output + /obj/machinery/mineral/stacking_machine/examine(mob/user) . = ..() if(stack_amt != 1) @@ -114,53 +114,6 @@ There are some bolts to limit stack size."} if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir)) process_sheet(AM) -/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M) - if(istype(M)) - if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console) && !panel_open) - CONSOLE = M.buffer - CONSOLE.machine = src - to_chat(user, "You link [src] to the console in [M]'s buffer.") - return TRUE - if(panel_open) - io = !io - to_chat(user, "You set the I/O to change [io ? "output" : "input"].") - return TRUE - -/obj/machinery/mineral/stacking_machine/attack_hand(mob/user) - if(panel_open &&(io == 0)) - input_dir = turn(input_dir, -90) - if(input_dir == output_dir) //Input and output can't be the same or you create the immovable sheet. - input_dir = turn(input_dir, -90) - to_chat(user, "You set [src]'s input to take from the [dir2text(input_dir)].") - return - else if (panel_open && (io == 1)) - output_dir = turn(output_dir, -90) - if(input_dir == output_dir) - output_dir = turn(output_dir, -90) - to_chat(user, "You set [src]'s output to drop stacks [dir2text(output_dir)].") - return - return TRUE - - -/obj/machinery/mineral/stacking_machine/wrench_act(mob/living/user, obj/item/wrench/W) - if(istype(W)&&panel_open) - var/stsize = input(user, "How much should [src] stack to? (1-50)", "Stack size") as null|num - if(stsize && (stsize > 0 && stsize <= 50)) - stack_amt = stsize - if(stack_amt != 1) - to_chat(user, "[src] is now set to output [stack_amt] sheets") - else if(stack_amt == 1) - to_chat(user, "[src] is now set to output [stack_amt] sheet") - return - return TRUE - -/obj/machinery/mineral/stacking_machine/attackby(obj/item/W, mob/user, params) - if(default_deconstruction_screwdriver(user, "stacker-open", "stacker", W)) - updateUsrDialog() - return - if(default_deconstruction_crowbar(W)) - return - /obj/machinery/mineral/stacking_machine/proc/process_sheet(obj/item/stack/sheet/inp) var/key = inp.merge_type var/obj/item/stack/sheet/storage = stack_list[key] @@ -183,3 +136,51 @@ There are some bolts to limit stack size."} unload_mineral(out) storage.amount -= stack_amt +/obj/machinery/mineral/stacking_machine/attackby(obj/item/W, mob/user, params) + if(default_deconstruction_screwdriver(user, "stacker-open", "stacker", W)) + updateUsrDialog() + return + if(default_deconstruction_crowbar(W)) + return + + if(!powered()) + return + + if(W.tool_behaviour == TOOL_WRENCH && panel_open) + var/stsize = input(user, "How much should [src] stack to? (1-50)", "Stack size") as null|num + if(stsize && (stsize > 0 && stsize <= 50)) + stack_amt = stsize + if(stack_amt != 1) + to_chat(user, "[src] is now set to output [stack_amt] sheets") + else if(stack_amt == 1) + to_chat(user, "[src] is now set to output [stack_amt] sheet") + return + + return ..() + +/obj/machinery/mineral/stacking_machine/attack_hand(mob/user) + if(panel_open &&(io == 0)) + input_dir = turn(input_dir, -90) + if(input_dir == output_dir) //Input and output can't be the same or you create the immovable sheet. + input_dir = turn(input_dir, -90) + to_chat(user, "You set [src]'s input to take from the [dir2text(input_dir)].") + return + else if (panel_open && (io == 1)) + output_dir = turn(output_dir, -90) + if(input_dir == output_dir) + output_dir = turn(output_dir, -90) + to_chat(user, "You set [src]'s output to drop stacks [dir2text(output_dir)].") + return + return TRUE + +/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M) + if(istype(M)) + if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console) && !panel_open) + CONSOLE = M.buffer + CONSOLE.machine = src + to_chat(user, "You link [src] to the console in [M]'s buffer.") + return TRUE + if(panel_open) + io = !io + to_chat(user, "You set the I/O to change [io ? "output" : "input"].") + return TRUE From 7bb8c78ab66a62591ddc249398b10ec27144629a Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Sun, 5 Jan 2020 20:08:22 -0600 Subject: [PATCH 07/10] Suggested corrections pass 1 --- code/modules/mining/machine_stacking.dm | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index c3c1f823292d..39171537c957 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -69,6 +69,8 @@ return /**********************Mineral stacking unit**************************/ +#define INPUT 0 +#define OUTPUT 1 /obj/machinery/mineral/stacking_machine name = "stacking machine" @@ -86,15 +88,12 @@ var/stack_amt = 50 //amount to stack before releassing var/datum/component/remote_materials/materials var/force_connect = FALSE - var/io = 0 //This is used for determining whether we change the Input or Output + var/io = INPUT //This is used for determining whether we change the Input or Output /obj/machinery/mineral/stacking_machine/examine(mob/user) . = ..() - if(stack_amt != 1) - . += {"Currently outputting stacks at [stack_amt] sheets"} - else if(stack_amt == 1) - . += {"Currently outputting stacks at [stack_amt] sheet"} + . += {"Currently outputting stacks at [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]"} if(panel_open) . += {"The I/O is set to change [io ? "output" : "input"] currently. Input is [dir2text(input_dir)] @@ -109,7 +108,7 @@ There are some bolts to limit stack size."} materials = AddComponent(/datum/component/remote_materials, "stacking", mapload, FALSE, mapload && force_connect) /obj/machinery/mineral/stacking_machine/HasProximity(atom/movable/AM) - if(panel_open || !powered()) + if(panel_open || (stat & (BROKEN|NOPOWER))) return if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir)) process_sheet(AM) @@ -148,24 +147,23 @@ There are some bolts to limit stack size."} if(W.tool_behaviour == TOOL_WRENCH && panel_open) var/stsize = input(user, "How much should [src] stack to? (1-50)", "Stack size") as null|num - if(stsize && (stsize > 0 && stsize <= 50)) - stack_amt = stsize - if(stack_amt != 1) - to_chat(user, "[src] is now set to output [stack_amt] sheets") - else if(stack_amt == 1) - to_chat(user, "[src] is now set to output [stack_amt] sheet") + if(stsize) + stack_amt = CLAMP(stsize,1,50) + to_chat(user, "[src] is now set to output [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]") return return ..() /obj/machinery/mineral/stacking_machine/attack_hand(mob/user) - if(panel_open &&(io == 0)) + if(!panel_open) + return ..() + if(io == INPUT) input_dir = turn(input_dir, -90) if(input_dir == output_dir) //Input and output can't be the same or you create the immovable sheet. input_dir = turn(input_dir, -90) to_chat(user, "You set [src]'s input to take from the [dir2text(input_dir)].") return - else if (panel_open && (io == 1)) + else if (io == OUTPUT) output_dir = turn(output_dir, -90) if(input_dir == output_dir) output_dir = turn(output_dir, -90) From cb67f2c289cea7272d06ad82b02b2a5dbc370cc6 Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Mon, 6 Jan 2020 11:20:02 -0600 Subject: [PATCH 08/10] Suggested changes pass 2 and slight readability improvement --- code/modules/mining/machine_stacking.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 39171537c957..b92e0a999932 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -93,14 +93,14 @@ /obj/machinery/mineral/stacking_machine/examine(mob/user) . = ..() - . += {"Currently outputting stacks at [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]"} + . += "Currently outputting stacks at [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]" if(panel_open) - . += {"The I/O is set to change [io ? "output" : "input"] currently. -Input is [dir2text(input_dir)] -Output is [dir2text(output_dir)] -There is a dial that can be turned by hand to change direction. -The I/O setting can be changed with a multitool to change what the dial controls -There are some bolts to limit stack size."} + . += "The I/O is set to change [io ? "output" : "input"] currently. \ +Input is [dir2text(input_dir)] \ +and Output is [dir2text(output_dir)]. \ +There is a dial that can be turned by hand to change direction. \ +The I/O setting can be changed with a multitool to change what the dial controls. \ +There are some bolts to limit stack size." /obj/machinery/mineral/stacking_machine/Initialize(mapload) . = ..() From 7c62a835cbdb756ef17d3adf5f5163357bdb931a Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Tue, 7 Jan 2020 12:04:33 -0600 Subject: [PATCH 09/10] Back to the multi-line. --- code/modules/mining/machine_stacking.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index b92e0a999932..2cf2700fadd9 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -95,12 +95,12 @@ . = ..() . += "Currently outputting stacks at [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]" if(panel_open) - . += "The I/O is set to change [io ? "output" : "input"] currently. \ -Input is [dir2text(input_dir)] \ -and Output is [dir2text(output_dir)]. \ -There is a dial that can be turned by hand to change direction. \ -The I/O setting can be changed with a multitool to change what the dial controls. \ -There are some bolts to limit stack size." + . += "The I/O is set to change [io ? "output" : "input"] currently." + . += "Input is [dir2text(input_dir)]" + . += "Output is [dir2text(output_dir)]." + . += "There is a dial that can be turned by hand to change direction." + . += "The I/O setting can be changed with a multitool to change what the dial controls." + . += "There are some bolts to limit stack size." /obj/machinery/mineral/stacking_machine/Initialize(mapload) . = ..() From 576b4a09627fa7016ab66db1138f62738a612cc0 Mon Sep 17 00:00:00 2001 From: DerelictDrone <57756830+DerelictDrone@users.noreply.github.com> Date: Fri, 10 Jan 2020 03:11:04 -0600 Subject: [PATCH 10/10] Suggestions pass 3 and hopefully the last commit. --- code/modules/mining/machine_stacking.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 2cf2700fadd9..697646c1b892 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -67,6 +67,7 @@ return if(default_deconstruction_crowbar(W)) return + return ..() /**********************Mineral stacking unit**************************/ #define INPUT 0 @@ -93,7 +94,7 @@ /obj/machinery/mineral/stacking_machine/examine(mob/user) . = ..() - . += "Currently outputting stacks at [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]" + . += "Currently outputting stacks at [stack_amt] sheet[(stack_amt > 1) ? "s" : ""]" if(panel_open) . += "The I/O is set to change [io ? "output" : "input"] currently." . += "Input is [dir2text(input_dir)]" @@ -169,7 +170,7 @@ output_dir = turn(output_dir, -90) to_chat(user, "You set [src]'s output to drop stacks [dir2text(output_dir)].") return - return TRUE + return ..() /obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M) if(istype(M))