diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 47b2959cb97..4432e264bcf 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -3066,3 +3066,48 @@ /obj/structure/sign/flag/scarab/large/west/Initialize(mapload) . = ..(mapload, WEST) + +//Traditionalist Coalition + +/obj/item/flag/traditionalist + name = "\improper Traditionalist Coalition flag" + desc = "The blue-and-green battle standard of the defeated Traditionalist Coalition. Flying this flag is an act of treason under Izweski law." + desc_extended = "The Traditionalist Coalition chose a simple flag to represent its myriad nations - blue for the waters and green for the earth of Moghes, with gilded axes representing their willingness to fight for their beliefs. \ + Given the events of the Contact War, the colors of the flag are often considered somewhat of a bitter irony." + flag_path = "traditionalist" + flag_structure = /obj/structure/sign/flag/traditionalist + +/obj/structure/sign/flag/traditionalist + name = "\improper Traditionalist Coalition flag" + desc = "The blue-and-green battle standard of the defeated Traditionalist Coalition. Flying this flag is a high crime under Izweski law." + desc_extended = "The Traditionalist Coalition chose a simple flag to represent its myriad nations - blue for the waters and green for the earth of Moghes, with gilded axes representing their willingness to fight for their beliefs. \ + Given the events of the Contact War, the colors of the flag are often considered somewhat of a bitter irony." + flag_path = "traditionalist" + icon_state = "traditionalist" + flag_item = /obj/item/flag/traditionalist + +/obj/structure/sign/flag/traditionalist/unmovable + unmovable = TRUE + +/obj/item/flag/traditionalist/l + name = "large Traditionalist Coalition flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/traditionalist/large + +/obj/structure/sign/flag/traditionalist/large + icon_state = "traditionalist_l" + flag_path = "traditionalist" + flag_size = TRUE + flag_item = /obj/item/flag/traditionalist/l + +/obj/structure/sign/flag/scarab/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/scarab/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/scarab/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/scarab/large/west/Initialize(mapload) + . = ..(mapload, WEST) diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 56a06cc3103..5a47009eec9 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -192,6 +192,7 @@ banners["banner, Tsukuyomi"] = /obj/item/flag/tsukuyomi banners["banner, Svarog"] = /obj/item/flag/svarog banners["banner, Empyrean"] = /obj/item/flag/empyrean + banners["banner, Traditinalist Coalition"] = /obj/item/flag/traditionalist gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -275,6 +276,7 @@ flags["flag, Tsukuyomi"] = /obj/item/flag/tsukuyomi/l flags["flag, Svarog"] = /obj/item/flag/svarog/l flags["flag, Empyrean"] = /obj/item/flag/empyrean/l + flags["flag, Traditionalist Coalition"] = /obj/item/flag/traditionalist/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/RustingWithYou - trad.yml b/html/changelogs/RustingWithYou - trad.yml new file mode 100644 index 00000000000..dbfd933435c --- /dev/null +++ b/html/changelogs/RustingWithYou - trad.yml @@ -0,0 +1,41 @@ +################################ +# 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: RustingWithYou + +# 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: "Adds a Traditionalist Coalition battle standard." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 12d2ca9d671..218a361e729 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ