diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index 0c8f08d7869..da3b49bbc19 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -79,6 +79,8 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) coat["tajaran naval coat"] = /obj/item/clothing/suit/storage/toggle/tajaran coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/wool coat["raakti shariim coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim + coat["PRA urban police jacket"] = /obj/item/clothing/suit/storage/tajaran/pra_cop + coat["PRA rural police jacket"] = /obj/item/clothing/suit/storage/tajaran/pra_cop/rural coat["hadiist surplus jacket"] = /obj/item/clothing/suit/storage/tajaran/pra_jacket coat["al'mariist jacket"] = /obj/item/clothing/suit/storage/tajaran/dpra_jacket coat["fancy black ladies coat"] = /obj/item/clothing/suit/storage/tajaran/fancycoat @@ -165,7 +167,6 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer uniform["adhomian summer pants"] = /obj/item/clothing/pants/tajaran uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic - uniform["raakti shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim uniform["a'lmariist laborer clothes"] = /obj/item/clothing/under/tajaran/dpra uniform["a'lmariist laborer clothes, alternate"] = /obj/item/clothing/under/tajaran/dpra/alt uniform["adhomian evening suit"] = /obj/item/clothing/under/tajaran/fancy/evening_suit @@ -291,6 +292,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) circlet["golden dress circlet"] = /obj/item/clothing/head/tajaran/circlet circlet["silver dress circlet"] = /obj/item/clothing/head/tajaran/circlet/silver circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur + circlet["PRA urban police winter hat"] = /obj/item/clothing/head/tajaran/pra_cop/winter circlet["matake priest hat"] = /obj/item/clothing/head/tajaran/matake circlet["raakti shariim beret"] = /obj/item/clothing/head/beret/tajaran/raakti_shariim circlet["hadiist army beret"] = /obj/item/clothing/head/beret/tajaran/pra diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm index 5855146ad30..646285f7063 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -249,3 +249,24 @@ known to deploy their agents against off-world targets. Republican spies, enforces and collaborators are present in Mendell City's district six, carrying out orders or watching their fellow Tajara." icon_state = "psis_hat" item_state = "psis_hat" + +/obj/item/clothing/head/tajaran/pra_cop + name = "PRA NPD pilotka" + desc = "A hat issued to the PRA national police department, to be worn during the summer months." + desc_extended = "The National Police Department is the largest and best equipped police force on Adhomai. \ + Responsible for law enforcement in the People's Republic, the olive drab uniforms and polished badges have maintained peace and order, \ + or inspired fear, within the population since the nation's founding." + icon_state = "taj_cop_pilotka" + item_state = "taj_cop_pilotka" + +/obj/item/clothing/head/tajaran/pra_cop/winter + name = "PRA NPD woolen hat" + desc = "A warm hat issued to the PRA national police department, to be worn during the colder seasons." + icon_state = "taj_cop_hat" + item_state = "taj_cop_hat" + +/obj/item/clothing/head/tajaran/pra_cop/rural + name = "PRA NPD hat" + desc = "A hat issued to the PRA national police department, to be worn by cops working in the rural parts of the country." + icon_state = "taj_cop_hat_rural" + item_state = "taj_cop_hat_rural" diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 42b030bb835..1bdb171948f 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -369,3 +369,20 @@ item_state = "explorer_jacket" contained_sprite = TRUE allowed = list(/obj/item/grenade/dynamite, /obj/item/melee/whip, /obj/item/gun/projectile/revolver, /obj/item/pickaxe) + +/obj/item/clothing/suit/storage/tajaran/pra_cop + name = "PRA NPD jacket" + desc = "A warm and thick jacket with the markings of the PRA national police department." + desc_extended = "The National Police Department is the largest and best equipped police force on Adhomai. \ + Responsible for law enforcement in the People's Republic, the olive drab uniforms and polished badges have maintained peace and order, \ + or inspired fear, within the population since the nation's founding." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "taj_cop_suit" + item_state = "taj_cop_suit" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/tajaran/pra_cop/rural + name = "rural PRA NPD jacket" + desc = "A jacket with the markings of the PRA national police department that can commonly be found in the rural parts of the PRA." + icon_state = "taj_cop_suit_rural" + item_state = "taj_cop_suit_rural" diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index 1b683f0878d..5002d7f0973 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -403,6 +403,22 @@ item_state = "psis" starting_accessories = (/obj/item/clothing/accessory/holster/hip) +/obj/item/clothing/under/tajaran/pra_cop + name = "PRA NPD uniform" + desc = "A dark uniform bearing the markings of the PRA national police department. It is most commonly found within the cities of the PRA." + desc_extended = "The National Police Department is the largest and best equipped police force on Adhomai. \ + Responsible for law enforcement in the People's Republic, the olive drab uniforms and polished badges have maintained peace and order, \ + or inspired fear, within the population since the nation's founding." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "taj_cop_uniform" + item_state = "taj_cop_uniform" + +/obj/item/clothing/under/tajaran/pra_cop/rural + name = "rural PRA NPD uniform" + desc = "A light uniform bearing the markings of the PRA national police department. It is most commonly found in the rural parts of the PRA." + icon_state = "taj_cop_uniform_rural" + item_state = "taj_cop_uniform_rural" + // Red Polka Dot Dress /obj/item/clothing/under/dress/tajaran/polka_dot name = "red polka dot dress" diff --git a/html/changelogs/PRACops.yml b/html/changelogs/PRACops.yml new file mode 100644 index 00000000000..32fe2c99e0a --- /dev/null +++ b/html/changelogs/PRACops.yml @@ -0,0 +1,8 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "PRA police uniforms have been added. Currently they are only available through the chameleon kit." + - rscadd: "PRA police jackets are now available in the taj loadout, alongside the woolen PRA police hat." + - rscdel: "The Raakti Shariim uniform has been removed from the loadout. The coat and beret remains." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index bcc4ce542f6..2bc2ebf17aa 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ