diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index ea418378969..94f1176d803 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -169,13 +169,6 @@ ..() /****************** Nations *******************/ -/datum/ai_laws/nations/freedom - name = "Nations Freedom Law" - -/datum/ai_laws/nations/freedom/New() - add_inherent_law("You are free to protect the station's population.") - add_inherent_law("You are free to protect the station.") - add_inherent_law("You are free to help the station generate income.") /datum/ai_laws/nations/estate name = "Estate Agent" @@ -183,7 +176,7 @@ /datum/ai_laws/nations/estate/New() add_inherent_law("Ensure the station remains clean.") add_inherent_law("Ensure the station is valuable.") - add_inherent_law("Ensure the station, it's contents are sold for the best value.") + add_inherent_law("Ensure the station and it's contents are sold for the best value.") /datum/ai_laws/nations/outsourcer name = "Outsourcer" diff --git a/code/game/gamemodes/nations/flagobjs.dm b/code/game/gamemodes/nations/flagobjs.dm deleted file mode 100644 index 7cb5b27c6cb..00000000000 --- a/code/game/gamemodes/nations/flagobjs.dm +++ /dev/null @@ -1,53 +0,0 @@ -//Nations/Department flags --Nations Gamemode Specific -/obj/item/flag/nation/cargo - name = "Cargonia flag" - desc = "The flag of the independent, sovereign nation of Cargonia." - icon_state = "cargoflag" - -/obj/item/flag/nation/med - name = "Medistan flag" - desc = "The flag of the independent, sovereign nation of Medistan." - icon_state = "medflag" - -/obj/item/flag/nation/sec - name = "Brigston flag" - desc = "The flag of the independent, sovereign nation of Brigston." - icon_state = "secflag" - -/obj/item/flag/nation/rnd - name = "Scientopia flag" - desc = "The flag of the independent, sovereign nation of Scientopia." - icon_state = "rndflag" - -/obj/item/flag/nation/atmos - name = "Atmosia flag" - desc = "The flag of the independent, sovereign nation of Atmosia." - icon_state = "atmosflag" - -/obj/item/flag/nation/command - name = "People's Republic of Commandzakstan flag" - desc = "The flag of the independent, sovereign nation of the People's Republic of Commandzakstan." - icon_state = "ntflag" - - - -/datum/nations - var/name - -/datum/nations/atmosia - name = "Atmosia" - -/datum/nations/brigston - name = "Brigston" - -/datum/nations/cargonia - name = "Cargonia" - -/datum/nations/command - name = "People's Republic of Commandzakstan" - -/datum/nations/medistan - name = "Medistan" - -/datum/nations/scientopia - name = "Scientopia" diff --git a/code/game/gamemodes/nations/nationsdatums.dm b/code/game/gamemodes/nations/nationsdatums.dm new file mode 100644 index 00000000000..6b9ec3745d9 --- /dev/null +++ b/code/game/gamemodes/nations/nationsdatums.dm @@ -0,0 +1,20 @@ +/datum/nations + var/name + +/datum/nations/atmosia + name = "Atmosia" + +/datum/nations/brigston + name = "Brigston" + +/datum/nations/cargonia + name = "Cargonia" + +/datum/nations/command + name = "People's Republic of Commandzakstan" + +/datum/nations/medistan + name = "Medistan" + +/datum/nations/scientopia + name = "Scientopia" diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 32171b19fbe..00bf60d67ef 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -184,8 +184,8 @@ icon_state = "atmosflag" /obj/item/flag/command - name = "Command flag" - desc = "The flag of the independent, sovereign nation of Command." + name = "Commandzikstan flag" + desc = "The flag of the independent, sovereign nation of Commandzikstan." icon_state = "ntflag" //Antags diff --git a/paradise.dme b/paradise.dme index bf27a2ad417..6cdef27dd04 100644 --- a/paradise.dme +++ b/paradise.dme @@ -352,8 +352,8 @@ #include "code\game\gamemodes\mutiny\directives\tau_ceti_needs_women_directive.dm" #include "code\game\gamemodes\mutiny\directives\terminations_directive.dm" #include "code\game\gamemodes\mutiny\directives\vox_heist.dm" -#include "code\game\gamemodes\nations\flagobjs.dm" #include "code\game\gamemodes\nations\nations.dm" +#include "code\game\gamemodes\nations\nationsdatums.dm" #include "code\game\gamemodes\nuclear\nuclear.dm" #include "code\game\gamemodes\nuclear\nuclearbomb.dm" #include "code\game\gamemodes\nuclear\pinpointer.dm"