Merge branch 'master' into upstream-merge-27344

This commit is contained in:
Poojawa
2017-05-20 23:26:28 -05:00
committed by GitHub
95 changed files with 3681 additions and 1609 deletions
+8 -3
View File
@@ -31,6 +31,7 @@
var/obj/machinery/holopad/H = I
if(!QDELETED(H) && H.is_operational())
dialed_holopads += H
H.say("Incoming call.")
LAZYADD(H.holo_calls, src)
if(!dialed_holopads.len)
@@ -42,12 +43,16 @@
//cleans up ALL references :)
/datum/holocall/Destroy()
QDEL_NULL(eye)
user.reset_perspective()
if(user.client)
for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
user.client.images -= chunk.obscured
user.remote_control = null
QDEL_NULL(eye)
user = null
hologram.HC = null
if(hologram)
hologram.HC = null
hologram = null
calling_holopad.outgoing_call = null
+1 -1
View File
@@ -1330,7 +1330,7 @@
obj_count++
/datum/mind/proc/find_syndicate_uplink()
var/list/L = current.get_contents()
var/list/L = current.GetAllContents()
for (var/obj/item/I in L)
if (I.hidden_uplink)
return I.hidden_uplink