shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32188

Browse Source
This commit is contained in:
deathride58
2017-11-18 05:31:42 +00:00
committed by GitHub
parent bc1f65b381 9e78bcd8f9
commit eeba86e27e
109 changed files with 452 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/brain/MMI.dm
+2 -2
View File
@@ -63,7 +63,7 @@
if(!newbrain.damaged_brain) // the brain organ hasn't been beaten to death.
brainmob.stat = CONSCIOUS //we manually revive the brain mob
GLOB.dead_mob_list -= brainmob
GLOB.living_mob_list += brainmob
GLOB.alive_mob_list += brainmob
brainmob.reset_perspective()
brain = newbrain
@@ -95,7 +95,7 @@
brainmob.stat = DEAD
brainmob.emp_damage = 0
brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision
GLOB.living_mob_list -= brainmob //Get outta here
GLOB.alive_mob_list -= brainmob //Get outta here
GLOB.dead_mob_list += brainmob
brain.brainmob = brainmob //Set the brain to use the brainmob
brainmob = null //Set mmi brainmob var to null
code/modules/mob/living/brain/posibrain.dm
+1 -1
View File
@@ -126,7 +126,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
brainmob.mind.assigned_role = new_role
brainmob.stat = CONSCIOUS
GLOB.dead_mob_list -= brainmob
GLOB.living_mob_list += brainmob
GLOB.alive_mob_list += brainmob
visible_message(new_mob_message)
check_success()