From 4ce1ec1f3dc6135aa2e2b43d7a5a1342083ca915 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 22 Apr 2015 16:49:54 +0200 Subject: [PATCH] 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