Holocall cleanup

2017-05-29 11:03:03 -05:00
parent c463043fc3
commit 0349f8c908
3 changed files with 34 additions and 12 deletions
@@ -75,6 +75,13 @@ Possible to do for anyone motivated enough:
 		stat &= ~NOPOWER
 	else
 		stat |= ~NOPOWER
+		if(outgoing_call)
+			outgoing_call.ConnectionFailure(src)
+
+/obj/machinery/holopad/obj_break()
+	. = ..()
+	if(outgoing_call)
+		outgoing_call.ConnectionFailure(src)

 /obj/machinery/holopad/RefreshParts()
 	var/holograph_range = 4
@@ -0,0 +1,16 @@
+diff a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm	(rejected hunks)
+@@ -58,13 +58,11 @@ Possible to do for anyone motivated enough:
+ 
+ /obj/machinery/holopad/Destroy()
+ 	if(outgoing_call)
+-		LAZYADD(holo_calls, outgoing_call)
+-		outgoing_call = null
+		outgoing_call.ConnectionFailure(src)
+ 
+ 	for(var/I in holo_calls)
+ 		var/datum/holocall/HC = I
+ 		HC.ConnectionFailure(src)
+-	LAZYCLEARLIST(holo_calls)
+ 
+ 	for (var/I in masters)
+ 		clear_holo(I)