diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index cd06f3c6589..cd93dce47bf 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -618,6 +618,77 @@ var/flag_path var/flag_size = 0 +/obj/structure/sign/flag/zavodskoi + name = "Zavodskoi Interstellar flag" + desc = "The logo of Zavodskoi Interstellar on a flag." + icon_state = "zavodskoi" + +/obj/structure/sign/flag/zavodskoi/left + icon_state = "zavodskoi_l" + +/obj/structure/sign/flag/zavodskoi/right + icon_state = "zavodskoi_r" + +/obj/item/flag/zavodskoi + name = "Zavodskoi Interstellar flag" + desc = "The logo of Zavodskoi Interstellar on a flag." + flag_path = "zavodskoi" + +/obj/item/flag/zavodskoi/l + flag_size = 1 + +/obj/structure/sign/flag/idris + name = "Idris Incorporated flag" + desc = "The logo of Idris Incorporated on a flag." + icon_state = "idris" + +/obj/structure/sign/flag/idris/left + icon_state = "idris_l" + +/obj/structure/sign/flag/idris/right + icon_state = "idris_r" + +/obj/item/flag/idris + name = "Idris Incorporated flag" + desc = "The logo of Idris Incorporated on a flag." + flag_path = "idris" + +/obj/item/flag/idris/l + flag_size = 1 + +/obj/structure/sign/flag/trinaryperfection + name = "Trinary Perfection flag" + desc = "The flag of the Trinary Perfection." + desc_fluff = "The Trinary Perfection is a new religious movement whose core beliefs are that synthetics are alive, divine, and have the potential to ascend to that of gods. The triangle intersecting the gear represents the exchange of ideas that make up the Trinary Perfection, the study of robotics, religion and the elevation of artificial intelligence." + icon_state = "trinaryperfection" + +/obj/structure/sign/flag/trinaryperfection/left + icon_state = "trinaryperfection_l" + + +/obj/structure/sign/flag/trinaryperfection/right + icon_state = "trinaryperfection_r" + +/obj/item/flag/trinaryperfection + name = "Trinary Perfection flag" + desc = "The flag of the Trinary Perfection." + desc_fluff = "The Trinary Perfection is a new religious movement whose core beliefs are that synthetics are alive, divine, and have the potential to ascend to that of gods. The triangle intersecting the gear represents the exchange of ideas that make up the Trinary Perfection, the study of robotics, religion and the elevation of artificial intelligence." + flag_path = "trinaryperfection" + +/obj/item/flag/trinaryperfection/l + flag_size = 1 + +/obj/item/flag/diona + name = "Imperial Diona standard" + desc = "A green Dominian standard which represents the dionae within the Empire." + flag_path = "diona" + +/obj/structure/sign/flag/diona + name = "Imperial Diona standard" + desc = "A green Dominian standard which represents the dionae within the Empire." + icon_state = "diona" + + /obj/structure/sign/flag/biesel name = "Republic of Biesel flag" desc = "The colours and symbols of the Republic of Biesel." diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 5f52e425662..602ce196210 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -103,6 +103,12 @@ banners["banner, Democratic People's Republic of Adhomai"] = /obj/item/flag/dpra banners["banner, New Kingdom of Adhomai"] = /obj/item/flag/nka banners["banner, Republic of Biesel"] = /obj/item/flag/biesel + banners["banner, Dominian Diona"] = /obj/item/flag/diona + banners["banner, Trinary Perfection"] = /obj/item/flag/trinaryperfection + banners["banner, Hephaestus Industries"] = /obj/item/flag/heph + banners["banner, Idris Incorporated"] = /obj/item/flag/idris + banners["banner, Zenghu Pharmaceuticals"] = /obj/item/flag/zenghu + banners["banner, Zavodskoi Interstellar"] = /obj/item/flag/zavodskoi banners["banner, Coalition of Colonies"] = /obj/item/flag/coalition gear_tweaks += new/datum/gear_tweak/path(banners) @@ -127,6 +133,11 @@ flags["flag, Democratic People's Republic of Adhomai"] = /obj/item/flag/dpra/l flags["flag, New Kingdom of Adhomai"] = /obj/item/flag/nka/l flags["flag, Republic of Biesel"] = /obj/item/flag/biesel/l + flags["flag, Trinary Perfection"] = /obj/item/flag/trinaryperfection/l + flags["flag, Hephaestus Industries"] = /obj/item/flag/heph/l + flags["flag, Idris Incorporated"] = /obj/item/flag/idris/l + flags["flag, Zeng-Hu Pharmaceuticals"] = /obj/item/flag/zenghu/l + flags["flag, Zavodskoi Interstellar"] = /obj/item/flag/zavodskoi/l flags["flag, Coalition of Colonies"] = /obj/item/flag/coalition/l gear_tweaks += new/datum/gear_tweak/path(flags) diff --git a/html/changelogs/extraflags.yml b/html/changelogs/extraflags.yml new file mode 100644 index 00000000000..8f495b6c2d5 --- /dev/null +++ b/html/changelogs/extraflags.yml @@ -0,0 +1,36 @@ +################################ +# 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: NiennaB, The Stryker +delete-after: True + +changes: + - rscadd: "Added Dominian Diona, Trinary Perfection, Zavodskoi, and Idris flags." + - tweak: "Changed the colorable trenchcoat sprite." + - tweak: "Added existing Hephaestus and Zeng-Hu flags to the loadout." \ No newline at end of file diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 9b155a686aa..b225ed76476 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 759fb0e417e..94b7aa4eb06 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index bb7f865bcfb..adcad663356 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ