Delete hologram.dm.rej

This commit is contained in:
kevinz000
2017-06-02 21:50:17 -07:00
committed by GitHub
parent c483767431
commit 224f1d8bd1
-16
View File
@@ -1,16 +0,0 @@
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)