From c1d34ab7965387caf90aadcdbbe76b6b686d55e6 Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 18 Dec 2018 21:28:43 -0500 Subject: [PATCH] Merge pull request #5786 from avabee/patch-4 Fixes issue #5788. --- code/modules/integrated_electronics/subtypes/output.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index c3ff9b36d5d..4f029dce6ea 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -300,7 +300,7 @@ text_output += "\an [name]" else text_output += "\an ["\improper[initial_name]"] labeled '[name]'" - text_output += " which is currently [get_pin_data(IC_INPUT, 1) ? "lit ¤" : "unlit."]" + text_output += " which is currently [get_pin_data(IC_INPUT, 1) ? "lit ¤" : "unlit."]" to_chat(user,jointext(text_output,null)) /obj/item/integrated_circuit/output/led/red @@ -462,8 +462,7 @@ /obj/item/integrated_circuit/output/holographic_projector/proc/destroy_hologram() - hologram.forceMove(src) - qdel(hologram) + QDEL_NULL(hologram) // holo_beam.End() // QDEL_NULL(holo_beam)