From 91a226ecfc36e15d6846cd52961207e8ceb56069 Mon Sep 17 00:00:00 2001 From: ant <98155621+beepbopbeepbop@users.noreply.github.com> Date: Sat, 29 Aug 2026 12:33:01 +0000 Subject: [PATCH] minor TCAF fixes (#23150) Signed-off-by: ant <98155621+beepbopbeepbop@users.noreply.github.com> Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com> --- code/datums/outfits/ert/biesel.dm | 2 +- code/datums/outfits/event/outfit_tcaf.dm | 2 +- .../crates_lockers/crates/gear_loadout.dm | 8 +-- .../structures/machinery/suit_cycler_units.dm | 1 + code/modules/clothing/factions/biesel.dm | 46 +++++++++--------- html/changelogs/notagonk-tcaf_fixes.yml | 5 ++ .../modular_armor_attachments.dmi | Bin 1729 -> 3616 bytes .../biesel/tcaf_corvette/tcaf_corvette.dmm | 36 ++++---------- .../tcaf_corvette/tcaf_corvette_ghostroles.dm | 8 +-- 9 files changed, 49 insertions(+), 59 deletions(-) create mode 100644 html/changelogs/notagonk-tcaf_fixes.yml diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm index d132a65c607..795fac29a22 100644 --- a/code/datums/outfits/ert/biesel.dm +++ b/code/datums/outfits/ert/biesel.dm @@ -120,4 +120,4 @@ /obj/outfit/admin/ert/tcaf/officer name = "TCAF Republic Espatiers Officer" - accessory = /obj/item/clothing/accessory/tcaf/astrarch + accessory = /obj/item/clothing/accessory/tcaf/medallion/astrarch diff --git a/code/datums/outfits/event/outfit_tcaf.dm b/code/datums/outfits/event/outfit_tcaf.dm index 6f02a1bd2d2..f36b2d609d2 100644 --- a/code/datums/outfits/event/outfit_tcaf.dm +++ b/code/datums/outfits/event/outfit_tcaf.dm @@ -60,7 +60,7 @@ head = /obj/item/clothing/head/tcaf_officer uniform = /obj/item/clothing/under/tcaf_officer suit = /obj/item/clothing/suit/storage/toggle/tcaf_officer_greatcoat - backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/shield/energy/tcaf = 1, /obj/item/clothing/accessory/tcaf/astrarch = 1) + backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/shield/energy/tcaf = 1, /obj/item/clothing/accessory/tcaf/medallion/astrarch = 1) /// Home Defence Forces /// TBD diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 74e8e6a6c8c..e2673b77d27 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -1041,10 +1041,10 @@ new /obj/item/clothing/head/helmet/tcaf/tcaf_visor(src) new /obj/item/clothing/head/helmet/tcaf/tcaf_visor(src) new /obj/item/material/twohanded/pike/flag(src) - new /obj/item/clothing/accessory/tcaf_prefect_pauldron(src) - new /obj/item/clothing/accessory/tcaf/immunis(src) - new /obj/item/clothing/accessory/tcaf/immunis(src) - new /obj/item/clothing/accessory/tcaf/astrarch(src) + new /obj/item/clothing/accessory/tcaf/pauldron/prefect(src) + new /obj/item/clothing/accessory/tcaf/medallion/immunis(src) + new /obj/item/clothing/accessory/tcaf/medallion/immunis(src) + new /obj/item/clothing/accessory/tcaf/medallion/astrarch(src) new /obj/item/shield/energy/tcaf(src) new /obj/item/shield/energy/tcaf(src) new /obj/item/shield/energy/tcaf(src) diff --git a/code/game/objects/structures/machinery/suit_cycler_units.dm b/code/game/objects/structures/machinery/suit_cycler_units.dm index d013b917605..12243684e26 100644 --- a/code/game/objects/structures/machinery/suit_cycler_units.dm +++ b/code/game/objects/structures/machinery/suit_cycler_units.dm @@ -158,6 +158,7 @@ model_text = "Zavodskoi Interstellar" req_access = list(ACCESS_TCAF) departments = list("Tau Ceti Armed Forces") + mask = /obj/item/clothing/mask/gas/half suit = /obj/item/clothing/suit/space/void/tcaf helmet = /obj/item/clothing/head/helmet/space/void/tcaf diff --git a/code/modules/clothing/factions/biesel.dm b/code/modules/clothing/factions/biesel.dm index 8ec86188073..6e1c14db3d9 100644 --- a/code/modules/clothing/factions/biesel.dm +++ b/code/modules/clothing/factions/biesel.dm @@ -38,54 +38,56 @@ item_state = "tcaf_raf_foreign_legion" worn_state = "tcaf_raf_foreign_legion" -// For specialist legionnaires -/obj/item/clothing/accessory/tcaf/immunis +// Medallions +/obj/item/clothing/accessory/tcaf/medallion + icon = 'icons/obj/clothing/ties.dmi' + slot = ACCESSORY_SLOT_CAPE + flippable = TRUE + +// For Specialist Legionnaires. +/obj/item/clothing/accessory/tcaf/medallion/immunis name = "legionnaire immuni medallions" desc = "Two small gold medallions, one worn on the shoulder and the other worn on the chest. They denote the rank of Legionnaire Imminus, a specialist enlisted member immune from menial taskings." icon_state = "tcaf_immuni_medallions" item_state = "tcaf_immuni_medallions" overlay_state = "tcaf_immuni_medallions" -// For astrachs -/obj/item/clothing/accessory/tcaf/astrarch +// For Astrachs/Planarchs. +/obj/item/clothing/accessory/tcaf/medallion/astrarch name = "arch medallions" desc = "A gold ribbon meant to attach to the chest and sling around the shoulder accompanied by two platinum medallions. They denote the rank of Astrarch or Planarch depending on service branch, roughly equivalent to a Captain." icon_state = "tcaf_astrarch_medallions" item_state = "tcaf_astrarch_medallions" overlay_state = "tcaf_astrarch_medallions" - slot = ACCESSORY_SLOT_CAPE - flippable = TRUE -/obj/item/clothing/accessory/tcaf/legate +// For Legates. +/obj/item/clothing/accessory/tcaf/medallion/legate name = "legate medallions" desc = "A gold ribbon meant to attach to the chest and sling around the shoulder accompanied by two enamelled phoron medallions. They denote the rank of Legate, roughly equivalent to a General or Admiral." icon_state = "tcaf_legate_medallions" item_state = "tcaf_legate_medallions" overlay_state = "tcaf_legate_medallions" - slot = ACCESSORY_SLOT_CAPE - flippable = TRUE -// Specifically for Prefects. -/obj/item/clothing/accessory/tcaf_prefect_pauldron - name = "\improper TCAF prefect pauldron" - desc = "A bright red hard pauldron with three gold medallions attached to it. They denote the rank of Principal Prefect during combat situations." +// Pauldrons +/obj/item/clothing/accessory/tcaf/pauldron icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi' + contained_sprite = TRUE + slot = ACCESSORY_SLOT_GENERIC + flippable = FALSE + +// For Prefects. +/obj/item/clothing/accessory/tcaf/pauldron/prefect + name = "\improper TCAF prefect pauldron" + desc = "A bright red hard pauldron with three gold medallions attached to it. They denote the rank of Prefect during combat situations." icon_state = "tcaf_prefect_pauldron" item_state = "tcaf_prefect_pauldron" - contained_sprite = TRUE - slot = ACCESSORY_SLOT_GENERIC - flippable = FALSE -// Specifically for Principal Prefects. -/obj/item/clothing/accessory/tcaf_principal_prefect_pauldron +// For Principal Prefects. +/obj/item/clothing/accessory/tcaf/pauldron/principal_prefect name = "\improper TCAF principal prefect pauldron" desc = "A blue hard pauldron with a platinum medallion attached to it. They denote the rank of Principal Prefect during combat situations." - icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi' icon_state = "tcaf_principal_prefect_pauldron" item_state = "tcaf_principal_prefect_pauldron" - contained_sprite = TRUE - slot = ACCESSORY_SLOT_GENERIC - flippable = FALSE // For officers that want to look like a One Piece villain. /obj/item/clothing/suit/storage/toggle/tcaf_officer_greatcoat diff --git a/html/changelogs/notagonk-tcaf_fixes.yml b/html/changelogs/notagonk-tcaf_fixes.yml new file mode 100644 index 00000000000..abba88f7907 --- /dev/null +++ b/html/changelogs/notagonk-tcaf_fixes.yml @@ -0,0 +1,5 @@ +author: notagonk +delete-after: True +changes: + - bugfix: "Fixed some missing TCAF accessory sprites." + - qol: "Minor adjustments to some equipment on the TCAF Corvette." diff --git a/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi b/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi index 725b802e8a5ea6d5e11832c73ba12c0aae25ae6a..1e7499ede80479459dce162251e4bf098f2b27d7 100644 GIT binary patch literal 3616 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 SWSAlV0000