diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 8996dff2170..e316d0ddf1a 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -3952,3 +3952,39 @@ /obj/structure/sign/flag/old_xanu/large/west/Initialize(mapload) . = ..(mapload, WEST) + +// HPS Narrows +/obj/item/flag/narrows + name = "\improper HPS Narrows flag" + desc = "The flag of the HPS Narrows, representing Captain Helmsman of the United Drill on the top, the Council of Overseers on the bottom, and the Iron Eternal in between." + flag_path = "narrows" + flag_structure = /obj/structure/sign/flag/narrows + +/obj/structure/sign/flag/narrows + name = "\improper HPS Narrows flag" + desc = "The flag of the HPS Narrows, representing Captain Helmsman of the United Drill on the top, the Council of Overseers on the bottom, and the Iron Eternal in between." + icon_state = "narrows" + flag_item = /obj/item/flag/narrows + +/obj/item/flag/narrows/l + name = "\improper large HPS Narrows flag" + flag_path = "narrows" + flag_structure = /obj/structure/sign/flag/narrows/large + +/obj/structure/sign/flag/narrows/large + icon_state = "narrows_l" + flag_path = "narrows" + flag_size = TRUE + flag_item = /obj/item/flag/narrows/l + +/obj/structure/sign/flag/narrows/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/narrows/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/narrows/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/narrows/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 8bc584ef495..fc8e8117e17 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -273,6 +273,7 @@ banners["banner, Antique Visegrad"] = /obj/item/flag/old_visegrad banners["banner, Visegrad"] = /obj/item/flag/visegrad banners["banner, Burzsia"] = /obj/item/flag/burzsia + banners["banner, HPS Narrows"] = /obj/item/flag/narrows gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -372,6 +373,7 @@ flags["flag, Pluto"] = /obj/item/flag/pluto/l flags["flag, Antique Visegrad"] = /obj/item/flag/old_visegrad flags["flag, Visegrad"] = /obj/item/flag/visegrad + flags["flag, HPS Narrows"] = /obj/item/flag/narrows/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/SimpleMaroon-narrowsflag.yml b/html/changelogs/SimpleMaroon-narrowsflag.yml new file mode 100644 index 00000000000..1beb56063ce --- /dev/null +++ b/html/changelogs/SimpleMaroon-narrowsflag.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: SimpleMaroon + +# 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: "Added an HPS Narrows flag and banner to the loadout." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 3b4c6759f8b..d5be084ba7e 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ