diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 9795cebc5cf..3d0dd14edf7 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1874,27 +1874,6 @@ /obj/structure/sign/flag/tarwa/unmovable unmovable = TRUE -// Visegrad - -/obj/item/flag/visegrad - name = "\improper Visegrad flag" - desc = "The flag of Visegrad." - desc_extended = "The blue, white, green and red flag of Visegrad was the original Warsaw Pact-created design for the planet's flag, and even after it acquired independence it was maintained, though with the removal of the socialist emblem and the addition of a Solarian ensign. \ - It is said that the green represents the forests of the planet, the white the stormclouds, and the blue the sky hidden above, while the red is supposed to represent shared national unity." - flag_path = "visegrad" - flag_structure = /obj/structure/sign/flag/visegrad - -/obj/structure/sign/flag/visegrad - name = "\improper Visegrad flag" - desc = "The flag of Visegrad." - desc_extended = "The blue, white, green and red flag of Visegrad was the original Warsaw Pact-created design for the planet's flag, and even after it acquired independence it was maintained, though with the removal of the socialist emblem and the addition of a Solarian ensign. \ - It is said that the green represents the forests of the planet, the white the stormclouds, and the blue the sky hidden above, while the red is supposed to represent shared national unity." - flag_path = "visegrad" - icon_state = "visegrad" - flag_item = /obj/item/flag/visegrad - -/obj/structure/sign/flag/visegrad/unmovable - unmovable = TRUE // PMCG @@ -2019,20 +1998,6 @@ /obj/structure/sign/flag/assunzione/large/west/Initialize(mapload) . = ..(mapload, WEST) -// New Gibson - -/obj/structure/sign/flag/newgibson - name = "\improper New Gibson flag" - desc = "The flag of the New Gibson." - icon_state = "newgibson" - flag_item = /obj/item/flag/newgibson - -/obj/item/flag/newgibson - name = "\improper New Gibson flag" - desc = "The flag of New Gibson." - flag_path = "newgibson" - flag_structure = /obj/structure/sign/flag/newgibson - // Port Antillia /obj/item/flag/portantillia @@ -3628,3 +3593,346 @@ /obj/structure/sign/flag/unathi_tapestry/mador_4/west/Initialize(mapload) . = ..(mapload, WEST) + +// New Gibson +/obj/structure/sign/flag/newgibson + name = "\improper New Gibson flag" + desc = "The flag of the New Gibson." + icon_state = "newgibson" + flag_item = /obj/item/flag/newgibson + +/obj/item/flag/newgibson + name = "\improper New Gibson flag" + desc = "The flag of New Gibson." + flag_path = "newgibson" + flag_structure = /obj/structure/sign/flag/newgibson + +/obj/item/flag/newgibson/l + name = "\improper large New Gibson flag" + flag_path = "newgibson" + flag_structure = /obj/structure/sign/flag/newgibson/large + +/obj/structure/sign/flag/newgibson/large + icon_state = "newgibson_l" + flag_path = "newgibson" + flag_size = TRUE + flag_item = /obj/item/flag/newgibson/l + +/obj/structure/sign/flag/newgibson/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/newgibson/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/newgibson/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/newgibson/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// The Commonwealth of Valkyrie. +/obj/structure/sign/flag/valkyrie + name = "\improper Valkyrie flag" + desc = "The flag of the Commonwealth of Valkyrie." + icon_state = "valkyrie" + flag_item = /obj/item/flag/valkyrie + +/obj/item/flag/valkyrie + name = "\improper Valkyrie flag" + desc = "The flag of the Commonwealth of Valkyrie." + flag_path = "valkyrie" + flag_structure = /obj/structure/sign/flag/valkyrie + +/obj/item/flag/valkyrie/l + name = "\improper large Valkyrie flag" + flag_path = "valkyrie" + flag_structure = /obj/structure/sign/flag/valkyrie/large + +/obj/structure/sign/flag/valkyrie/large + icon_state = "valkyrie_l" + flag_path = "valkyrie" + flag_size = TRUE + flag_item = /obj/item/flag/valkyrie/l + +/obj/structure/sign/flag/valkyrie/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/valkyrie/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/valkyrie/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/valkyrie/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Pluto. +/obj/structure/sign/flag/pluto + name = "\improper Pluto flag" + desc = "The flag of Pluto, the furthest planet of the Sol System and one of the few socialist states in the modern Spur. Soviet citizens - be proud, you opened the road to the stars from Earth!" + desc_extended = "The flag of the Communist Party of the Supreme Soviet of the Plutonian System and Surrounding Space is intended to hearken back to the flags of Earth's Soviet republics. The blue represents the beauty of the stars, while the large star with five smaller stars represents Pluto and its moons." + icon_state = "pluto" + flag_item = /obj/item/flag/pluto + +/obj/item/flag/pluto + name = "\improper Pluto flag" + desc = "The flag of Pluto, the furthest planet of the Sol System and one of the few socialist states in the modern Spur. Soviet citizens - be proud, you opened the road to the stars from Earth!" + desc_extended = "The flag of the Communist Party of the Supreme Soviet of the Plutonian System and Surrounding Space is intended to hearken back to the flags of Earth's Soviet republics. The blue represents the beauty of the stars, while the large star with five smaller stars represents Pluto and its moons." + flag_path = "pluto" + flag_structure = /obj/structure/sign/flag/pluto + +/obj/item/flag/pluto/l + name = "\improper large Pluto flag" + flag_path = "pluto" + flag_structure = /obj/structure/sign/flag/pluto/large + +/obj/structure/sign/flag/pluto/large + icon_state = "pluto_l" + flag_path = "pluto" + flag_size = TRUE + flag_item = /obj/item/flag/pluto/l + +/obj/structure/sign/flag/pluto/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/pluto/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/pluto/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/pluto/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// SSRM (Southern Solarian Reconstruction Mandate). +/obj/structure/sign/flag/ssrm + name = "\improper Southern Solarian Reconstruction Mandate flag" + desc = "The flag of the Southern Solarian Reconstruction Mandate. Intended to be simple and easy to produce." + desc_extended = "Simple to produce and manufacture, the Reconstruction Mandate flags are temporary by design - once the regions are stabilized, the flags will be furled and lowered for the last time." + icon_state = "ssrm" + flag_item = /obj/item/flag/ssrm + +/obj/item/flag/ssrm + name = "\improper Southern Solarian Reconstruction Mandate flag" + desc = "The flag of the Southern Solarian Reconstruction Mandate. Intended to be simple and easy to produce." + desc_extended = "Simple to produce and manufacture, the Reconstruction Mandate flags are temporary by design - once the regions are stabilized, the flags will be furled and lowered for the last time." + flag_path = "ssrm" + flag_structure = /obj/structure/sign/flag/ssrm + +/obj/item/flag/ssrm/l + name = "\improper large Southern Solarian Reconstruction Mandate flag" + flag_path = "ssrm" + flag_structure = /obj/structure/sign/flag/ssrm/large + +/obj/structure/sign/flag/ssrm/large + icon_state = "ssrm_l" + flag_path = "ssrm" + flag_size = TRUE + flag_item = /obj/item/flag/ssrm/l + +/obj/structure/sign/flag/ssrm/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/ssrm/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/ssrm/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/ssrm/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// NSRM (Northern Solarian Reconstruction Mandate). +/obj/structure/sign/flag/nsrm + name = "\improper Northern Solarian Reconstruction Mandate flag" + desc = "The flag of the Northern Solarian Reconstruction Mandate. Intended to be simple and easy to produce." + desc_extended = "Simple to produce and manufacture, the Reconstruction Mandate flags are temporary by design - once the regions are stabilized, the flags will be furled and lowered for the last time." + icon_state = "nsrm" + flag_item = /obj/item/flag/nsrm + +/obj/item/flag/nsrm + name = "\improper Northern Solarian Reconstruction Mandate flag" + desc = "The flag of the Northern Solarian Reconstruction Mandate. Intended to be simple and easy to produce." + desc_extended = "Simple to produce and manufacture, the Reconstruction Mandate flags are temporary by design - once the regions are stabilized, the flags will be furled and lowered for the last time." + flag_path = "nsrm" + flag_structure = /obj/structure/sign/flag/nsrm + +/obj/item/flag/nsrm/l + name = "\improper large Northern Solarian Reconstruction Mandate flag" + flag_path = "nsrm" + flag_structure = /obj/structure/sign/flag/nsrm/large + +/obj/structure/sign/flag/nsrm/large + icon_state = "nsrm_l" + flag_path = "nsrm" + flag_size = TRUE + flag_item = /obj/item/flag/nsrm/l + +/obj/structure/sign/flag/nsrm/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/nsrm/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/nsrm/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/nsrm/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Mars. +/obj/structure/sign/flag/mars + name = "\improper Provisional Government of Mars flag" + desc = "Intended to invoke unity between the Martian “Blues” (Solarian loyalists) and “Reds” (Martian loyalists) in the aftermath of the Violet Dawn disaster, this flag uses red (for Mars) in addition to blue and white (for the Alliance) in its design." + desc_extended = "The Alliance of Sovereign Solarian Nations' Provisional Government of Mars' flag was designed in a short period of time under the stressful conditions of the early Solarian Civil War, when many worried the Sol System itself would fall into infighting as the remnants of Frost's government struggled to resist a coup by more moderate forces." + icon_state = "mars" + flag_item = /obj/item/flag/mars + +/obj/item/flag/mars + name = "\improper Provisional Government of Mars flag" + desc = "The flag of Mars." + flag_path = "mars" + flag_structure = /obj/structure/sign/flag/mars + +/obj/item/flag/mars/l + name = "\improper large Provisional Government of Mars flag" + flag_path = "mars" + flag_structure = /obj/structure/sign/flag/mars/large + +/obj/structure/sign/flag/mars/large + icon_state = "mars_l" + flag_path = "mars" + flag_size = TRUE + flag_item = /obj/item/flag/mars/l + +/obj/structure/sign/flag/mars/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/mars/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/mars/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/mars/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Visegrad +/obj/item/flag/visegrad + name = "\improper Visegrad flag" + desc = "The flag of Visegrad." + desc_extended = "The blue, white, green and red flag of Visegrad was the original Warsaw Pact-created design for the planet's flag, and even after it acquired independence it was maintained, though with the removal of the socialist emblem and the addition of a Solarian ensign. \ + It is said that the green represents the forests of the planet, the white the stormclouds, and the blue the sky hidden above, while the red is supposed to represent shared national unity." + flag_path = "visegrad" + flag_structure = /obj/structure/sign/flag/visegrad + +/obj/structure/sign/flag/visegrad + name = "\improper Visegrad flag" + desc = "The flag of Visegrad." + desc_extended = "The blue, white, green and red flag of Visegrad was the original Warsaw Pact-created design for the planet's flag, and even after it acquired independence it was maintained, though with the removal of the socialist emblem and the addition of a Solarian ensign. \ + It is said that the green represents the forests of the planet, the white the stormclouds, and the blue the sky hidden above, while the red is supposed to represent shared national unity." + flag_path = "visegrad" + icon_state = "visegrad" + flag_item = /obj/item/flag/visegrad + +/obj/structure/sign/flag/visegrad/unmovable + unmovable = TRUE + +/obj/item/flag/visegrad/l + name = "\improper large Visegrad flag" + flag_path = "visegrad" + flag_structure = /obj/structure/sign/flag/visegrad/large + +/obj/structure/sign/flag/visegrad/large + icon_state = "visegrad_l" + flag_path = "visegrad" + flag_size = TRUE + flag_item = /obj/item/flag/visegrad/l + +/obj/structure/sign/flag/visegrad/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/visegrad/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/visegrad/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/visegrad/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Old Visegrad. +/obj/item/flag/old_visegrad + name = "\improper Pact-era Visegrad flag" + desc = "The colonial flag of Visegrad, featuring the iconography of the Soviet Union and Warsaw Pact." + desc_extended = "Controversial on Visegrad itself due to its associations with the colony's past as a dumping ground for dissidents, reproductions of colonial-era flags are commonly sold to tourists and as collector's items. A vintage flag can go for tens of thousands of credits, but most in circulation currently are reproductions of varying quality - some even made in the Republic of Biesel." + flag_path = "old_visegrad" + flag_structure = /obj/structure/sign/flag/old_visegrad + +/obj/structure/sign/flag/old_visegrad + name = "\improper Pact-era Visegrad flag" + desc = "The colonial flag of Visegrad, featuring the iconography of the Soviet Union and Warsaw Pact." + desc_extended = "Controversial on Visegrad itself due to its associations with the colony's past as a dumping ground for dissidents, reproductions of colonial-era flags are commonly sold to tourists and as collector's items. A vintage flag can go for tens of thousands of credits, but most in circulation currently are reproductions of varying quality - some even made in the Republic of Biesel." + icon_state = "old_visegrad" + flag_item = /obj/item/flag/old_visegrad + +/obj/item/flag/old_visegrad/l + name = "\improper large Pact-era Visegrad flag" + flag_path = "old_visegrad" + flag_structure = /obj/structure/sign/flag/old_visegrad/large + +/obj/structure/sign/flag/old_visegrad/large + icon_state = "old_visegrad_l" + flag_path = "old_visegrad" + flag_size = TRUE + flag_item = /obj/item/flag/old_visegrad/l + +/obj/structure/sign/flag/old_visegrad/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/old_visegrad/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/old_visegrad/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/old_visegrad/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Old Xanu +/obj/item/flag/old_xanu + name = "\improper Solarian-era Xanu flag" + desc = "The flag of the Sovereign Solarian Nation of Xanu Prime. Nearly two-hundred years out of print, most of these are museum pieces or reproductions." + desc_extended = "The Department of Colonization designed this flag during the First Astonishment era of Xanu's history (2227-60), and it proved to be fairly popular. During the Interstellar War it was common for pro-Coalition Xanans to rip the third of the flag containing the Alliance's flag off, then display the remaining two-thirds. The All-Xanu Republic's current flag bears some resemblance to this flag." + flag_path = "old_xanu" + flag_structure = /obj/structure/sign/flag/old_xanu + +/obj/structure/sign/flag/old_xanu + name = "\improper Solarian-era Xanu flag" + desc = "The flag of the Sovereign Solarian Nation of Xanu Prime. Nearly two-hundred years out of print, most of these are museum pieces or reproductions." + desc_extended = "The Department of Colonization designed this flag during the First Astonishment era of Xanu's history (2227-60), and it proved to be fairly popular. During the Interstellar War it was common for pro-Coalition Xanans to rip the third of the flag containing the Alliance's flag off, then display the remaining two-thirds. The All-Xanu Republic's current flag bears some resemblance to this flag." + icon_state = "old_xanu" + flag_item = /obj/item/flag/old_xanu + +/obj/item/flag/old_xanu/l + name = "\improper large Solarian-era Xanu flag" + flag_path = "old_xanu" + flag_structure = /obj/structure/sign/flag/old_xanu/large + +/obj/structure/sign/flag/old_xanu/large + icon_state = "old_xanu_l" + flag_path = "old_xanu" + flag_size = TRUE + flag_item = /obj/item/flag/old_xanu/l + +/obj/structure/sign/flag/old_xanu/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/old_xanu/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/old_xanu/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/old_xanu/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 0bca4f652ca..4fb0e101169 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -234,8 +234,6 @@ banners["banner, Private Military Contracting Group"] = /obj/item/flag/pmcg banners["banner, United Syndicates of Himeo"] = /obj/item/flag/himeo banners["banner, Republic of Assunzione"] = /obj/item/flag/assunzione - banners["banner, New Gibson"] = /obj/item/flag/newgibson - banners["banner, Visegrad"] = /obj/item/flag/visegrad banners["banner, Union of Port Antillia"] = /obj/item/flag/portantillia banners["banner, Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette banners["banner, Old Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette/old @@ -265,6 +263,15 @@ 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 + banners["banner, New Gibson"] = /obj/item/flag/newgibson + banners["banner, Valkyrie"] = /obj/item/flag/valkyrie + banners["banner, Antique Xanu"] = /obj/item/flag/old_xanu + banners["banner, Southern Solarian Reconstruction Mandate"] = /obj/item/flag/ssrm + banners["banner, Northern Solarian Reconstruction Mandate"] = /obj/item/flag/nsrm + banners["banner, Provisional Government of Mars"] = /obj/item/flag/mars + banners["banner, Pluto"] = /obj/item/flag/pluto + banners["banner, Antique Visegrad"] = /obj/item/flag/old_visegrad + banners["banner, Visegrad"] = /obj/item/flag/visegrad gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -355,6 +362,15 @@ 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 + flags["flag, New Gibson"] = /obj/item/flag/newgibson/l + flags["flag, Valkyrie"] = /obj/item/flag/valkyrie/l + flags["flag, Antique Xanu"] = /obj/item/flag/old_xanu/l + flags["flag, Southern Solarian Reconstruction Mandate"] = /obj/item/flag/ssrm/l + flags["flag, Northern Solarian Reconstruction Mandate"] = /obj/item/flag/nsrm/l + flags["flag, Provisional Government of Mars"] = /obj/item/flag/mars/l + flags["flag, Pluto"] = /obj/item/flag/pluto/l + flags["flag, Antique Visegrad"] = /obj/item/flag/old_visegrad + flags["flag, Visegrad"] = /obj/item/flag/visegrad gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/hazelmouse-flags.yml b/html/changelogs/hazelmouse-flags.yml new file mode 100644 index 00000000000..b5d24ad4512 --- /dev/null +++ b/html/changelogs/hazelmouse-flags.yml @@ -0,0 +1,58 @@ +################################ +# 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: hazelmouse, stev iii + +# 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: + - rscadd: "Adds a number of new flags into the game, now available in the loadout!" diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 88a98e1beaf..6730a083575 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ