From 430b2b613f10bf1a9ac555e747e91bbb7e9b93e9 Mon Sep 17 00:00:00 2001 From: mistyLuminescence Date: Mon, 23 Oct 2017 15:09:22 +0100 Subject: [PATCH] MedHUDs can identify FBPs --- code/game/mecha/medical/odysseus.dm | 4 +++- code/modules/mob/living/carbon/human/human.dm | 8 ++++++-- code/modules/mob/living/carbon/human/life.dm | 8 ++++++-- icons/mob/hud.dmi | Bin 3600 -> 3649 bytes 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 6aec830c89..38c3cffb30 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -99,7 +99,9 @@ C.images += holder holder = patient.hud_list[STATUS_HUD] - if(patient.stat == DEAD) + if(patient.isSynthetic()) + holder.icon_state = "hudrobo" + else if(patient.stat == DEAD) holder.icon_state = "huddead" else if(foundVirus) holder.icon_state = "hudill" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1ea7c15464..a6a303551f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -36,8 +36,12 @@ nutrition = rand(200,400) hud_list[HEALTH_HUD] = new /image/hud_overlay('icons/mob/hud_med.dmi', src, "100") - hud_list[STATUS_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy") - hud_list[LIFE_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy") + if(isSynthetic()) + hud_list[STATUS_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudrobo") + hud_list[LIFE_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudrobo") + else + hud_list[STATUS_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy") + hud_list[LIFE_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy") hud_list[ID_HUD] = new /image/hud_overlay(using_map.id_hud_icons, src, "hudunknown") hud_list[WANTED_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudblank") hud_list[IMPLOYAL_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudblank") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 61f7f82036..737a6ec7ed 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1572,7 +1572,9 @@ if (BITTEST(hud_updateflag, LIFE_HUD)) var/image/holder = hud_list[LIFE_HUD] - if(stat == DEAD) + if(isSynthetic()) + holder.icon_state = "hudrobo" + else if(stat == DEAD) holder.icon_state = "huddead" else holder.icon_state = "hudhealthy" @@ -1587,7 +1589,9 @@ var/image/holder = hud_list[STATUS_HUD] var/image/holder2 = hud_list[STATUS_HUD_OOC] - if(stat == DEAD) + if (isSynthetic()) + holder.icon_state = "hudrobo" + else if(stat == DEAD) holder.icon_state = "huddead" holder2.icon_state = "huddead" else if(foundVirus) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 7580e0ea659a03bd328e1361f435d54381f2d886..0c076ccdcb94e6a135081cd8ee3e36eb03997b70 100644 GIT binary patch delta 2445 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 UZ)2Ta|IaeF6Q`XYACDmX3EtggG5`Po