cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 23:23:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2710 from VOREStation/aro-nifcryo

Browse Source 
Despawn NIF occupants in cryo
This commit is contained in:
Arokha Sieyes
2018-01-09 11:56:15 -05:00
committed by GitHub
parent 399da4545b 636f9601b7
commit fafd5cb0bd
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/nifsoft/software/13_soulcatcher.dm
+2 -1
View File
@@ -48,7 +48,7 @@
nif.human.verbs |= /mob/living/carbon/human/proc/nme
uninstall()
if((. = ..()))
if((. = ..()) && nif && nif.human) //Sometimes NIFs are deleted outside of a human
nif.human.verbs -= /mob/living/carbon/human/proc/nsay
nif.human.verbs -= /mob/living/carbon/human/proc/nme
@@ -201,6 +201,7 @@
//Put the mind and player into the mob
M.mind.transfer_to(brainmob)
brainmob.name = brainmob.mind.name
brainmob.real_name = brainmob.mind.name
//If we caught our owner, special settings.
if(M == nif.human)