From c42e536074840627641bf548a8d3bdcd0cf514bf Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 6 May 2020 22:59:29 -0700 Subject: [PATCH] Merge pull request #7088 from VOREStation/pol-smesexamine Fix SMES and debug power item examine messages --- code/modules/power/debug_items.dm | 34 ++++++++++++++++--------------- code/modules/power/smes.dm | 12 +++++------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/code/modules/power/debug_items.dm b/code/modules/power/debug_items.dm index 6fee9cce22..c7ca43705b 100644 --- a/code/modules/power/debug_items.dm +++ b/code/modules/power/debug_items.dm @@ -8,20 +8,22 @@ /obj/machinery/power/debug_items/examine(mob/user) . = ..() if(show_extended_information) - show_info(user) + . += show_info(user) /obj/machinery/power/debug_items/proc/show_info(var/mob/user) + var/list/extra_info = list() if(!powernet) - to_chat(user, "This device is not connected to a powernet") + extra_info += "This device is not connected to a powernet" return - to_chat(user, "Connected to powernet: [powernet]") - to_chat(user, "Available power: [num2text(powernet.avail, 20)] W") - to_chat(user, "Load: [num2text(powernet.viewload, 20)] W") - to_chat(user, "Has alert: [powernet.problem ? "YES" : "NO"]") - to_chat(user, "Cables: [powernet.cables.len]") - to_chat(user, "Nodes: [powernet.nodes.len]") + extra_info += "Connected to powernet: [powernet]" + extra_info += "Available power: [num2text(powernet.avail, 20)] W" + extra_info += "Load: [num2text(powernet.viewload, 20)] W" + extra_info += "Has alert: [powernet.problem ? "YES" : "NO"]" + extra_info += "Cables: [powernet.cables.len]" + extra_info += "Nodes: [powernet.nodes.len]" + return extra_info // An infinite power generator. Adds energy to connected cable. /obj/machinery/power/debug_items/infinite_generator @@ -33,8 +35,8 @@ add_avail(power_generation_rate) /obj/machinery/power/debug_items/infinite_generator/show_info(var/mob/user) - ..() - to_chat(user, "Generator is providing [num2text(power_generation_rate, 20)] W") + . = ..() + . += "Generator is providing [num2text(power_generation_rate, 20)] W" // A cable powersink, without the explosion/network alarms normal powersink causes. @@ -48,9 +50,9 @@ last_used = draw_power(power_usage_rate) /obj/machinery/power/debug_items/infinite_cable_powersink/show_info(var/mob/user) - ..() - to_chat(user, "Power sink is demanding [num2text(power_usage_rate, 20)] W") - to_chat(user, "[num2text(last_used, 20)] W was actually used last tick") + . = ..() + . += "Power sink is demanding [num2text(power_usage_rate, 20)] W" + . += "[num2text(last_used, 20)] W was actually used last tick" /obj/machinery/power/debug_items/infinite_apc_powersink @@ -60,6 +62,6 @@ active_power_usage = 0 /obj/machinery/power/debug_items/infinite_apc_powersink/show_info(var/mob/user) - ..() - to_chat(user, "Dummy load is using [num2text(active_power_usage, 20)] W") - to_chat(user, "Powered: [powered() ? "YES" : "NO"]") \ No newline at end of file + . = ..() + . += "Dummy load is using [num2text(active_power_usage, 20)] W" + . += "Powered: [powered() ? "YES" : "NO"]" diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 2ec394bc1f..10424cee18 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -459,17 +459,17 @@ take_damage(250 / severity) /obj/machinery/power/smes/examine(var/mob/user) - ..() - to_chat(user, "The service hatch is [panel_open ? "open" : "closed"].") + . = ..() + . += "The service hatch is [panel_open ? "open" : "closed"]." if(!damage) return var/damage_percentage = round((damage / maxdamage) * 100) switch(damage_percentage) if(75 to INFINITY) - to_chat(user, "It's casing is severely damaged, and sparking circuitry may be seen through the holes!") + . += "It's casing is severely damaged, and sparking circuitry may be seen through the holes!" if(50 to 74) - to_chat(user, "It's casing is considerably damaged, and some of the internal circuits appear to be exposed!") + . += "It's casing is considerably damaged, and some of the internal circuits appear to be exposed!" if(25 to 49) - to_chat(user, "It's casing is quite seriously damaged.") + . += "It's casing is quite seriously damaged." if(0 to 24) - to_chat(user, "It's casing has some minor damage.") \ No newline at end of file + . += "It's casing has some minor damage." \ No newline at end of file