Flashing mobs without eyes caused errors
This commit is contained in:
SoundScopes
2014-12-24 08:07:13 +00:00
parent f98eeafb76
commit f01bf616cf
6 changed files with 21 additions and 10 deletions
@@ -112,6 +112,8 @@
severity = min(max(severity, 0), 4)
var/mob/living/carbon/human/H = C
var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
if(!E)
return
switch(severity)
if(0)
@@ -20,7 +20,7 @@
var/damage = round(30/(get_dist(B,get_turf(src))+1))
B.health -= damage
B.update_icon()
new/obj/effect/effect/smoke/flashbang(src.loc)
del(src)
return
@@ -84,7 +84,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
if (E.damage >= E.min_bruised_damage)
if (E && E.damage >= E.min_bruised_damage)
M << "\red Your eyes start to burn badly!"
if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang)))
if (E.damage >= E.min_broken_damage)
+2
View File
@@ -381,6 +381,8 @@
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
if(!E)
return
if(H.species.flags & IS_SYNTHETIC)
return
switch(safety)