diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 3b7cdd60fff..a3c94947f70 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -49,4 +49,4 @@ shoes["toeless black boots, knee"] = /obj/item/clothing/shoes/jackboots/toeless/knee shoes["toeless black boots, thigh"] = /obj/item/clothing/shoes/jackboots/toeless/thigh shoes["toeless winterboots"] = /obj/item/clothing/shoes/winter/toeless - gear_tweaks += new/datum/gear_tweak/path(shoes) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(shoes) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index 6676d615f7a..7193ac9aaaa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -36,6 +36,7 @@ coat["tajaran naval coat"] = /obj/item/clothing/suit/storage/toggle/tajaran coat["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/tajaran + coat["Raakti Shariim coat"] = /obj/item/clothing/suit/storage/tajaran/raakti_shariim gear_tweaks += new/datum/gear_tweak/path(coat) /datum/gear/suit/tajara_cloak @@ -101,6 +102,7 @@ uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer uniform["adhomian summer pants"] = /obj/item/clothing/under/pants/tajaran uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic + uniform["Raakti Shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim gear_tweaks += new/datum/gear_tweak/path(uniform) /datum/gear/uniform/tajara_dress @@ -176,6 +178,7 @@ circlet["silver dress circlet"] = /obj/item/clothing/head/tajaran/circlet/silver circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur circlet["matake priest hat"] = /obj/item/clothing/head/tajaran/matake + circlet["Raakti Shariim beret"] = /obj/item/clothing/head/beret/tajaran/raakti_shariim gear_tweaks += new/datum/gear_tweak/path(circlet) /datum/gear/accessory/tajara_wrap diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm index 8cf0eedeaff..941acd87cd2 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -60,6 +60,18 @@ icon_state = "praberet" item_state = "praberet" +/obj/item/clothing/head/beret/tajaran/raakti_shariim + name = "\improper Raakti Shariim beret" + desc = "A blue beret with a pale-gold twin-suns insignia, signifying a Constable of the NKA's Raakti Shariim." + icon = 'icons/obj/clothing/species/tajaran/raakti_shariim.dmi' + icon_state = "raakti_shariim_beret" + item_state = "raakti_shariim_beret" + desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \ + peacekeeping force, working closely with both the Royal Constabulary and the Royal Ministry of Intelligence to \ + seek out internal threats to the Kingdom such as spies, terrorists, and other domestic enemies to the crown. \ + The Raakti Shariim's uniforms incorporate a dark, navy blue paired with a lilac accent and pale-gold twin-sun \ + insignia." + /obj/item/clothing/head/tajaran/nka_cap name = "service cap" desc = "A simple service cap worn by soldiers of the Adhomai Imperial Army." diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 11ab675f9d8..b294f90b20a 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -24,6 +24,18 @@ to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \ and colorful dress wearing \"Flapper\" variety of clothing." +/obj/item/clothing/suit/storage/tajaran/raakti_shariim + name = "\improper Raakti Shariim coat" + desc = "A blue adhomian wool coat with lilac purple accents and pale-gold insignia, signifying a Constable of the NKA's Raakti Shariim." + icon = 'icons/obj/clothing/species/tajaran/raakti_shariim.dmi' + icon_state = "raakti_shariim_coat" + item_state = "raakti_shariim_coat" + desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \ + peacekeeping force, working closely with both the Royal Constabulary and the Royal Ministry of Intelligence to \ + seek out internal threats to the Kingdom such as spies, terrorists, and other domestic enemies to the crown. \ + The Raakti Shariim's uniforms incorporate a dark, navy blue paired with a lilac accent and pale-gold twin-sun \ + insignia." + /obj/item/clothing/suit/storage/toggle/tajaran name = "tajaran naval coat" desc = "A thick wool coat from Adhomai." diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index 44ec1636130..90ca09bf539 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -72,6 +72,18 @@ with the Party. The average worker that labours in the industrial suburbs, can expect an honest living to be made, and a modest lifestyle to be led. The majority of the city labourers \ work in government run factories and spaceports, with stable but strict work hours and schedule the Hadii regime boasts of its fairness to the worker." +/obj/item/clothing/under/tajaran/raakti_shariim + name = "\improper Raakti Shariim uniform" + desc = "A blue and lilac adhomian uniform with pale-gold insignia, worn by members of the NKA's Raakti Shariim." + icon = 'icons/obj/clothing/species/tajaran/raakti_shariim.dmi' + icon_state = "raakti_shariim_uniform" + item_state = "raakti_shariim_uniform" + desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \ + peacekeeping force, working closely with both the Royal Constabulary and the Royal Ministry of Intelligence to \ + seek out internal threats to the Kingdom such as spies, terrorists, and other domestic enemies to the crown. \ + The Raakti Shariim's uniforms incorporate a dark, navy blue paired with a lilac accent and pale-gold twin-sun \ + insignia." + /obj/item/clothing/under/dress/tajaran name = "fancy adhomian dress" desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is white." diff --git a/html/changelogs/sierrakomodo-raakti-shariim-uniform.yml b/html/changelogs/sierrakomodo-raakti-shariim-uniform.yml new file mode 100644 index 00000000000..557ff8f2795 --- /dev/null +++ b/html/changelogs/sierrakomodo-raakti-shariim-uniform.yml @@ -0,0 +1,41 @@ +################################ +# 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: SierraKomodo + +# 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 a Raakti Shariim beret, coat, and uniform to the loadout for Tajara characters." diff --git a/icons/obj/clothing/species/tajaran/raakti_shariim.dmi b/icons/obj/clothing/species/tajaran/raakti_shariim.dmi new file mode 100644 index 00000000000..3ad283342ab Binary files /dev/null and b/icons/obj/clothing/species/tajaran/raakti_shariim.dmi differ