Merge pull request #12581 from SteelSlayer/rped-fix

Fixes RPEDs not showing parts of machines
This commit is contained in:
Fox McCloud
2019-10-13 14:59:53 -04:00
committed by GitHub
2 changed files with 5 additions and 4 deletions
+3 -2
View File
@@ -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(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
display_parts(user)
to_chat(user, display_parts(user))
if(shouldplaysound)
W.play_rped_sound()
return 1
@@ -477,6 +477,7 @@ Class Procs:
. = list("<span class='notice'>Following parts detected in the machine:</span>")
for(var/obj/item/C in component_parts)
. += "<span class='notice'>[bicon(C)] [C.name]</span>"
. = jointext(., "\n")
/obj/machinery/examine(mob/user)
. = ..()
+2 -2
View File
@@ -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(user))
for(var/I in W)
if(istype(I, refill_canister))
moved += restock(I)
else
display_parts(user)
to_chat(user, display_parts(user))
if(moved)
to_chat(user, "[moved] items restocked.")
W.play_rped_sound()