diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 8db1e556284..36e96c511b2 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1390,6 +1390,84 @@ /obj/structure/sign/flag/biesel/large/west/New() ..(loc, WEST) +/obj/item/flag/biesel/old + name = "old Autonomous Solarian Republic of Biesel flag" + desc = "The flag used by Biesel and Valkyrie while they were semi-autonomous colonies of the Solarian Alliance, re-instated briefly during the 33rd Fleet's invasion and occupation in 2459. Due to this and the general hatred of the Sol Alliance across Tau Ceti, displaying this flag anywhere in Tau Ceti space would be a bold move, and is illegal as it often carries anti-corporatist and/or treasonous sentiments." + flag_path = "biesel_old" + flag_structure = /obj/structure/sign/flag/biesel/old + +/obj/structure/sign/flag/biesel/old + name = "old Autonomous Solarian Republic of Biesel flag" + desc = "The flag used by Biesel and Valkyrie while they were semi-autonomous colonies of the Solarian Alliance, re-instated briefly during the 33rd Fleet's invasion and occupation in 2459. Due to this and the general hatred of the Sol Alliance across Tau Ceti, displaying this flag anywhere in Tau Ceti space would be a bold move, and is illegal as it often carries anti-corporatist and/or treasonous sentiments." + flag_path = "biesel_old" + icon_state = "biesel_old" + flag_item = /obj/item/flag/biesel/old + +/obj/structure/sign/flag/biesel/old/unmovable + unmovable = TRUE + +/obj/item/flag/biesel/old/l + name = "large old Autonomous Solarian Republic of Biesel flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/biesel/old/large + +/obj/structure/sign/flag/biesel/old/large + icon_state = "biesel_old_l" + flag_path = "biesel_old" + flag_size = TRUE + flag_item = /obj/item/flag/biesel/old/l + +/obj/structure/sign/flag/biesel/old/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/biesel/old/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/biesel/old/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/biesel/old/large/west/New() + ..(loc, WEST) + +/obj/item/flag/biesel/antique + name = "antique Solarian Colonial Mandate of Tau Ceti flag" + desc = "The flag used by Biesel and Valkyrie before the Interstellar War, during its initial colonization. This flag still has the old Solarian Alliance canton in the corner. This flag is old enough that it is considered an antique and not illegal to display, but would still be a bad move to publicly display it in Tau Ceti space, primarily due to its rarity." + flag_path = "biesel_antique" + flag_structure = /obj/structure/sign/flag/biesel/antique + +/obj/structure/sign/flag/biesel/antique + name = "antique Solarian Colonial Mandate of Tau Ceti flag" + desc = "The flag used by Biesel and Valkyrie before the Interstellar War, during its initial colonization. This flag still has the old Solarian Alliance canton in the corner. This flag is old enough that it is considered an antique and not illegal to display, but would still be a bad move to publicly display it in Tau Ceti space, primarily due to its rarity." + flag_path = "biesel_antique" + icon_state = "biesel_antique" + flag_item = /obj/item/flag/biesel/antique + +/obj/structure/sign/flag/biesel/antique/unmovable + unmovable = TRUE + +/obj/item/flag/biesel/antique/l + name = "large antique Solarian Colonial Mandate of Tau Ceti flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/biesel/antique/large + +/obj/structure/sign/flag/biesel/antique/large + icon_state = "biesel_antique_l" + flag_path = "biesel_antique" + flag_size = TRUE + flag_item = /obj/item/flag/biesel/antique/l + +/obj/structure/sign/flag/biesel/antique/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/biesel/antique/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/biesel/antique/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/biesel/antique/large/west/New() + ..(loc, WEST) + // SCC /obj/item/flag/scc diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 1a4303bddc1..63b8339fe39 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -150,6 +150,7 @@ banners["banner, New Kingdom of Adhomai"] = /obj/item/flag/nka banners["banner, Free Tajaran Council"] = /obj/item/flag/ftc banners["banner, Republic of Biesel"] = /obj/item/flag/biesel + banners["banner, Solarian Colonial Mandate of Tau Ceti"] = /obj/item/flag/biesel/antique banners["banner, CT-EUM"] = /obj/item/flag/cteum banners["banner, Trinary Perfection"] = /obj/item/flag/trinaryperfection banners["banner, Hephaestus Industries"] = /obj/item/flag/heph @@ -222,6 +223,7 @@ flags["flag, New Kingdom of Adhomai"] = /obj/item/flag/nka/l flags["flag, Free Tajaran Council"] = /obj/item/flag/ftc/l flags["flag, Republic of Biesel"] = /obj/item/flag/biesel/l + flags["flag, Solarian Colonial Mandate of Tau Ceti"] = /obj/item/flag/biesel/antique/l flags["flag, Trinary Perfection"] = /obj/item/flag/trinaryperfection/l flags["flag, Hephaestus Industries"] = /obj/item/flag/heph/l flags["flag, Idris Incorporated"] = /obj/item/flag/idris/l diff --git a/html/changelogs/GeneralCamo - Old Biesel Flags.yml b/html/changelogs/GeneralCamo - Old Biesel Flags.yml new file mode 100644 index 00000000000..33280d5f101 --- /dev/null +++ b/html/changelogs/GeneralCamo - Old Biesel 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 an old Biesel flag, representing its time as a semi-autonomous colony of Sol." + - rscadd: "Added an antique Biesel flag, representing its early colonial days before the interstellar war. Also added this to the loadout." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 895b8553a67..203730c0751 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ