Runtime and bug fixes

This commit is contained in:
Markolie
2015-08-12 18:20:53 +02:00
parent 92fdc4bfa4
commit 362a817d79
14 changed files with 45 additions and 12 deletions
@@ -452,6 +452,9 @@
blood_color = "#1F181F"
flesh_color = "#AAAAAA"
reagent_tag = PROCESS_SYN
has_organ = list(
)
/datum/species/machine/handle_death(var/mob/living/carbon/human/H)
H.emote("deathgasp")
@@ -213,6 +213,7 @@ var/global/list/damage_icon_parts = list()
if(O.damage_state == "00") continue
var/icon/DI
var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.name]"
if(damage_icon_parts[cache_index] == null)
DI = new /icon(species.damage_overlays, O.damage_state) // the damage icon for whole human
DI.Blend(new /icon(species.damage_mask, O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels
@@ -216,7 +216,7 @@
..()
/datum/objective/revenant/check_completion()
if(!istype(owner.current, /mob/living/simple_animal/revenant) || !owner.current)
if(!owner || !istype(owner.current, /mob/living/simple_animal/revenant))
return 0
var/mob/living/simple_animal/revenant/R = owner.current
if(!R || R.stat == DEAD)