diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index d64db5999a7..3430e4fef38 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -719,6 +719,29 @@ name = "Large Old World flag" flag_size = 1 +/obj/item/flag/red_coalition + name = "\improper Red Coalition flag" + desc = "A high quality copy of an original Red Coalition banner. This variant on the standard was flown by the Zelazny arcology during the Martian World War, Zelazny's origins as a \ + mining colony represented in the center by the alchemical symbol for iron." + icon_state = "coalition_flag_boxed" + flag_path = "redcoalition" + +/obj/item/flag/red_coalition/l + name = "large Red Coalition flag" + flag_size = 1 + +/obj/structure/sign/flag/red_coalition + name = "\improper Red Coalition flag" + desc = "A high quality copy of an original Red Coalition banner. This variant on the standard was flown by the Zelazny arcology during the Martian World War, Zelazny's origins as a \ + mining colony represented in the center by the alchemical symbol for iron." + icon_state = "redcoalition" + +/obj/structure/sign/flag/red_coalition/left + icon_state = "redcoalition_l" + +/obj/structure/sign/flag/red_coalition/right + icon_state = "redcoalition_r" + /obj/item/flag/dpra name = "Democratic People's Republic of Adhomai flag" desc = "The black flag of the Democratic People's Republic of Adhomai." diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 827b79d43d1..88e6f5d4b25 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -198,6 +198,7 @@ banners["banner, Gadpathur"] = /obj/item/flag/gadpathur banners["banner, Vysoka"] = /obj/item/flag/vysoka banners["banner, Konyang"] = /obj/item/flag/konyang + banners["banner, Red Coalition"] = /obj/item/flag/red_coalition gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -248,6 +249,7 @@ flags["flag, Gadpathur"] = /obj/item/flag/gadpathur/l flags["flag, Vysoka"] = /obj/item/flag/vysoka/l flags["flag, Konyang"] = /obj/item/flag/konyang/l + flags["flag, Red Coalition"] = /obj/item/flag/red_coalition/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e6d8fa3a826..b65568f412b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1156,32 +1156,6 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "akila_jacket" contained_sprite = TRUE - -/obj/structure/sign/flag/red_coalition - name = "Red Coalition flag" - desc = "A high-quality copy of an original Red Coalition banner. This variant on the standard was flown by the Zelazny arcology during the Martian World War, Zelazny's origins as a \ - mining colony represented in the center by the alchemical symbol for iron." - icon_state = "redcoalition" - -/obj/structure/sign/flag/red_coalition/left - icon_state = "redcoalition_l" - -/obj/structure/sign/flag/red_coalition/right - icon_state = "redcoalition_r" - -/obj/item/flag/fluff/nikita_flag //Red Coalition Banner - Nikita Yutani - sycmos - name = "Red Coalition flag" - icon = 'icons/obj/custom_items/nikita_flag.dmi' - icon_override = 'icons/obj/custom_items/nikita_flag.dmi' - icon_state = "nikita_flag" - desc = "A high-quality copy of an original Red Coalition banner. This variant on the standard was flown by the Zelazny arcology during the Martian World War, Zelazny's origins as a \ - mining colony represented in the center by the alchemical symbol for iron." - flag_path = "redcoalition" - -/obj/item/flag/fluff/nikita_flag/l - flag_size = 1 - - /obj/item/voidsuit_modkit/fluff/rajka_suit name = "HEV-3 voidsuit kit" desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a HEV-3 voidsuit." @@ -2111,4 +2085,4 @@ All custom items with worn sprites must follow the contained sprite system: http icon_type = "cigarette" can_hold = list(/obj/item/clothing/mask/smokable/cigarette/dromedaryco) cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dromedaryco - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE diff --git a/html/changelogs/geeves-mars_burns.yml b/html/changelogs/geeves-mars_burns.yml new file mode 100644 index 00000000000..a8736cf5659 --- /dev/null +++ b/html/changelogs/geeves-mars_burns.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added the Martian Red Coalition flag and banner to the loadout." diff --git a/icons/obj/custom_items/nikita_flag.dmi b/icons/obj/custom_items/nikita_flag.dmi deleted file mode 100644 index c223ee342ec..00000000000 Binary files a/icons/obj/custom_items/nikita_flag.dmi and /dev/null differ diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi index a33c65ea235..a5353b09f02 100644 Binary files a/icons/obj/flags.dmi and b/icons/obj/flags.dmi differ