cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixhud (#20093)

Browse Source
This commit is contained in:
DeityLink
2018-10-11 17:00:06 +02:00
committed by jknpj
parent 78b047110a
commit 5fd897bdc9
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/modules/mob/dead/observer/observer.dm
View File

@@ -224,7 +224,7 @@ Works together with spawning an observer, noted above.
if(antagHUD) if(antagHUD)
var/list/target_list = list() var/list/target_list = list()
for(var/mob/living/target in oview(src)) for(var/mob/living/target in oview(src))
if( target.mind&&(target.mind.special_role||issilicon(target)) ) if( target.mind&&(target.mind.antag_roles.len > 0 || issilicon(target)) )
target_list += target target_list += target
if(target_list.len) if(target_list.len)
assess_targets(target_list, src) assess_targets(target_list, src)
@@ -309,29 +309,13 @@ Works together with spawning an observer, noted above.
var/icon/tempHud = 'icons/mob/hud.dmi' var/icon/tempHud = 'icons/mob/hud.dmi'
for(var/mob/living/target in target_list) for(var/mob/living/target in target_list)
if(iscarbon(target)) if(iscarbon(target))
switch(target.mind.special_role) for (var/R in target.mind.antag_roles)
if("traitor","Syndicate") var/datum/role/role = target.mind.antag_roles[R]
U.client.images += image(tempHud,target,"hudsyndicate") var/image/I = image('icons/role_HUD_icons.dmi', target, role.logo_state)
if("Revolutionary") I.pixel_x = 20 * PIXEL_MULTIPLIER
U.client.images += image(tempHud,target,"hudrevolutionary") I.pixel_y = 20 * PIXEL_MULTIPLIER
if("Head Revolutionary") I.plane = ANTAG_HUD_PLANE
U.client.images += image(tempHud,target,"hudheadrevolutionary") U.client.images += I
if("Cultist")
U.client.images += image(tempHud,target,"hudcultist")
if("Changeling")
U.client.images += image(tempHud,target,"hudchangeling")
if("Wizard","Fake Wizard")
U.client.images += image(tempHud,target,"hudwizard")
if("Hunter","Sentinel","Drone","Queen")
U.client.images += image(tempHud,target,"hudalien")
if("Death Commando")
U.client.images += image(tempHud,target,"huddeathsquad")
if("Vampire")
U.client.images += image(tempHud,target,"vampire")
if("VampThrall")
U.client.images += image(tempHud,target,"vampthrall")
else//If we don't know what role they have but they have one.
U.client.images += image(tempHud,target,"hudunknown1")
else if(issilicon(target))//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud. else if(issilicon(target))//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud.
var/mob/living/silicon/silicon_target = target var/mob/living/silicon/silicon_target = target
if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len))||silicon_target.mind.special_role=="traitor") if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len))||silicon_target.mind.special_role=="traitor")