From 1c05fb85e6ff92569f0796bf4ea984068fbaffc2 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Sun, 13 Oct 2019 11:13:39 -0500 Subject: [PATCH 1/3] Fixes RPEDs not showing parts of machines --- code/game/machinery/machinery.dm | 4 ++-- code/game/machinery/vending.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 63368000567..4b05e647e4f 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -447,7 +447,7 @@ Class Procs: var/obj/item/circuitboard/CB = locate(/obj/item/circuitboard) in component_parts var/P if(W.works_from_distance) - display_parts(user) + to_chat(user, display_parts().Join("\n")) for(var/obj/item/stock_parts/A in component_parts) for(var/D in CB.req_components) if(ispath(A.type, D)) @@ -466,7 +466,7 @@ Class Procs: break RefreshParts() else - display_parts(user) + to_chat(user, display_parts().Join("\n")) if(shouldplaysound) W.play_rped_sound() return 1 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index b27ebe3177d..deb282d4eaf 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -326,12 +326,12 @@ var/moved = 0 if(panel_open || W.works_from_distance) if(W.works_from_distance) - display_parts(user) + to_chat(user, display_parts().Join("\n")) for(var/I in W) if(istype(I, refill_canister)) moved += restock(I) else - display_parts(user) + to_chat(user, display_parts().Join("\n")) if(moved) to_chat(user, "[moved] items restocked.") W.play_rped_sound() From 58ea9b3935d11240870dda14b488408c717f9925 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Sun, 13 Oct 2019 13:35:00 -0500 Subject: [PATCH 2/3] boop --- code/game/machinery/machinery.dm | 5 +++-- code/game/machinery/vending.dm | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 4b05e647e4f..8f9381cec34 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -447,7 +447,7 @@ Class Procs: var/obj/item/circuitboard/CB = locate(/obj/item/circuitboard) in component_parts var/P if(W.works_from_distance) - to_chat(user, display_parts().Join("\n")) + to_chat(user, display_parts(user)) for(var/obj/item/stock_parts/A in component_parts) for(var/D in CB.req_components) if(ispath(A.type, D)) @@ -466,7 +466,7 @@ Class Procs: break RefreshParts() else - to_chat(user, display_parts().Join("\n")) + to_chat(user, display_parts(user)) if(shouldplaysound) W.play_rped_sound() return 1 @@ -477,6 +477,7 @@ Class Procs: . = list("Following parts detected in the machine:") for(var/obj/item/C in component_parts) . += "[bicon(C)] [C.name]" + . = jointext(., "\n") /obj/machinery/examine(mob/user) . = ..() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index deb282d4eaf..b8f301b19c6 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -326,12 +326,12 @@ var/moved = 0 if(panel_open || W.works_from_distance) if(W.works_from_distance) - to_chat(user, display_parts().Join("\n")) + to_chat(user, display_parts()) for(var/I in W) if(istype(I, refill_canister)) moved += restock(I) else - to_chat(user, display_parts().Join("\n")) + to_chat(user, display_parts(user)) if(moved) to_chat(user, "[moved] items restocked.") W.play_rped_sound() From 25deee76e11fc177aa829fa682ed9fd224e5db5a Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Sun, 13 Oct 2019 13:38:31 -0500 Subject: [PATCH 3/3] oops, forgot this one.. --- code/game/machinery/vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index b8f301b19c6..03b325dd649 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -326,7 +326,7 @@ var/moved = 0 if(panel_open || W.works_from_distance) if(W.works_from_distance) - to_chat(user, display_parts()) + to_chat(user, display_parts(user)) for(var/I in W) if(istype(I, refill_canister)) moved += restock(I)