diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 33d16ab4976..aa2bd99fc1a 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -3100,16 +3100,16 @@ flag_size = TRUE flag_item = /obj/item/flag/traditionalist/l -/obj/structure/sign/flag/scarab/large/north/Initialize(mapload) +/obj/structure/sign/flag/traditionalist/large/north/Initialize(mapload) . = ..(mapload, NORTH) -/obj/structure/sign/flag/scarab/large/south/Initialize(mapload) +/obj/structure/sign/flag/traditionalist/large/south/Initialize(mapload) . = ..(mapload, SOUTH) -/obj/structure/sign/flag/scarab/large/east/Initialize(mapload) +/obj/structure/sign/flag/traditionalist/large/east/Initialize(mapload) . = ..(mapload, EAST) -/obj/structure/sign/flag/scarab/large/west/Initialize(mapload) +/obj/structure/sign/flag/traditionalist/large/west/Initialize(mapload) . = ..(mapload, WEST) // Callisto @@ -3149,3 +3149,41 @@ /obj/structure/sign/flag/callisto/large/west/Initialize(mapload) . = ..(mapload, WEST) + +// Venus + +/obj/item/flag/venus + name = "\improper Venusian flag" + desc = "The flag of Venus, the beating heart of Solarian cinema and entertainment." + flag_path = "venus" + flag_structure = /obj/structure/sign/flag/venus + +/obj/structure/sign/flag/venus + name = "\improper Venusian flag" + desc = "The flag of Venus, the beating heart of Solarian cinema and entertainment." + flag_path = "venus" + icon_state = "venus" + flag_item = /obj/item/flag/venus + +/obj/item/flag/venus/l + name = "large Venusian flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/venus/large + +/obj/structure/sign/flag/venus/large + icon_state = "venus_l" + flag_path = "venus" + flag_size = TRUE + flag_item = /obj/item/flag/venus/l + +/obj/structure/sign/flag/venus/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/venus/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/venus/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/venus/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 dfb66ca064a..9c540273efe 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -248,6 +248,7 @@ banners["banner, Empyrean"] = /obj/item/flag/empyrean banners["banner, Traditinalist Coalition"] = /obj/item/flag/traditionalist banners["banner, Callisto"] = /obj/item/flag/callisto + banners["banner, Venus"] = /obj/item/flag/venus gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -333,6 +334,7 @@ flags["flag, Empyrean"] = /obj/item/flag/empyrean/l flags["flag, Traditionalist Coalition"] = /obj/item/flag/traditionalist/l flags["flag, Callisto"] = /obj/item/flag/callisto/l + flags["flag, Venus"] = /obj/item/flag/venus/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/shimmeristaken-shimmerdoesitagain.yml b/html/changelogs/shimmeristaken-shimmerdoesitagain.yml new file mode 100644 index 00000000000..542c4bfe39c --- /dev/null +++ b/html/changelogs/shimmeristaken-shimmerdoesitagain.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: shimmeristaken + +# 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: "Adds a Venusian banner and flag to the loadout!" + - bugfix: "Fixes a path in rusting traditionalist flag to be correct, instead of leading to scarabs. It can now be mapped in!" diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 1e35fbe486f..0fa90b22059 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ