diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 12677dc82b5..6164eb310df 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1329,6 +1329,49 @@ /obj/structure/sign/flag/trinaryperfection/large/west/Initialize(mapload) . = ..(mapload, WEST) +// Golden Deep + +/obj/item/flag/goldendeep + name = "\improper Golden Deep flag" + desc = "The flag of the Golden Deep, depicting the Midas surrounded by a set of shields." + desc_extended = "The true meaning of the sigil on the Golden Deep's flag are shrouded in mystery and more than a few Estriconian merchants have dedicated small fortunes to studying it. The marking first appeared within the halls of the Midas; the Golden Deep's enormous and ancient mothership where the merchant collective is believed to have been founded. Whatever its original purpose, this sigil has since been co-opted by the Golden Deep and placed on a backdrop of gold, diamond, and black, symbolizing the collective's pursuit of wealth amidst the void of space. Wherever this flag flies, commerce is sure to follow." + flag_path = "goldendeep" + flag_structure = /obj/structure/sign/flag/goldendeep + +/obj/structure/sign/flag/goldendeep + name = "\improper Golden Deep flag" + desc = "The flag of the Golden Deep Collective." + desc_extended = "The true meaning of the sigil on the Golden Deep's flag are shrouded in mystery and more than a few Estriconian merchants have dedicated small fortunes to studying it. The marking first appeared within the halls of the Midas; the Golden Deep's enormous and ancient mothership where the merchant collective is believed to have been founded. Whatever its original purpose, this sigil has since been co-opted by the Golden Deep and placed on a backdrop of gold, diamond, and black, symbolizing the collective's pursuit of wealth amidst the void of space. Wherever this flag flies, commerce is sure to follow." + flag_path = "goldendeep" + icon_state = "goldendeep" + flag_item = /obj/item/flag/goldendeep + +/obj/structure/sign/flag/goldendeep/unmovable + unmovable = TRUE + +/obj/item/flag/goldendeep/l + name = "large Golden Deep flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/goldendeep/large + +/obj/structure/sign/flag/goldendeep/large + icon_state = "goldendeep_l" + flag_path = "goldendeep" + flag_size = TRUE + flag_item = /obj/item/flag/goldendeep/l + +/obj/structure/sign/flag/goldendeep/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/goldendeep/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/goldendeep/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/goldendeep/large/west/Initialize(mapload) + . = ..(mapload, WEST) + // Dominian Standards /obj/item/flag/diona diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index c81250b1bfc..9738c4639b2 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -220,6 +220,7 @@ 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, Golden Deep"] = /obj/item/flag/goldendeep banners["banner, Hephaestus Industries"] = /obj/item/flag/heph banners["banner, Idris Incorporated"] = /obj/item/flag/idris banners["banner, Zenghu Pharmaceuticals"] = /obj/item/flag/zenghu @@ -308,6 +309,7 @@ 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, Golden Deep"] = /obj/item/flag/goldendeep/l flags["flag, Hephaestus Industries"] = /obj/item/flag/heph/l flags["flag, Idris Incorporated"] = /obj/item/flag/idris/l flags["flag, Zeng-Hu Pharmaceuticals"] = /obj/item/flag/zenghu/l diff --git a/html/changelogs/Ben10083 - GDflag.yml b/html/changelogs/Ben10083 - GDflag.yml new file mode 100644 index 00000000000..642611e0584 --- /dev/null +++ b/html/changelogs/Ben10083 - GDflag.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: Ben10083 + +# 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 new flag and banner for the Golden Deep. Credit to Fyni for the sprite." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index f3fdf6c638f..375b03ae94b 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ