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 725b802e8a5..1e7499ede80 100644 Binary files a/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi and b/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi differ diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index b355c6321d5..f05e659a61e 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -4862,7 +4862,6 @@ /obj/item/storage/briefcase, /obj/item/storage/secure/briefcase, /obj/item/camera, -/obj/item/clothing/accessory/badge/tcaf_papers/service, /obj/item/reagent_containers/food/drinks/flask, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/captain_quarters) @@ -7134,12 +7133,6 @@ /obj/item/shield/riot/tact/tcaf, /obj/item/shield/riot/tact/tcaf, /obj/item/shield/riot/tact/tcaf, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, /obj/item/clothing/glasses/safety/goggles/tactical, /obj/item/clothing/glasses/safety/goggles/tactical, /obj/item/clothing/glasses/safety/goggles/tactical, @@ -7152,6 +7145,13 @@ /obj/item/storage/belt/security/full/alt, /obj/item/storage/belt/security/full/alt, /obj/item/storage/belt/security/full/alt, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/clothing/accessory/storage/pouches/black, +/obj/item/shield/energy/tcaf, +/obj/item/shield/energy/tcaf, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/storage) "Bn" = ( @@ -8159,16 +8159,8 @@ icon_state = "0-8" }, /obj/effect/floor_decal/industrial/outline/service, -/obj/item/clothing/accessory/arm_guard/tcaf/tcaf_stripe, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/ammo_magazine/a357{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/ammo_magazine/a357{ - pixel_x = -6; - pixel_y = -2 - }, +/obj/item/ammo_magazine/a357, +/obj/item/ammo_magazine/a357, /obj/item/gun/projectile/revolver/konyang{ pixel_y = 5 }, @@ -11037,16 +11029,6 @@ /obj/item/clothing/suit/storage/tcaf, /obj/item/clothing/accessory/tc_pin, /obj/item/clothing/accessory/tc_pin, -/obj/item/clothing/accessory/badge/tcaf_papers/service, -/obj/item/clothing/accessory/badge/tcaf_papers/service, -/obj/item/clothing/accessory/badge/tcaf_papers/service, -/obj/item/clothing/accessory/badge/tcaf_papers/service, -/obj/item/clothing/accessory/badge/tcaf_papers/service, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/black, /obj/item/clothing/head/beret/tcaf/field, /obj/item/clothing/head/beret/tcaf/field, /obj/item/clothing/head/beret/tcaf/field, diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm index d4117bc7b06..e8aebd0766b 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm @@ -30,7 +30,7 @@ id = /obj/item/card/id/tcaf accessory = /obj/item/clothing/accessory/holster/hip l_ear = /obj/item/radio/headset/ship - backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1) + backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/clothing/accessory/badge/tcaf_papers/service = 1) species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/jackboots/toeless, @@ -92,7 +92,7 @@ possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) mob_name_prefix = "Pfct. " desc = "You are a Prefect of either the Republic Espatiers or Republic Astroforce. \ - Supervises your subordinate espatiers or enlisted rates and ensure the commanding officer's orders are carried out. \ + Supervise your subordinate espatiers or enlisted rates and ensure the commanding officer's orders are carried out. \ With exceptional work, you could see yourself assigned to a more comfortable vessel..." assigned_role = "TCAF Republic Astroforce Prefect" special_role = "TCAF Republic Astroforce Prefect" @@ -103,7 +103,7 @@ uniform = /obj/item/clothing/under/tcaf/crew accessory = /obj/item/clothing/accessory/holster/hip gloves = /obj/item/clothing/gloves/tcaf - 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_prefect_pauldron = 1) + backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/clothing/accessory/badge/tcaf_papers/service = 1, /obj/item/clothing/accessory/tcaf/pauldron/prefect = 1) /datum/ghostspawner/human/tcaf_crewman/officer name = "TCAF Republic Astroforce Astrarch" @@ -124,5 +124,5 @@ uniform = /obj/item/clothing/under/tcaf_officer suit = /obj/item/clothing/suit/storage/toggle/tcaf_officer_greatcoat gloves = /obj/item/clothing/gloves/white - 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/clothing/accessory/badge/tcaf_papers/service = 1, /obj/item/clothing/accessory/tcaf/medallion/astrarch = 1, /obj/item/clothing/accessory/arm_guard/tcaf/tcaf_stripe = 1) accessory = /obj/item/clothing/accessory/holster/hip