diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index cf496d91abd..9df51d7d154 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -473,7 +473,7 @@ /obj/structure/sign/flag/dpra name = "Democratic People's Republic of Adhomai flag" - desc = "The banner of an ancient nation, its glory old." + desc = "The black flag of the Democratic People's Republic of Adhomai." icon_state = "dpra" description_fluff = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \ life. Opposing corporate claims on Tajaran soil and citing mismatched development and governmental negligence as the fault of humanity, they aim \ @@ -501,7 +501,7 @@ /obj/structure/sign/flag/pra name = "People's Republic of Adhomai flag" - desc = "The banner of an ancient nation, its glory old." + desc = "The tajaran flag of the People's Republic of Adhomai." icon_state = "pra" description_fluff = "Lead by President Njadrasanukii Hadii, the People's Republic of Adhomai are considered the 'loyalist' faction on Adhomai and enjoy galactic recognition as the \ government of Adhomai. It claims to be the true keeper of Al'marii's legacy. However, the PRA can be described as a Hadiist branch of Al'marii's revolutionary ideology - that means \ @@ -515,6 +515,73 @@ /obj/structure/sign/flag/pra/right icon_state = "pra_r" +/obj/item/weapon/flag/nka + name = "New Kingdom of Adhomai flag" + desc = "The blue flag of the New Kingdom of Adhomai." + flag_path = "nka" + description_fluff = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \ + Ruled by King Vahzirthaamro Azunja specifically, he denounces both other factions in the civil war as illegitimate and himself as the only legitimate ruler of Adhomai. \ + Supporters of the New Kingdom tend to be rare outside lands it controls. However, they believe strongly that the current republic on Adhomai was founded on genocide and unspeakable \ + slaughters. The New Kingdom puts forth the ideology that Republicanism is bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the \ + ancient nobles and Republicans, and create a new noble dynasty." + +/obj/item/weapon/flag/nka/l + flag_size = 1 + +/obj/structure/sign/flag/nka + name = "New Kingdom of Adhomai flag" + desc = "The blue flag of the New Kingdom of Adhomai." + icon_state = "nka" + description_fluff = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \ + Ruled by King Vahzirthaamro Azunja specifically, he denounces both other factions in the civil war as illegitimate and himself as the only legitimate ruler of Adhomai. \ + Supporters of the New Kingdom tend to be rare outside lands it controls. However, they believe strongly that the current republic on Adhomai was founded on genocide and unspeakable \ + slaughters. The New Kingdom puts forth the ideology that Republicanism is bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the \ + ancient nobles and Republicans, and create a new noble dynasty." + +/obj/structure/sign/flag/nka/left + icon_state = "nka_l" + +/obj/structure/sign/flag/nka/right + icon_state = "nka_r" + +/obj/item/weapon/flag/heph + name = "Hephaestus Industries flag" + desc = "The logo of Hephaestus Industries on a flag." + flag_path = "heph" + +/obj/item/weapon/flag/heph/l + flag_size = 1 + +/obj/structure/sign/flag/heph + name = "Hephaestus Industries flag" + desc = "The logo of Hephaestus Industries on a flag." + icon_state = "heph" + +/obj/structure/sign/flag/heph/left + icon_state = "heph_l" + +/obj/structure/sign/flag/heph/right + icon_state = "heph_r" + +/obj/item/weapon/flag/zenghu + name = "Zeng-Hu Pharmaceuticals flag" + desc = "The logo of Zeng-Hu Pharmaceuticals on a flag." + flag_path = "zenghu" + +/obj/item/weapon/flag/zenghu/l + flag_size = 1 + +/obj/structure/sign/flag/zenghu + name = "Zeng-Hu Pharmaceuticals flag" + desc = "The logo of Zeng-Hu Pharmaceuticals on a flag." + icon_state = "zenghu" + +/obj/structure/sign/flag/zenghu/left + icon_state = "zenghu_l" + +/obj/structure/sign/flag/zenghu/right + icon_state = "zenghu_r" + /obj/item/weapon/flag name = "boxed flag" desc = "A flag neatly folded into a wooden container." diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index d7c1a85523d..c94cec34c17 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -100,6 +100,7 @@ banners["banner, Sedantis"] = /obj/item/weapon/flag/vaurca banners["banner, People's Republic of Adhomai"] = /obj/item/weapon/flag/pra banners["banner, Democratic People's Republic of Adhomai"] = /obj/item/weapon/flag/dpra + banners["banner, New Kingdom of Adhomai"] = /obj/item/weapon/flag/nka gear_tweaks += new/datum/gear_tweak/path(banners) /datum/gear/flag @@ -120,6 +121,7 @@ flags["flag, Sedantis"] = /obj/item/weapon/flag/vaurca/l flags["flag, People's Republic of Adhomai"] = /obj/item/weapon/flag/pra/l flags["flag, Democratic People's Republic of Adhomai"] = /obj/item/weapon/flag/dpra/l + flags["flag, New Kingdom of Adhomai"] = /obj/item/weapon/flag/nka/l gear_tweaks += new/datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/alberyk_nkaflag.yml b/html/changelogs/alberyk_nkaflag.yml new file mode 100644 index 00000000000..09910c23afe --- /dev/null +++ b/html/changelogs/alberyk_nkaflag.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added the New Kingdom of Adhomai flag to the loadout." diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index de0d22f690a..068800e894b 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ