From f0f93251af94be02590aceabe09d58c7672947d0 Mon Sep 17 00:00:00 2001 From: FearTheGabby Date: Mon, 10 Feb 2025 09:26:10 -0600 Subject: [PATCH] Fixes Golden Deep shirts & outerwear (#20454) Some Golden Deep clothing wasn't adjusted with the pants update, so this rectifies that. Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com> --- .../loadout/items/xeno/machine.dm | 9 +-- code/modules/clothing/factions/goldendeep.dm | 5 +- .../SimpleMaroon-goldendeepoutfitfix.yml | 58 ++++++++++++++++++ .../item/clothing/accessory/goldendeep.dmi | Bin 2536 -> 2207 bytes 4 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/SimpleMaroon-goldendeepoutfitfix.yml diff --git a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm index a654c4cd720..dc9616a10f0 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm @@ -193,7 +193,7 @@ ABSTRACT_TYPE(/datum/gear/augment/machine) sort_category = "Xenowear - IPC" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION -/datum/gear/accessory/goldendeep +/datum/gear/uniform/goldendeepshirt display_name = "golden deep shirt selection" description = "A selection of shirts and other tops worn by members of the Golden Deep." path = /obj/item/clothing/accessory/goldendeep @@ -201,7 +201,7 @@ ABSTRACT_TYPE(/datum/gear/augment/machine) sort_category = "Xenowear - IPC" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION -/datum/gear/accessory/goldendeep/New() +/datum/gear/uniform/goldendeepshirt/New() ..() var/list/goldendeepshirt = list() goldendeepshirt["golden deep fine shirt"] = /obj/item/clothing/under/dressshirt/goldendeep @@ -212,15 +212,16 @@ ABSTRACT_TYPE(/datum/gear/augment/machine) /datum/gear/accessory/goldendeepouter display_name = "golden deep outer layer selection" description = "A selection of tops suited for use as outer layers worn by members of the Golden Deep." - path = /obj/item/clothing/accessory/goldendeep/gambeson + path = /obj/item/clothing/accessory/goldendeep whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) sort_category = "Xenowear - IPC" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + slot = slot_tie /datum/gear/accessory/goldendeepouter/New() ..() var/list/goldendeepouter = list() - goldendeepouter["golden deep quilted gambeson"] = /obj/item/clothing/accessory/goldendeep/gambeson + goldendeepouter["golden deep quilted gambeson"] = /obj/item/clothing/accessory/goldendeep goldendeepouter["golden deep tabbard"] = /obj/item/clothing/accessory/goldendeep/tabbard goldendeepouter["golden deep pullover"] = /obj/item/clothing/accessory/goldendeep/pullover goldendeepouter["golden deep rain garb"] = /obj/item/clothing/accessory/goldendeep/raingarb diff --git a/code/modules/clothing/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm index e21138219db..272233bc279 100644 --- a/code/modules/clothing/factions/goldendeep.dm +++ b/code/modules/clothing/factions/goldendeep.dm @@ -102,11 +102,14 @@ item_state = "cloth_wrapped_uniform" // outerwear -/obj/item/clothing/accessory/goldendeep/gambeson +/obj/item/clothing/accessory/goldendeep name = "quilted gambeson" desc = " Intricately woven fibers resemble armor of old, but now are reinforced for the wear and tear caused by moving metal joints." + icon = 'icons/obj/item/clothing/accessory/goldendeep.dmi' icon_state = "quilted_gambeson" item_state = "quilted_gambeson" + contained_sprite = TRUE + has_accents = TRUE /obj/item/clothing/accessory/goldendeep/tabbard name = "valiant tabbard" diff --git a/html/changelogs/SimpleMaroon-goldendeepoutfitfix.yml b/html/changelogs/SimpleMaroon-goldendeepoutfitfix.yml new file mode 100644 index 00000000000..759e6004493 --- /dev/null +++ b/html/changelogs/SimpleMaroon-goldendeepoutfitfix.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed Golden Deep shirts not showing up in character preview and Golden Deep outerwear being invisible." diff --git a/icons/obj/item/clothing/accessory/goldendeep.dmi b/icons/obj/item/clothing/accessory/goldendeep.dmi index 7a710fe661c23468a0ec6c63983f20719d98ca43..56ea2fdb125f24f5de5514048b14e6e90f153873 100644 GIT binary patch literal 2207 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 y4ZWPf1%~q=t$lTXpZn{>m3h!lZ{K3ET;yM!Eq