From 5ff9a92a268298ecd501cbd334052d9de17efa98 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sat, 2 Jun 2012 02:08:42 +0000 Subject: [PATCH] Fix for getFlatIcon runtimes. I think when I changed DamageIcons from a list to a single image, I may have caused it. Basically, null was getting put in the overlays var at round start. Fix for view-vars refreshing. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3721 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/datumvars.dm | 6 ++---- code/modules/mob/living/carbon/human/human.dm | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 01d50fba7d0..2e488ab4271 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -757,16 +757,14 @@ client message_admins("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [M] ", 1) href_list["datumrefresh"] = href_list["mobToDamage"] else - return 0 - + . = 0 if (href_list["datumrefresh"]) - if(!href_list["datumrefresh"]) - return var/datum/DAT = locate(href_list["datumrefresh"]) if(!DAT) return if(!istype(DAT,/datum)) return src.debug_variables(DAT) + . = 1 return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f81f6eb2b79..f7c3063e1f8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -819,16 +819,14 @@ if (lying) icon = lying_icon - - overlays += damageicon_lying - + if(damageicon_lying) + overlays += damageicon_lying if (face_lying) overlays += face_lying else icon = stand_icon - - overlays += damageicon_standing - + if(damageicon_lying) + overlays += damageicon_standing if (face_standing) overlays += face_standing