diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 18c4e517106..e50f2101c39 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -3288,6 +3288,136 @@ /obj/structure/sign/flag/hiskyn/unmovable unmovable = TRUE +//The Consortium + +/obj/item/flag/consortium + name = "\improper Consortium flag" + desc = "The flag of The Consortium of Hieroaetheria." + desc_extended = "Founded decades prior to any outside interference, though by the name of the Affiliation - at least according to the direct translation from Rootsong - it was a loose confederation of dozens of conglomerates present across the region of Mede." + flag_path = "consortium" + flag_structure = /obj/structure/sign/flag/consortium + +/obj/structure/sign/flag/consortium + name = "\improper Consortium flag" + desc = "The flag of The Consortium of Hieroaetheria." + desc_extended = "Founded decades prior to any outside interference, though by the name of the Affiliation - at least according to the direct translation from Rootsong - it was a loose confederation of dozens of conglomerates present across the region of Mede." + flag_path = "consortium" + icon_state = "consortium" + flag_item = /obj/item/flag/consortium + +/obj/structure/sign/flag/consortium/unmovable + unmovable = TRUE + +/obj/item/flag/consortium/l + name = "large Consortium flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/consortium/large + +/obj/structure/sign/flag/consortium/large + icon_state = "consortium_l" + flag_path = "consortium" + flag_size = TRUE + flag_item = /obj/item/flag/consortium/l + +/obj/structure/sign/flag/consortium/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/consortium/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/consortium/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/consortium/large/west/Initialize(mapload) + . = ..(mapload, WEST) + + //The Eternal Republic of the Ekane +/obj/item/flag/ekane + name = "\improper Ekane flag" + desc = "The flag of the Eternal Republic of the Ekane." + desc_extended = "A theocratic autocracy, the Eternal Republic of the Ekane was founded after first contact with the Skrell in 2390 CE - in which by then the Eternal spread rife throughout the community.\ + Roughly a decade following its introduction to Hieroaetheria, the Eternal had managed to conglomerate primarily within the cities dotting the Ekane region of the planet - which eventually saw unification beneath the banner of the Eternal Republic of the Ekane." + flag_path = "ekane" + flag_structure = /obj/structure/sign/flag/ekane + +/obj/structure/sign/flag/ekane + name = "\improper Ekane flag" + desc = "The flag of the Eternal Republic of the Ekane" + desc_extended = "A theocratic autocracy, the Eternal Republic of the Ekane was founded after first contact with the Skrell in 2390 CE - in which by then the Eternal spread rife throughout the community.\ + Roughly a decade following its introduction to Hieroaetheria, the Eternal had managed to conglomerate primarily within the cities dotting the Ekane region of the planet - which eventually saw unification beneath the banner of the Eternal Republic of the Ekane." + flag_path = "ekane" + icon_state = "ekane" + flag_item = /obj/item/flag/ekane + +/obj/structure/sign/flag/ekane/unmovable + unmovable = TRUE + +/obj/item/flag/ekane/l + name = "large Ekane flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/ekane/large + +/obj/structure/sign/flag/ekane/large + icon_state = "ekane_l" + flag_path = "ekane" + flag_size = TRUE + flag_item = /obj/item/flag/ekane/l + +/obj/structure/sign/flag/ekane/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/ekane/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/ekane/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/ekane/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +//The Union of Gla'orr +/obj/item/flag/glaorr + name = "\improper Gla'orr flag" + desc = "The flag of the Union of Gla'orr." + desc_extended = "Autocratic, and staunchly opposed to further integration of non-Dionae, the Union of Gla'orr is largely considered an affront to all the ideals held by the Consortium, an anti-thesis to the growing democratic tendencies of Hieroaetheria." + flag_path = "glaorr" + flag_structure = /obj/structure/sign/flag/glaorr + +/obj/structure/sign/flag/glaorr + name = "\improper Gla'orr flag" + desc = "The flag of the Union of Gla'orr" + desc_extended = "Autocratic, and staunchly opposed to further integration of non-Dionae, the Union of Gla'orr is largely considered an affront to all the ideals held by the Consortium, an anti-thesis to the growing democratic tendencies of Hieroaetheria." + flag_path = "glaorr" + icon_state = "glaorr" + flag_item = /obj/item/flag/glaorr + +/obj/structure/sign/flag/glaorr/unmovable + unmovable = TRUE + +/obj/item/flag/glaorr/l + name = "large Gla'orr flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/glaorr/large + +/obj/structure/sign/flag/glaorr/large + icon_state = "glaorr_l" + flag_path = "glaorr" + flag_size = TRUE + flag_item = /obj/item/flag/glaorr/l + +/obj/structure/sign/flag/glaorr/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/glaorr/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/glaorr/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/glaorr/large/west/Initialize(mapload) + . = ..(mapload, WEST) + + //Unathi Ruin Flags/Tapestries /obj/item/flag/unathi_tapestry name = "folded tapestry" diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 114d6043e09..0bca4f652ca 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -262,6 +262,9 @@ banners["banner, Traditinalist Coalition"] = /obj/item/flag/traditionalist banners["banner, Callisto"] = /obj/item/flag/callisto banners["banner, Venus"] = /obj/item/flag/venus + banners["banner, The Consortium of Hieroaetheria"] = /obj/item/flag/consortium + banners["banner, Eternal Republic of the Ekane"] = /obj/item/flag/ekane + banners["banner, Union of Gla'orr"] = /obj/item/flag/glaorr gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -349,6 +352,9 @@ flags["flag, Traditionalist Coalition"] = /obj/item/flag/traditionalist/l flags["flag, Callisto"] = /obj/item/flag/callisto/l flags["flag, Venus"] = /obj/item/flag/venus/l + flags["flag, The Consortium of Hieroaetheria"] = /obj/item/flag/consortium/l + flags["flag, Eternal Republic of the Ekane"] = /obj/item/flag/ekane/l + flags["flag, Union of Gla'orr"] = /obj/item/flag/glaorr/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/Stev-the-third-hieroflags.yml b/html/changelogs/Stev-the-third-hieroflags.yml new file mode 100644 index 00000000000..6d00b153c57 --- /dev/null +++ b/html/changelogs/Stev-the-third-hieroflags.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Stev-the-third + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds three Hieroaetheria faction flags." + - rscadd: "Adds the Hieroaetheria faction flags to the loadout." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index a39973e0745..88a98e1beaf 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ