diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 16f75422a7b..9cf08e8829b 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -64,7 +64,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -73,7 +73,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -82,7 +82,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -91,7 +91,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -100,7 +100,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -109,7 +109,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -118,7 +118,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -164,6 +164,7 @@ datum/game_mode/nations world << "[N.name] has captured all of the station. All glory to [N.name]" victory = 1 +/* /mob/proc/nations_status() set category = "OOC" set name = "Nation Status" @@ -176,12 +177,12 @@ datum/game_mode/nations var/dat dat += "

Vassalage Status

" for(var/obj/item/flag/nation/N in flag_list) - if(N.liege) + if(istype(N.liege,mind.nation)) dat += "[N.nation.name] is your vassal." if(istype(N.nation, mind.nation)) dat += "YOU are a vassal of [N.liege.name]." - +*/ /mob/proc/respawn_self() set category = "OOC" @@ -310,7 +311,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -319,7 +320,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -328,7 +329,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -337,7 +338,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -346,7 +347,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -355,7 +356,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!" @@ -364,7 +365,7 @@ datum/game_mode/nations 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/proc/nations_status 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]!"