Merge pull request #655 from Citadel-Station-13/upstream-merge-26693

[MIRROR] Prevents GODMODE mobs from dying to organ removal
2017-05-01 08:00:07 -05:00
parent 061e49d651 c0e0e6c538
commit c93c5bf50f
1 changed files with 1 additions and 1 deletions
@@ -39,7 +39,7 @@
 		M.internal_organs -= src
 		if(M.internal_organs_slot[slot] == src)
 			M.internal_organs_slot.Remove(slot)
-		if(vital && !special)
+		if(vital && !special && !(M.status_flags & GODMODE))
 			M.death()
 	for(var/X in actions)
 		var/datum/action/A = X