diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 7cf84cfd2d8..a3adde4e7cb 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -204,6 +204,7 @@ datum/game_mode/nations dat += "the commands of ANY of their members.
" else dat += "You are not currently vassalized by anyone! Protect your flag!
" + dat += "" dat += "
" if(F.vassals.len) @@ -211,7 +212,10 @@ datum/game_mode/nations dat += "[V.name] is your vassal and must obey the commands of ANY of your members." else dat += "You do not currently have any vassals! Capture flags to vassalize!
" + dat += "
Vassals
" + dat += "" + usr << browse(dat, "window=nationstatus;size=400x500") /mob/proc/respawn_self() set category = "OOC" @@ -346,7 +350,7 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else if(H.mind.assigned_role in medical_positions) H.mind.nation = all_nations["Medistan"] H.hud_updateflag |= 1 << NATIONS_HUD @@ -357,7 +361,7 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else if(H.mind.assigned_role in science_positions) H.mind.nation = all_nations["Scientopia"] H.hud_updateflag |= 1 << NATIONS_HUD @@ -368,7 +372,7 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else if(H.mind.assigned_role in security_positions) H.mind.nation = all_nations["Brigston"] H.hud_updateflag |= 1 << NATIONS_HUD @@ -379,7 +383,7 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else if(H.mind.assigned_role in cargonians) H.mind.nation = all_nations["Cargonia"] H.hud_updateflag |= 1 << NATIONS_HUD @@ -390,7 +394,7 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else if(H.mind.assigned_role in civilian_positions) H.mind.nation = all_nations["People's Republic of Commandzakstan"] H.hud_updateflag |= 1 << NATIONS_HUD @@ -401,7 +405,7 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else if(H.mind.assigned_role in command_positions) H.mind.nation = all_nations["People's Republic of Commandzakstan"] H.hud_updateflag |= 1 << NATIONS_HUD @@ -412,10 +416,12 @@ datum/game_mode/nations H.verbs -= /mob/living/verb/ghost H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand) H << "You are now part of the great sovereign nation of [H.mind.nation.name]!" - return + return 1 else message_admins("[H.name] with [H.mind.assigned_role] could not find any nation to assign!") return 1 + message_admins("[H.name] latejoined with no mind.") + return 1 /proc/get_nations_mode() if(!ticker || !istype(ticker.mode, /datum/game_mode/nations)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 675dae1304c..415b9f79cf4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -5,7 +5,7 @@ voice_name = "unknown" icon = 'icons/mob/human.dmi' icon_state = "body_m_s" - var/list/hud_list[9] + var/list/hud_list[10] var/datum/species/species //Contains icon generation and language information, set during New(). var/embedded_flag //To check if we've need to roll for damage on movement while an item is imbedded in us. @@ -88,7 +88,7 @@ hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[STATUS_HUD_OOC] = image('icons/mob/hud.dmi', src, "hudhealthy") - + hud_list[NATIONS_HUD] = image('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 585d23c1743..aa01c5d8a19 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1544,13 +1544,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc see_invisible = SEE_INVISIBLE_LIVING if(ticker && ticker.mode.name == "nations") - var/list/target_list = list() - for(var/mob/living/target in oview(src, 14)) - if(target.mind&&(target.mind.nation)) - target_list += target - if(target_list.len) - assess_targets(target_list, src) - + process_nations() if(healths) if (analgesic) @@ -2020,8 +2014,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc var/image/holder = hud_list[NATIONS_HUD] holder.icon_state = "hudblank" - if(mind) - + if(mind && mind.nation) switch(mind.nation.name) if("Atmosia") holder.icon_state = "hudatmosia" @@ -2040,10 +2033,11 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc hud_updateflag = 0 -/mob/living/carbon/human/proc/assess_targets(list/target_list, mob/dead/observer/U) - var/client/C = U.client - for(var/mob/living/carbon/human/target in target_list) - C.images += target.hud_list[NATIONS_HUD] + +/mob/living/carbon/human/proc/process_nations() + var/client/C = client + for(var/mob/living/carbon/human/H in oview(src, 14)) + C.images += H.hud_list[NATIONS_HUD] #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index daf78c7997f..2e0c241efcb 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -138,7 +138,7 @@ var/list/ai_list = list() hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank") - + hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank") ai_list += src ..() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 98b4fe95d4f..34920f8d17c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -154,6 +154,7 @@ hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank") hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank") + hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank") if(istype(src,/mob/living/silicon/robot/drone)) playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index ba8e18c65d0..41d7ee7a545 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -7,7 +7,7 @@ var/list/alarms_to_show = list() var/list/alarms_to_clear = list() immune_to_ssd = 1 - var/list/hud_list[9] + var/list/hud_list[10] var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0) var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)