From 061f795d11ca54dd80cfb7542639e8f7710e8ed9 Mon Sep 17 00:00:00 2001 From: Den Date: Mon, 13 Apr 2015 21:50:08 +0300 Subject: [PATCH 01/14] Pipelayer Add Automatic pipelayer. Automatic Pipe Layer Pull or pusch to work. Use 1/4 metal to create 1 pipe and wrench it to place. Can make Regular, Scrubber, Supply or Heat exchange pipes (switch wrench). Dismantling the floor if necessary (switch crowbar). Can hold 1,000 sheets of metal (laying out a screwdriver). --- .../code/game/machinery/pipe/pipelayer.dm | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 Baystation12/code/game/machinery/pipe/pipelayer.dm diff --git a/Baystation12/code/game/machinery/pipe/pipelayer.dm b/Baystation12/code/game/machinery/pipe/pipelayer.dm new file mode 100644 index 00000000000..5262596f37b --- /dev/null +++ b/Baystation12/code/game/machinery/pipe/pipelayer.dm @@ -0,0 +1,145 @@ +/obj/machinery/pipelayer + + name = "Automatic pipe layer" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "pipe_d" + density = 1 + var/turf/old_turf + var/old_dir + var/on = 0 + var/a_dis = 0 + var/P_type = 0 + var/P_type_t = "" + var/max_metal = 50 + var/metal = 10 + var/obj/item/weapon/wrench/W + +/obj/machinery/pipelayer/New() + W = new(src) + ..() + +/obj/machinery/pipelayer/Move(new_turf,M_Dir) + ..() + + if(on ||a_dis) + dismantleFloor(new_turf) + layPipe(old_turf,M_Dir,old_dir) + + old_turf = new_turf + old_dir = turn(M_Dir,180) + +/obj/machinery/pipelayer/attack_hand(mob/user as mob) + on=!on + visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") + return + +/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) + + if (istype(W, /obj/item/weapon/wrench)) + switch(P_type) + if(31) + P_type = 0 + P_type_t = "regular pipes" + if(29) + P_type = 31 + P_type_t = "scrubbers pipes" + if(2) + P_type = 29 + P_type_t = "supply pipes" + if(0) + P_type = 2 + P_type_t = "heat exchange pipes" + + user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") + return + + if(istype(W, /obj/item/weapon/crowbar)) + a_dis=!a_dis + visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") + return + + if(istype(W, /obj/item/stack/sheet/metal)) + + var/result = load_metal(W) + var/message + if(isnull(result)) + message = "Unable to load [W] - no metal found." + else if(!result) + message = "Stack is full." + else + message = "[result] scheets of metal successfully loaded." + + visible_message("[message]") + return + + if(istype(W, /obj/item/weapon/screwdriver)) + if(metal) + var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) + m = min(m, 50) + m = min(m, metal) + if(m) + use_metal(m) + var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) + MM.amount = m + else + user.visible_message("\The [src] is empty.") + return + ..() + +/obj/machinery/pipelayer/examine(mob/user) + ..() + user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") + +/obj/machinery/pipelayer/proc/reset() + on=0 + return + +/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) + if(istype(MM) && MM.get_amount()) + var/cur_amount = metal + var/to_load = max(max_metal - cur_amount,0) + if(to_load) + to_load = min(MM.get_amount(), to_load) + metal += to_load + MM.use(to_load) + return to_load + else + return 0 + return + +/obj/machinery/pipelayer/proc/use_metal(amount) + if(!metal || metal Date: Mon, 13 Apr 2015 21:54:16 +0300 Subject: [PATCH 02/14] Add pipelayer.dm to baystation12.dme --- baystation12.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/baystation12.dme b/baystation12.dme index 77596a31299..9119f2706d7 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -467,6 +467,7 @@ #include "code\game\machinery\kitchen\smartfridge.dm" #include "code\game\machinery\pipe\construction.dm" #include "code\game\machinery\pipe\pipe_dispenser.dm" +#include "code\game\machinery\pipe\pipelayer.dm" #include "code\game\machinery\telecomms\broadcaster.dm" #include "code\game\machinery\telecomms\logbrowser.dm" #include "code\game\machinery\telecomms\machine_interactions.dm" From e5794adb9a162ba51b4712a87b4bc377b1f29650 Mon Sep 17 00:00:00 2001 From: Den Date: Tue, 14 Apr 2015 11:11:02 +0300 Subject: [PATCH 03/14] Fix pipelayer.dm path --- code/game/machinery/pipe/pipelayer.dm | 145 ++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 code/game/machinery/pipe/pipelayer.dm diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm new file mode 100644 index 00000000000..5262596f37b --- /dev/null +++ b/code/game/machinery/pipe/pipelayer.dm @@ -0,0 +1,145 @@ +/obj/machinery/pipelayer + + name = "Automatic pipe layer" + icon = 'icons/obj/stationobjs.dmi' + icon_state = "pipe_d" + density = 1 + var/turf/old_turf + var/old_dir + var/on = 0 + var/a_dis = 0 + var/P_type = 0 + var/P_type_t = "" + var/max_metal = 50 + var/metal = 10 + var/obj/item/weapon/wrench/W + +/obj/machinery/pipelayer/New() + W = new(src) + ..() + +/obj/machinery/pipelayer/Move(new_turf,M_Dir) + ..() + + if(on ||a_dis) + dismantleFloor(new_turf) + layPipe(old_turf,M_Dir,old_dir) + + old_turf = new_turf + old_dir = turn(M_Dir,180) + +/obj/machinery/pipelayer/attack_hand(mob/user as mob) + on=!on + visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") + return + +/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) + + if (istype(W, /obj/item/weapon/wrench)) + switch(P_type) + if(31) + P_type = 0 + P_type_t = "regular pipes" + if(29) + P_type = 31 + P_type_t = "scrubbers pipes" + if(2) + P_type = 29 + P_type_t = "supply pipes" + if(0) + P_type = 2 + P_type_t = "heat exchange pipes" + + user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") + return + + if(istype(W, /obj/item/weapon/crowbar)) + a_dis=!a_dis + visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") + return + + if(istype(W, /obj/item/stack/sheet/metal)) + + var/result = load_metal(W) + var/message + if(isnull(result)) + message = "Unable to load [W] - no metal found." + else if(!result) + message = "Stack is full." + else + message = "[result] scheets of metal successfully loaded." + + visible_message("[message]") + return + + if(istype(W, /obj/item/weapon/screwdriver)) + if(metal) + var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) + m = min(m, 50) + m = min(m, metal) + if(m) + use_metal(m) + var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) + MM.amount = m + else + user.visible_message("\The [src] is empty.") + return + ..() + +/obj/machinery/pipelayer/examine(mob/user) + ..() + user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") + +/obj/machinery/pipelayer/proc/reset() + on=0 + return + +/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) + if(istype(MM) && MM.get_amount()) + var/cur_amount = metal + var/to_load = max(max_metal - cur_amount,0) + if(to_load) + to_load = min(MM.get_amount(), to_load) + metal += to_load + MM.use(to_load) + return to_load + else + return 0 + return + +/obj/machinery/pipelayer/proc/use_metal(amount) + if(!metal || metal Date: Tue, 14 Apr 2015 11:11:49 +0300 Subject: [PATCH 04/14] Remove apl wisch bad path --- .../code/game/machinery/pipe/pipelayer.dm | 145 ------------------ 1 file changed, 145 deletions(-) delete mode 100644 Baystation12/code/game/machinery/pipe/pipelayer.dm diff --git a/Baystation12/code/game/machinery/pipe/pipelayer.dm b/Baystation12/code/game/machinery/pipe/pipelayer.dm deleted file mode 100644 index 5262596f37b..00000000000 --- a/Baystation12/code/game/machinery/pipe/pipelayer.dm +++ /dev/null @@ -1,145 +0,0 @@ -/obj/machinery/pipelayer - - name = "Automatic pipe layer" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "pipe_d" - density = 1 - var/turf/old_turf - var/old_dir - var/on = 0 - var/a_dis = 0 - var/P_type = 0 - var/P_type_t = "" - var/max_metal = 50 - var/metal = 10 - var/obj/item/weapon/wrench/W - -/obj/machinery/pipelayer/New() - W = new(src) - ..() - -/obj/machinery/pipelayer/Move(new_turf,M_Dir) - ..() - - if(on ||a_dis) - dismantleFloor(new_turf) - layPipe(old_turf,M_Dir,old_dir) - - old_turf = new_turf - old_dir = turn(M_Dir,180) - -/obj/machinery/pipelayer/attack_hand(mob/user as mob) - on=!on - visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") - return - -/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) - - if (istype(W, /obj/item/weapon/wrench)) - switch(P_type) - if(31) - P_type = 0 - P_type_t = "regular pipes" - if(29) - P_type = 31 - P_type_t = "scrubbers pipes" - if(2) - P_type = 29 - P_type_t = "supply pipes" - if(0) - P_type = 2 - P_type_t = "heat exchange pipes" - - user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") - return - - if(istype(W, /obj/item/weapon/crowbar)) - a_dis=!a_dis - visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") - return - - if(istype(W, /obj/item/stack/sheet/metal)) - - var/result = load_metal(W) - var/message - if(isnull(result)) - message = "Unable to load [W] - no metal found." - else if(!result) - message = "Stack is full." - else - message = "[result] scheets of metal successfully loaded." - - visible_message("[message]") - return - - if(istype(W, /obj/item/weapon/screwdriver)) - if(metal) - var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) - m = min(m, 50) - m = min(m, metal) - if(m) - use_metal(m) - var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) - MM.amount = m - else - user.visible_message("\The [src] is empty.") - return - ..() - -/obj/machinery/pipelayer/examine(mob/user) - ..() - user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") - -/obj/machinery/pipelayer/proc/reset() - on=0 - return - -/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) - if(istype(MM) && MM.get_amount()) - var/cur_amount = metal - var/to_load = max(max_metal - cur_amount,0) - if(to_load) - to_load = min(MM.get_amount(), to_load) - metal += to_load - MM.use(to_load) - return to_load - else - return 0 - return - -/obj/machinery/pipelayer/proc/use_metal(amount) - if(!metal || metal Date: Tue, 14 Apr 2015 11:24:55 +0300 Subject: [PATCH 05/14] Fixes --- code/game/machinery/pipe/pipelayer.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 5262596f37b..b02278a75c2 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -1,6 +1,6 @@ /obj/machinery/pipelayer - name = "Automatic pipe layer" + name = "automatic pipe layer" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 @@ -30,7 +30,7 @@ /obj/machinery/pipelayer/attack_hand(mob/user as mob) on=!on - visible_message("[src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated [src].") + visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -55,7 +55,7 @@ if(istype(W, /obj/item/weapon/crowbar)) a_dis=!a_dis - visible_message("[src] auto dismantle [!on?"dea":"a"]ctivated.") + visible_message("\The [src] auto dismantle [!on?"dea":"a"]ctivated.") return if(istype(W, /obj/item/stack/sheet/metal)) @@ -67,7 +67,7 @@ else if(!result) message = "Stack is full." else - message = "[result] scheets of metal successfully loaded." + message = "[result] schets of metal successfully loaded." visible_message("[message]") return @@ -82,7 +82,7 @@ var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) MM.amount = m else - user.visible_message("\The [src] is empty.") + user << "\The [src] is empty." return ..() From 16ddaf3d014bd66244997e2b676e2ff70b55bf6c Mon Sep 17 00:00:00 2001 From: Den Date: Tue, 14 Apr 2015 19:02:07 +0300 Subject: [PATCH 06/14] Fix "sheets", add \The, add round's --- code/game/machinery/pipe/pipelayer.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index b02278a75c2..fd15dcb2e86 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -67,16 +67,17 @@ else if(!result) message = "Stack is full." else - message = "[result] schets of metal successfully loaded." + message = "[result] sheets of metal successfully loaded." visible_message("[message]") return if(istype(W, /obj/item/weapon/screwdriver)) if(metal) - var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(metal,50)) as num, 1) + var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(round(metal),50)) as num, 1) m = min(m, 50) - m = min(m, metal) + m = min(m, round(metal)) + m = round(m) if(m) use_metal(m) var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) @@ -97,7 +98,7 @@ /obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/sheet/metal/MM) if(istype(MM) && MM.get_amount()) var/cur_amount = metal - var/to_load = max(max_metal - cur_amount,0) + var/to_load = max(max_metal - round(cur_amount),0) if(to_load) to_load = min(MM.get_amount(), to_load) metal += to_load @@ -109,7 +110,7 @@ /obj/machinery/pipelayer/proc/use_metal(amount) if(!metal || metal Date: Thu, 16 Apr 2015 16:40:06 +0200 Subject: [PATCH 07/14] user << add user.visible_message() replace --- code/game/machinery/pipe/pipelayer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index fd15dcb2e86..17ccddf3102 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -30,7 +30,7 @@ /obj/machinery/pipelayer/attack_hand(mob/user as mob) on=!on - visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") + user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -89,7 +89,7 @@ /obj/machinery/pipelayer/examine(mob/user) ..() - user.visible_message("\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated.") + user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated." /obj/machinery/pipelayer/proc/reset() on=0 From 737b4fc08e0eeca25cfec7e988b6c425b4adeeb3 Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 16 Apr 2015 16:42:57 +0200 Subject: [PATCH 08/14] dismantle Fix --- code/game/machinery/pipe/pipelayer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 17ccddf3102..770b4941e1e 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -21,7 +21,7 @@ /obj/machinery/pipelayer/Move(new_turf,M_Dir) ..() - if(on ||a_dis) + if(on && a_dis) dismantleFloor(new_turf) layPipe(old_turf,M_Dir,old_dir) From 6f77a98bc3f950d9f2616b4f4e23e6fd91486936 Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 16 Apr 2015 20:15:40 +0200 Subject: [PATCH 09/14] Fix activating with no metal. --- code/game/machinery/pipe/pipelayer.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 770b4941e1e..cf0a8fa8c57 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -29,6 +29,9 @@ old_dir = turn(M_Dir,180) /obj/machinery/pipelayer/attack_hand(mob/user as mob) + if(!metal) + user << "\The [src] don't work with no metal." + return on=!on user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") return From 1a000ea53ce769b471474efdb240c55380823f7e Mon Sep 17 00:00:00 2001 From: Den Date: Thu, 16 Apr 2015 20:54:12 +0200 Subject: [PATCH 10/14] Add rework switch to list of pipe types. --- code/game/machinery/pipe/pipelayer.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index cf0a8fa8c57..6a40d4f50ad 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -13,6 +13,7 @@ var/max_metal = 50 var/metal = 10 var/obj/item/weapon/wrench/W + var/list/Pipes = list("regular pipes"=0,"scrubbers pipes"=31,"supply pipes"=29,"heat exchange pipes"=2) /obj/machinery/pipelayer/New() W = new(src) @@ -29,7 +30,7 @@ old_dir = turn(M_Dir,180) /obj/machinery/pipelayer/attack_hand(mob/user as mob) - if(!metal) + if(!metal&&!on) user << "\The [src] don't work with no metal." return on=!on @@ -39,6 +40,9 @@ /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) + P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes + P_type = Pipes[P_type_t] +/* switch(P_type) if(31) P_type = 0 @@ -52,7 +56,7 @@ if(0) P_type = 2 P_type_t = "heat exchange pipes" - +*/ user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") return From 1ff0eda6019d8279a2110be69f6f08ce243b76f6 Mon Sep 17 00:00:00 2001 From: Den Date: Fri, 17 Apr 2015 20:34:30 +0300 Subject: [PATCH 11/14] Change dismantle turf to pipe turf. --- code/game/machinery/pipe/pipelayer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 6a40d4f50ad..aa7a0e55752 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -23,7 +23,7 @@ ..() if(on && a_dis) - dismantleFloor(new_turf) + dismantleFloor(old_turf) layPipe(old_turf,M_Dir,old_dir) old_turf = new_turf From dc19c22056034b6bab8f43d8937045db879c6046 Mon Sep 17 00:00:00 2001 From: Dennok Date: Wed, 22 Apr 2015 11:27:18 +0300 Subject: [PATCH 12/14] Fix --- code/game/machinery/pipe/pipelayer.dm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index aa7a0e55752..205f05ae6b8 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -42,27 +42,12 @@ if (istype(W, /obj/item/weapon/wrench)) P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes P_type = Pipes[P_type_t] -/* - switch(P_type) - if(31) - P_type = 0 - P_type_t = "regular pipes" - if(29) - P_type = 31 - P_type_t = "scrubbers pipes" - if(2) - P_type = 29 - P_type_t = "supply pipes" - if(0) - P_type = 2 - P_type_t = "heat exchange pipes" -*/ user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") return if(istype(W, /obj/item/weapon/crowbar)) a_dis=!a_dis - visible_message("\The [src] auto dismantle [!on?"dea":"a"]ctivated.") + visible_message("\The [src] auto dismantle [!a_dis?"dea":"a"]ctivated.") return if(istype(W, /obj/item/stack/sheet/metal)) From d27817903b29ee2454e7a0c3cb2069c3993c5592 Mon Sep 17 00:00:00 2001 From: Dennok Date: Wed, 22 Apr 2015 14:11:23 +0300 Subject: [PATCH 13/14] Create Dennok-PR-8838.yml --- html/changelogs/Dennok-PR-8838.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/Dennok-PR-8838.yml diff --git a/html/changelogs/Dennok-PR-8838.yml b/html/changelogs/Dennok-PR-8838.yml new file mode 100644 index 00000000000..f1a798e4e98 --- /dev/null +++ b/html/changelogs/Dennok-PR-8838.yml @@ -0,0 +1,5 @@ +author: Dennok +delete-after: True + +changes: + - rscadd: "Added a automatic Pipelayer. Work on pull/putting." From 4ce1ec1f3dc6135aa2e2b43d7a5a1342083ca915 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 22 Apr 2015 16:49:54 +0200 Subject: [PATCH 14/14] Pipelayer feedback. Adds span use. Updates and adds visible messages as necessary. Corrects more instances where on was used instead of a_dis. --- code/game/machinery/pipe/pipelayer.dm | 21 ++++++++++----------- html/changelogs/Dennok-PR-8838.yml | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 205f05ae6b8..32aafb21cd8 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -31,10 +31,10 @@ /obj/machinery/pipelayer/attack_hand(mob/user as mob) if(!metal&&!on) - user << "\The [src] don't work with no metal." + user << "\The [src] doesn't work without metal." return on=!on - user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].") + user.visible_message("[user] has [!on?"de":""]activated \the [src].", "You [!on?"de":""]activate \the [src].") return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -42,26 +42,24 @@ if (istype(W, /obj/item/weapon/wrench)) P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes P_type = Pipes[P_type_t] - user.visible_message("[user] has set \the [src] to manufacture [P_type_t] .", "You set \the [src] to manufacture [P_type_t].") + user.visible_message("[user] has set \the [src] to manufacture [P_type_t].", "You set \the [src] to manufacture [P_type_t].") return if(istype(W, /obj/item/weapon/crowbar)) a_dis=!a_dis - visible_message("\The [src] auto dismantle [!a_dis?"dea":"a"]ctivated.") + user.visible_message("[user] has [!a_dis?"de":""]activated auto-dismantling.", "You [!a_dis?"de":""]activate auto-dismantling.") return if(istype(W, /obj/item/stack/sheet/metal)) var/result = load_metal(W) - var/message if(isnull(result)) - message = "Unable to load [W] - no metal found." + user << "Unable to load [W] - no metal found." else if(!result) - message = "Stack is full." + user << "\The [src] is full." else - message = "[result] sheets of metal successfully loaded." + user.visible_message("[user] has loaded metal into \the [src].", "You load metal into \the [src]") - visible_message("[message]") return if(istype(W, /obj/item/weapon/screwdriver)) @@ -74,6 +72,7 @@ use_metal(m) var/obj/item/stack/sheet/metal/MM = new (get_turf(src)) MM.amount = m + user.visible_message("[user] removes [m] sheet\s of metal from the \the [src].", "You remove [m] sheet\s of metal from \the [src]") else user << "\The [src] is empty." return @@ -81,7 +80,7 @@ /obj/machinery/pipelayer/examine(mob/user) ..() - user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantle is [!on?"de":""]activated." + user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantling is [!a_dis?"de":""]activated." /obj/machinery/pipelayer/proc/reset() on=0 @@ -102,7 +101,7 @@ /obj/machinery/pipelayer/proc/use_metal(amount) if(!metal || metal