From e3f5654eb779d0582adadfe020a6bec0ee27c8d8 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Mon, 5 Feb 2018 16:15:51 -0500 Subject: [PATCH] Fix holorays staying if you switch holopads (#35295) * Fix holorays staying if you switch holopads * Update hologram.dm --- code/game/machinery/hologram.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index d73f7c23b4..12fe90f04d 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -420,7 +420,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/holopad/proc/clear_holo(mob/living/user) qdel(masters[user]) // Get rid of user's hologram - qdel(holorays[user]) unset_holo(user) return TRUE @@ -429,6 +428,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(istype(AI) && AI.current == src) AI.current = null LAZYREMOVE(masters, user) // Discard AI from the list of those who use holopad + qdel(holorays[user]) LAZYREMOVE(holorays, user) SetLightsAndPower() return TRUE