Post test #3 nations bugfixes

This commit is contained in:
ZomgPonies
2014-05-28 18:20:22 -04:00
parent 225fd465c1
commit ea084c06eb
3 changed files with 10 additions and 10 deletions
+6 -6
View File
@@ -58,9 +58,9 @@
var/obj/item/flag/nation/N = locate(liege.flagpath)
for(var/mob/living/carbon/human/H in player_list)
if(H.mind && H.mind.nation)
if(H.mind.nation == liege)
if(istype(H.mind.nation.flagpath,N))
H << "<span class='warning'>You are no longer the liege of [nation.name]!</span>"
if(H.mind.nation == nation)
if(istype(H.mind.nation.flagpath,src))
H << "<span class='warning'>You are no longer vassals of [liege.name]!</span>"
N.vassals -= nation
@@ -82,10 +82,10 @@
//Announce capture/vassalage here.
for(var/mob/living/carbon/human/H in player_list)
if(H.mind && H.mind.nation)
if(H.mind.nation == F.nation)
if(istype(H.mind.nation.flagpath,F))
H << "<span class='warning'>You have just vassalized [nation.name]! They must now obey any memebrs of your nation!</span>"
continue
else if(H.mind.nation == nation)
else if(istype(H.mind.nation.flagpath,src))
H << "<span class='warning'>You are now vassals of [liege.name]! You must now obey the orders of any of their members!</span>"
continue
//Check for Victory
@@ -132,7 +132,7 @@
nation = /datum/nations/atmosia
/obj/item/flag/nation/command
name = "Command flag"
desc = "The flag of the independant, sovereign nation of Command."
name = "People's Republic of Commandzakstan flag"
desc = "The flag of the independant, sovereign nation of the People's Republic of Commandzakstan."
icon_state = "ntflag"
nation = /datum/nations/command
+1 -1
View File
@@ -15,7 +15,7 @@
flagpath = /obj/item/flag/nation/cargo
/datum/nations/command
name = "Command"
name = "People's Republic of Commandzakstan"
flagpath = /obj/item/flag/nation/command
/datum/nations/medistan
+3 -3
View File
@@ -47,7 +47,7 @@ datum/game_mode/nations
new /obj/item/flag/nation/sec(get_turf(N))
if("Cargonia")
new /obj/item/flag/nation/cargo(get_turf(N))
if("Command")
if("People's Republic of Commandzakstan")
new /obj/item/flag/nation/command(get_turf(N))
if("Medistan")
new /obj/item/flag/nation/med(get_turf(N))
@@ -89,13 +89,13 @@ datum/game_mode/nations
H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
continue
else if(H.mind.assigned_role in civilian_positions)
H.mind.nation = all_nations["Command"]
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
H.verbs += /mob/proc/respawn_self
H.verbs -= /mob/living/verb/ghost
H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
continue
else if(H.mind.assigned_role == "Captain")
H.mind.nation = all_nations["Command"]
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
H.verbs += /mob/proc/respawn_self
H.verbs -= /mob/living/verb/ghost
H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"