From d9852332e2ffd692d75e8ad2b707cf1978d0f9d9 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 29 May 2014 12:27:14 -0400 Subject: [PATCH] Moar fixes --- code/game/gamemodes/nations/nations.dm | 15 +++++++++++++++ code/modules/mob/living/carbon/human/life.dm | 14 +++++++++++++- icons/mob/hud.dmi | Bin 3783 -> 4073 bytes 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 201469225a6..4058cbb8740 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -60,6 +60,7 @@ datum/game_mode/nations if(H.mind) if(H.mind.assigned_role in engineering_positions) H.mind.nation = all_nations["Atmosia"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -67,6 +68,7 @@ datum/game_mode/nations continue else if(H.mind.assigned_role in medical_positions) H.mind.nation = all_nations["Medistan"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -74,6 +76,7 @@ datum/game_mode/nations continue else if(H.mind.assigned_role in science_positions) H.mind.nation = all_nations["Scientopia"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -81,6 +84,7 @@ datum/game_mode/nations continue else if(H.mind.assigned_role in security_positions) H.mind.nation = all_nations["Brigston"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -88,6 +92,7 @@ datum/game_mode/nations continue else if(H.mind.assigned_role in cargonians) H.mind.nation = all_nations["Cargonia"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -95,6 +100,7 @@ datum/game_mode/nations continue else if(H.mind.assigned_role in civilian_positions) H.mind.nation = all_nations["People's Republic of Commandzakstan"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -102,6 +108,7 @@ datum/game_mode/nations continue else if(H.mind.assigned_role == "Captain") H.mind.nation = all_nations["People's Republic of Commandzakstan"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -272,6 +279,7 @@ datum/game_mode/nations data_core.manifest_inject(new_character) new_character << "You have been fully respawned. Get back in the fight!." + new_character.hud_updateflag |= 1 << SPECIALROLE_HUD return new_character @@ -289,6 +297,7 @@ datum/game_mode/nations if(H.mind) if(H.mind.assigned_role in engineering_positions) H.mind.nation = all_nations["Atmosia"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -296,6 +305,7 @@ datum/game_mode/nations return else if(H.mind.assigned_role in medical_positions) H.mind.nation = all_nations["Medistan"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -303,6 +313,7 @@ datum/game_mode/nations return else if(H.mind.assigned_role in science_positions) H.mind.nation = all_nations["Scientopia"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -310,6 +321,7 @@ datum/game_mode/nations return else if(H.mind.assigned_role in security_positions) H.mind.nation = all_nations["Brigston"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -317,6 +329,7 @@ datum/game_mode/nations return else if(H.mind.assigned_role in cargonians) H.mind.nation = all_nations["Cargonia"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -324,6 +337,7 @@ datum/game_mode/nations return else if(H.mind.assigned_role in civilian_positions) H.mind.nation = all_nations["Command"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost @@ -331,6 +345,7 @@ datum/game_mode/nations return else if(H.mind.assigned_role == "Captain") H.mind.nation = all_nations["Command"] + H.hud_updateflag |= 1 << SPECIALROLE_HUD H.verbs += /mob/proc/respawn_self H.verbs += /mob/proc/nations_status H.verbs -= /mob/living/verb/ghost diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 6766febfbf1..e71c33818db 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1983,7 +1983,19 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc holder.icon_state = "loyalist" if("head_mutineer") holder.icon_state = "mutineer" - + switch(mind.nation.name) + if("Atmosia") + holder.icon_state = "hudcommand" + if("Brigston") + holder.icon_state = "hudbrigston" + if("Cargonia") + holder.icon_state = "hudcargonia" + if("People's Republic of Commandzakstan") + holder.icon_state = "hudcommand" + if("Medistan") + holder.icon_state = "hudmedistan" + if("Scientopia") + holder.icon_state = "hudscientopia" hud_list[SPECIALROLE_HUD] = holder diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index c66f23dfc4c18cfa1a95f3a764256669808f1bca..c89db22e4bdf2477d1990f6364b7680a46e2c98d 100644 GIT binary patch delta 3799 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 delta 3509 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