diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index dff53a9dc26..32a68f80a44 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -263,6 +263,13 @@ item_state = "legion_bag" empty_delay = 0.8 SECOND +/obj/item/storage/backpack/tcaf + name = "\improper TCAF carapace backpack" + desc = "A hard shelled backpack with the flag of the Republic of Biesel front and center. Made for the Tau Ceti Armed Forces." + icon_state = "tcaf_carapace_backpack" + item_state = "tcaf_carapace_backpack" + empty_delay = 0.8 SECOND + /obj/item/storage/backpack/service name = "idris service backpack" desc = "The Idris Service Standard, known for it's professionalism. It also baffingly includes this monstrous, self-stabilizing back-mounted utensil and service item holder." diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index af732dd662c..13ab0f82ff4 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -284,6 +284,16 @@ build_from_parts = TRUE worn_overlay = "over" +/obj/item/clothing/gloves/tcaf + name = "\improper TCAF armsman gloves" + desc = "A pair of khaki tactical gloves with reinforcement at the knuckles and an adjustable strap at the wrist." + icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi' + contained_sprite = TRUE + icon_state = "tcaf_armsman_gloves" + item_state = "tcaf_armsman_gloves" + build_from_parts = TRUE + worn_overlay = "over" + /obj/item/clothing/gloves/ballistic name = "ballistic gauntlet" desc = "A metal gauntlet armed with a wrist-mounted shotgun." diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 06fb6dd2e0c..b88690f0baa 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -172,10 +172,10 @@ icon_state = "orion" item_state = "orion" -// TCFL +// TCAF /obj/item/clothing/head/beret/legion - name = "TCFL dress beret" + name = "\improper TCFL dress beret" desc = "A pale blue dress beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\". A common good luck charm among former legionaires." icon_state = "tcfl_dress" item_state = "tcfl_dress" @@ -192,6 +192,20 @@ icon_state = "tcfl_sentinel" item_state = "tcfl_sentinel" +/obj/item/clothing/head/beret/legion/tcaf + name = "\improper TCAF dress beret" + desc = "A blue dress beret bearing the flag of the Republic of Biesel. Often only seen worn by in-service members of the Tau Ceti Armed Forces." + icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi' + contained_sprite = TRUE + icon_state = "tcaf_dress_beret" + item_state = "tcaf_dress_beret" + +/obj/item/clothing/head/beret/legion/tcaf/tcaf_field + name = "\improper TCAF field beret" + desc = "A red beret bearing a golden torch in semblance of the Republic of Biesel. Often only seen worn by in-service members of the Tau Ceti Armed Forces." + icon_state = "tcaf_field_beret" + item_state = "tcaf_field_beret" + //centcom /obj/item/clothing/head/beret/centcom/officer diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index b23ca0409dc..8d94ed5faf3 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -93,6 +93,20 @@ /obj/item/clothing/accessory/storage/modular_pouch/large ) +/obj/item/clothing/suit/armor/carrier/tcaf + starting_accessories = list( + /obj/item/clothing/accessory/armor_plate/tcaf, + /obj/item/clothing/accessory/leg_guard/tcaf, + /obj/item/clothing/accessory/arm_guard/tcaf, + /obj/item/clothing/accessory/storage/chestpouch + ) + +/obj/item/clothing/suit/armor/carrier/tcaf/tcaf_light + starting_accessories = list( + /obj/item/clothing/accessory/armor_plate/tcaf/tcaf_light, + /obj/item/clothing/accessory/leg_guard/tcaf, + ) + /obj/item/clothing/accessory/armor_plate name = "corporate armor plate" desc = "A particularly light-weight armor plate in stylish corporate black. Unfortunately, not very good if you hold it with your hands." @@ -207,6 +221,39 @@ item_state = "plate_blue" slowdown = 0 // the SCC is hacking +/obj/item/clothing/accessory/armor_plate/tcaf + name = "\improper TCAF legionnaire carapace" + desc = "The blue carapace of the Tau Ceti Armed Forces. Polished and proud for Miranda Trasen's favorite soldiers." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "tcaf_plate" + item_state = "tcaf_plate" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_RIFLE, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + slowdown = 0 // inherited the hacking from the scc + +/obj/item/clothing/accessory/armor_plate/tcaf/tcaf_light + name = "\improper TCAF legionnaire light carapace" + desc = "A lighter version of the blue carapace of the Tau Ceti Armed Forces. Reserved for recruits, recon, and prissy officers in the field." + icon_state = "tcaf_plate_light" + item_state = "tcaf_plate_light" + slowdown = 0 + +/obj/item/clothing/accessory/storage/chestpouch + name = "chestpouch rig" + desc = "A harness made to be worn over a set of armor. Comes with three pouches on the front, and a hidden pouch on the back for your snacks!" + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "tcaf_chestpouches" + item_state = "tcaf_chestpouches" + contained_sprite = TRUE + slot = ACCESSORY_SLOT_ARMOR_POCKETS + slots = 4 + /obj/item/clothing/accessory/storage/modular_pouch name = "plate carrier pouches" desc = "A comfortable set of pouches that can be attached to a plate carrier, allowing the wearer to store some small items." @@ -302,6 +349,32 @@ bomb = ARMOR_BOMB_PADDED, ) +/obj/item/clothing/head/helmet/tcaf + name = "\improper TCAF legionnaire faceplate helmet" + desc = "A carapace helmet in the traditional colors of the Tau Ceti Armed Forces. This one equipped with the signature faceplate." + icon = 'icons/clothing/kit/modular_armor.dmi' + contained_sprite = TRUE + icon_state = "tcaf_helm_face" + item_state = "tcaf_helm_face" + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + +/obj/item/clothing/head/helmet/tcaf/tcaf_novisor + name = "\improper TCAF legionnaire helmet" + desc = "A carapace helmet in the traditional colors of the Tau Ceti Armed Forces." + icon_state = "tcaf_helm_novisor" + item_state = "tcaf_helm_novisor" + +/obj/item/clothing/head/helmet/tcaf/tcaf_visor + name = "\improper TCAF legionnaire visored helmet" + desc = "A carapace helmet in the traditional colors of the Tau Ceti Armed Forces. This one is equipped with a stylish visor." + icon_state = "tcaf_helm_visor" + item_state = "tcaf_helm_visor" //Cosmetic Accessories @@ -672,3 +745,23 @@ Szalai and MacPherson sought to undo." icon_state = "flagpatch_ssmd" item_state = "flagpatch_ssmd" + +/obj/item/clothing/accessory/tcaf_prefect_pauldron + name = "\improper TCAF prefect pauldron" + desc = "A bright red hard pauldron to indicate the wearer has the rank of Prefect in the Tau Ceti Armed Forces." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "tcaf_prefect_pauldron" + item_state = "tcaf_prefect_pauldron" + contained_sprite = TRUE + slot = ACCESSORY_SLOT_GENERIC + flippable = FALSE + +/obj/item/clothing/accessory/tcaf_senior_legion_pauldron + name = "\improper TCAF senior legionnaire pauldron" + desc = "A blue hard pauldron to indicate the wearer has the rank of Senior Legionnaire in the Tau Ceti Armed Forces." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "tcaf_senior_legion_pauldron" + item_state = "tcaf_senior_legion_pauldron" + contained_sprite = TRUE + slot = ACCESSORY_SLOT_GENERIC + flippable = FALSE diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 8d7779c1309..9a98a1105b3 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -113,6 +113,21 @@ bomb = ARMOR_BOMB_PADDED, ) +/obj/item/clothing/accessory/leg_guard/tcaf + name = "\improper TCAF legionnaire leg carapace" + desc = "Try to sweep the leg against someone wearing these." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "tcaf_boot_armor" + item_state = "tcaf_boot_armor" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + //Arm guards. /obj/item/clothing/accessory/arm_guard name = "corporate arm guards" @@ -239,3 +254,23 @@ energy = ARMOR_ENERGY_SMALL, bomb = ARMOR_BOMB_PADDED, ) + +/obj/item/clothing/accessory/arm_guard/tcaf + name = "\improper TCAF carapace arm guards" + desc = "Blue carapace armguards to protect you in the modern battlefield of 2465." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "tcaf_armguards" + item_state = "tcaf_armguards" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + +/obj/item/clothing/accessory/arm_guard/tcaf/tcaf_stripe + name = "striped TCAF carapace arm guards" + icon_state = "tcaf_armguards_stripe" + item_state = "tcaf_armguards_stripe" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 1340bc85d38..a21a42e7eb2 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -540,6 +540,15 @@ item_state = "tauceti_pilot" worn_state = "tauceti_pilot" +/obj/item/clothing/under/legion/tcaf + name = "\improper TCAF armsman uniform" + desc = "A black longsleeved top over rough khaki tactical pants. Designed for the use of on-ship legionnaires serving the Republic." + icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi' + contained_sprite = TRUE + icon_state = "tcaf_armsman_uniform" + item_state = "tcaf_armsman_uniform" + worn_state = "tcaf_armsman_uniform" + /obj/item/clothing/under/offworlder name = "\improper CR suit" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear." diff --git a/html/changelogs/tcaf-additions.yml b/html/changelogs/tcaf-additions.yml new file mode 100644 index 00000000000..8504b6e86d0 --- /dev/null +++ b/html/changelogs/tcaf-additions.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: Noble Row + +# 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 TCAF uniform, modular armor, backpack, gloves, berets, and pouches." diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi index 4c937950ec1..73d6174748e 100644 Binary files a/icons/clothing/kit/modular_armor.dmi and b/icons/clothing/kit/modular_armor.dmi differ diff --git a/icons/clothing/under/uniforms/tcaf_uniform.dmi b/icons/clothing/under/uniforms/tcaf_uniform.dmi new file mode 100644 index 00000000000..a14e8e0fe3d Binary files /dev/null and b/icons/clothing/under/uniforms/tcaf_uniform.dmi differ diff --git a/icons/obj/storage/backpack.dmi b/icons/obj/storage/backpack.dmi index 2d2910dd600..6fb1f0312b6 100644 Binary files a/icons/obj/storage/backpack.dmi and b/icons/obj/storage/backpack.dmi differ