diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index f6a01ebfa39..a5fcd632645 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -3382,6 +3382,22 @@ /obj/structure/sign/flag/glaorr/large/west/Initialize(mapload) . = ..(mapload, WEST) +//Burzsia (banner only) +/obj/item/flag/burzsia + name = "\improper Burzsia flag" + desc = "The sigil of Burzsia." + flag_path = "burzsia" + flag_structure = /obj/structure/sign/flag/burzsia + +/obj/structure/sign/flag/burzsia + name = "\improper Burzsia flag" + desc = "The sigil of Burzsia." + flag_path = "burzsia" + icon_state = "burzsia" + flag_item = /obj/item/flag/burzsia + +/obj/structure/sign/flag/burzsia/unmovable + unmovable = TRUE //Unathi Ruin Flags/Tapestries /obj/item/flag/unathi_tapestry diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index fc8082efb83..ecc2990411d 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -637,6 +637,7 @@ ABSTRACT_TYPE(/datum/gear/accessory) flagpatch_national["flagpatch, zo'ra"] = /obj/item/clothing/accessory/flagpatch/zora flagpatch_national["flagpatch, k'lax"] = /obj/item/clothing/accessory/flagpatch/klax flagpatch_national["flagpatch, c'thur"] = /obj/item/clothing/accessory/flagpatch/cthur + flagpatch_national["flagpatch, burzsia"] = /obj/item/clothing/accessory/flagpatch/burzsia gear_tweaks += new /datum/gear_tweak/path(flagpatch_national) /datum/gear/accessory/aodai diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 4fb0e101169..8bc584ef495 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -272,6 +272,7 @@ banners["banner, Pluto"] = /obj/item/flag/pluto banners["banner, Antique Visegrad"] = /obj/item/flag/old_visegrad banners["banner, Visegrad"] = /obj/item/flag/visegrad + banners["banner, Burzsia"] = /obj/item/flag/burzsia gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 97e19d86274..f8ed5a8b564 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -785,6 +785,13 @@ icon_state = "flagpatch_sedantis" item_state = "flagpatch_sedantis" +/obj/item/clothing/accessory/flagpatch/burzsia + name = "burzsia flagpatch" + desc = "A patch bearing the sigil of Burzsia. While mainly worn by workers and natives loyal to Hephaestus alike, \ + there are still those who don this item in a more patriotic sense." + icon_state = "flagpatch_burzsia" + item_state = "flagpatch_burzsia" + // Wildlands /obj/item/clothing/accessory/flagpatch/fsf diff --git a/html/changelogs/SimpleMaroon-burzsiamoment.yml b/html/changelogs/SimpleMaroon-burzsiamoment.yml new file mode 100644 index 00000000000..c9efcc5a2d9 --- /dev/null +++ b/html/changelogs/SimpleMaroon-burzsiamoment.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: + - rscadd: "Added a Burzsian banner and flagpatch to the loadout." diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index cff9dacb05b..89e4eb91abf 100644 Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 6730a083575..3b4c6759f8b 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ