diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 16ce6fc60ca..43beed3545f 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -283,6 +283,21 @@ flag_path = "sol" flag_item = /obj/item/flag/sol +/obj/item/flag/sol/old + name = "old Sol Alliance flag" + desc = "The flag of the pre-Interstellar War Solarian Alliance, once flown from Earth to the human frontier." + desc_extended = "The flag of the pre-Interstellar War Alliance of Sovereign Solarian Nations, the single largest state in the Spur's history. The three stars represented the Northern, Central, and Southern Solarian Frontiers." + flag_path = "sol_old" + flag_structure = /obj/structure/sign/flag/sol/old + +/obj/structure/sign/flag/sol/old + name = "old Sol Alliance flag" + desc = "The flag of the pre-Interstellar War Solarian Alliance, once flown from Earth to the human frontier." + desc_extended = "The flag of the pre-Interstellar War Alliance of Sovereign Solarian Nations, the single largest state in the Spur's history. The three stars represented the Northern, Central, and Southern Solarian Frontiers." + icon_state = "sol_old" + flag_path = "sol_old" + flag_item = /obj/item/flag/sol/old + /obj/item/flag/sol/l name = "large Sol Alliance flag" flag_size = TRUE @@ -306,6 +321,29 @@ /obj/structure/sign/flag/sol/large/west/New() ..(loc, WEST) +/obj/item/flag/sol/old/l + name = "large old Sol Alliance flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/sol/old/large + +/obj/structure/sign/flag/sol/old/large + icon_state = "sol_old_l" + flag_path = "sol_old" + flag_size = TRUE + flag_item = /obj/item/flag/sol/old/l + +/obj/structure/sign/flag/sol/old/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/sol/old/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/sol/old/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/sol/old/large/west/New() + ..(loc, WEST) + // Dominia /obj/item/flag/dominia @@ -1811,7 +1849,7 @@ /obj/structure/sign/flag/nhp/large/west/New() ..(loc, WEST) - + // Silversun /obj/item/flag/silversun diff --git a/html/changelogs/Old Sol Flag - GeneralCamo.yml b/html/changelogs/Old Sol Flag - GeneralCamo.yml new file mode 100644 index 00000000000..e3c153f94c1 --- /dev/null +++ b/html/changelogs/Old Sol Flag - GeneralCamo.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: GeneralCamo + +# 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 an Old Sol Alliance flag, representing the pre-Interstellar War Sol Alliance." + - maptweak: "Added an old Sol Alliance flag to the Sensor Relay." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 4a5fa2e5aae..c0e003ee728 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dmm b/maps/away/away_site/sensor_relay/sensor_relay.dmm index 7b855966359..b1ed3d6cf48 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dmm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dmm @@ -41,6 +41,10 @@ /obj/machinery/computer/ship/sensors, /turf/simulated/floor/carpet/green, /area/sensor_relay) +"asw" = ( +/obj/structure/sign/flag/sol/old, +/turf/simulated/wall, +/area/sensor_relay) "azD" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/corner/beige/diagonal, @@ -398,6 +402,7 @@ /area/sensor_relay) "gDR" = ( /obj/effect/map_effect/airlock/s_to_n/long/square/wide, +/obj/structure/sign/flag/sol/old/large, /turf/simulated/wall, /area/sensor_relay) "gHM" = ( @@ -1139,6 +1144,19 @@ }, /turf/simulated/floor/airless, /area/space) +"sda" = ( +/obj/effect/floor_decal/corner/white{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/sensor_relay) "srM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33456,9 +33474,9 @@ uaH mkw aaO aaM -pJZ -hFM -xVh +asw +qyb +sda pJZ nJA nJA