diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index f3e0e552b6e..cce6cdd4603 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -786,6 +786,50 @@ /obj/structure/sign/flag/coalition/large/west/Initialize(mapload) . = ..(mapload, WEST) +//All-Xanu Republic +/obj/item/flag/xanu + name = "\improper All-Xanu Republic banner" + desc = "The banner of the All-Xanu Republic, the beating heart of the Coalition of Colonies." + desc_extended = "The banner of the All-Xanu Republic is a banner of three horizontal stripes, blue, orange, and green, with a white chevron featuring the same colors inset in each other. The blue represents liberty and freedom, orange represents determination and hard work, green represents the planet and its people, and the white represents justice and peace." + flag_path = "xanu" + flag_structure = /obj/structure/sign/flag/xanu + +/obj/structure/sign/flag/xanu + name = "\improper All-Xanu Republic banner" + desc = "The banner of the All-Xanu Republic, the beating heart of the Coalition of Colonies." + desc_extended = "The banner of the All-Xanu Republic is a banner of three horizontal stripes, blue, orange, and green, with a white chevron featuring the same colors inset in each other. The blue represents liberty and freedom, orange represents determination and hard work, green represents the planet and its people, and the white represents justice and peace." + icon_state = "xanu" + flag_path = "xanu" + flag_item = /obj/item/flag/xanu + +/obj/item/flag/xanu/l + name = "\improper All-Xanu Republic flag" + desc = "The flag of the All-Xanu Republic, the beating heart of the Coalition of Colonies" + desc_extended = "The flag of the All-Xanu Republic is a flag of three horizontal stripes, blue, orange, and green, with a white circle in the middle featuring the national crest of Xanu Prime, a peacock feather. The blue represents liberty and freedom, orange represents determination and hard work, green represents the planet and its people, white represents justice and peace, and the national crest represents the republic itself." + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/xanu/large + +/obj/structure/sign/flag/xanu/large + name = "\improper All-Xanu Republic flag" + desc = "The flag of the All-Xanu Republic, the beating heart of the Coalition of Colonies" + desc_extended = "The flag of the All-Xanu Republic is a flag of three horizontal stripes, blue, orange, and green, with a white circle in the middle featuring the national crest of Xanu Prime, a peacock feather. The blue represents liberty and freedom, orange represents determination and hard work, green represents the planet and its people, white represents justice and peace, and the national crest represents the republic itself." + icon_state = "xanu_l" + flag_path = "xanu" + flag_size = TRUE + flag_item = /obj/item/flag/xanu/l + +/obj/structure/sign/flag/xanu/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/xanu/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/xanu/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/xanu/large/west/Initialize(mapload) + . = ..(mapload, WEST) + // Varuca/Sedantis /obj/item/flag/sedantis diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm index 7d224d56809..f50dda1e22e 100644 --- a/code/modules/background/origins/origins/human/coalition.dm +++ b/code/modules/background/origins/origins/human/coalition.dm @@ -16,8 +16,8 @@ ) /singleton/origin_item/origin/xanu_prime - name = "Xanu Prime" - desc = "Xanu Prime has long been considered one of the most important planets in the Coalition of Colonies, housing its current capital. Xanans are a diverse body of people that value their freedom highly, and are known throughout the broader Spur as traders. Much of Xanu's surface is scarred due to damage inflicted upon the planet by the Solarian Alliance during the Interstellar War." + name = "All-Xanu Republic" + desc = "Xanu Prime has long been considered one of the most important planets in the Coalition of Colonies, housing its current capital. The citizens of the All-Xanu Republic, the government of the planet, are a diverse body of people that value their freedom highly, and are known throughout the broader Spur as traders. Much of Xanu's surface is scarred due to damage inflicted upon the planet by the Solarian Alliance during the Interstellar War." possible_accents = list(ACCENT_XANU) possible_citizenships = CITIZENSHIPS_COALITION possible_religions = list(RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_SHINTO, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_SIKHISM, RELIGION_OTHER, RELIGION_TRINARY, RELIGION_STOLITISM, RELIGION_MOROZ, RELIGION_LUCEISM) @@ -55,7 +55,7 @@ possible_religions = list(RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_OTHER, RELIGION_TRINARY, RELIGION_SCARAB) /singleton/origin_item/origin/gadpathur - name = "Gadpathur" + name = "United Planetary Defense Council of Gadpathur" desc = "During the Interstellar War, Gadpathur was orbitally bombarded by the Solarian Alliance until the planet was barely able to sustain human life. The planet has clawed its way back into stability over the intervening centuries, and is currently an ultra-militarized regime absolutely dedicated to ensuring that the Alliance is never again able to challenge the Coalition." important_information = "Because of Gadpathur's insular nature that is unwelcome to outsiders and its origins of being settled by Indian colonists, characters born on the planet must have names and physical characteristics typical of people from the modern-day Indian Subcontinent. Only native Gadpathurians may take the Gadpathuri accent. This is enforceable by server moderators and admins." possible_accents = list(ACCENT_GADPATHUR) diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 63b8339fe39..24ee9e34ef9 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -158,6 +158,7 @@ banners["banner, Zenghu Pharmaceuticals"] = /obj/item/flag/zenghu banners["banner, Zavodskoi Interstellar"] = /obj/item/flag/zavodskoi banners["banner, Coalition of Colonies"] = /obj/item/flag/coalition + banners["banner, All-Xanu Republic"] = /obj/item/flag/xanu banners["banner, Confederate States of Fisanduh"] = /obj/item/flag/fisanduh banners["banner, Gadpathur"] = /obj/item/flag/gadpathur banners["banner, Vysoka"] = /obj/item/flag/vysoka @@ -230,6 +231,7 @@ flags["flag, Zeng-Hu Pharmaceuticals"] = /obj/item/flag/zenghu/l flags["flag, Zavodskoi Interstellar"] = /obj/item/flag/zavodskoi/l flags["flag, Coalition of Colonies"] = /obj/item/flag/coalition/l + flags["flag, All-Xanu Republic"] = /obj/item/flag/xanu/l flags["flag, Confederate States of Fisanduh"] = /obj/item/flag/fisanduh/l flags["flag, Gadpathur"] = /obj/item/flag/gadpathur/l flags["flag, Vysoka"] = /obj/item/flag/vysoka/l diff --git a/html/changelogs/GeneralCamo - Xanu Flags.yml b/html/changelogs/GeneralCamo - Xanu Flags.yml new file mode 100644 index 00000000000..8925d301b56 --- /dev/null +++ b/html/changelogs/GeneralCamo - Xanu Flags.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a flag and banner for the All-Xanu Republic." + - tweak: "Gadpathur and Xanu's origins now use their government's title." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 203730c0751..cac7879d66c 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ