Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev

This commit is contained in:
Zuhayr
2014-10-02 02:39:37 +09:30
221 changed files with 6700 additions and 9026 deletions
+1 -1
View File
@@ -203,7 +203,7 @@
if(istype(mob, /mob/living/carbon/human))
var/mob/living/carbon/human/H = mob
var/datum/organ/internal/brain/B = H.internal_organs_by_name["brain"]
if (B.damage < B.min_broken_damage)
if (B && B.damage < B.min_broken_damage)
B.take_damage(5)
else
mob.setBrainLoss(50)