Merge pull request #1305 from Citadel-Station-13/upstream-merge-27839

[MIRROR] Fixes another holocall runtime
This commit is contained in:
LetterJay
2017-05-30 15:50:07 -05:00
committed by GitHub
2 changed files with 13 additions and 2 deletions
+3 -2
View File
@@ -44,11 +44,12 @@
//cleans up ALL references :)
/datum/holocall/Destroy()
user.reset_perspective()
if(user.client)
if(!QDELETED(eye) && user.client)
for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
chunk.remove(eye)
qdel(eye)
eye = null
user.remote_control = null
QDEL_NULL(eye)
user = null
if(hologram)
+10
View File
@@ -0,0 +1,10 @@
diff a/code/datums/holocall.dm b/code/datums/holocall.dm (rejected hunks)
@@ -45,7 +45,7 @@
var/user_good = !QDELETED(user)
if(user_good)
user.reset_perspective()
- user.remote_control = null
+ user.remote_control = null
if(!QDELETED(eye))
if(user_good && user.client)