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 ffa5f9cecb1..bc2ae8b80c2 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm @@ -185,3 +185,113 @@ sort_category = "Xenowear - IPC" cost = 1 whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + +/datum/gear/suit/goldendeep + display_name = "eccentric coat" + description = "A colorable coat worn by members of Golden Deep who feel particularly like a boss fight." + path = /obj/item/clothing/suit/storage/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 + +/datum/gear/accessory/goldendeep + 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 + 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 + +/datum/gear/accessory/goldendeep/New() + ..() + var/list/goldendeepshirt = list() + goldendeepshirt["golden deep fine shirt"] = /obj/item/clothing/accessory/goldendeep + goldendeepshirt["golden deep pompous shirt"] = /obj/item/clothing/accessory/goldendeep/pompous + goldendeepshirt["golden deep cloth wrapped uniform"] = /obj/item/clothing/accessory/goldendeep/clothwrappeduniform + gear_tweaks += new /datum/gear_tweak/path(goldendeepshirt) + +/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 + 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 + +/datum/gear/accessory/goldendeepouter/New() + ..() + var/list/goldendeepouter = list() + goldendeepouter["golden deep quilted gambeson"] = /obj/item/clothing/accessory/goldendeep/gambeson + 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 + gear_tweaks += new /datum/gear_tweak/path(goldendeepouter) + +/datum/gear/accessory/goldendeepcloak + display_name = "golden deep cloak selection" + description = "A selection of cloaks and capes worn by members of the Golden Deep." + path = /obj/item/clothing/accessory/poncho/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 + +/datum/gear/accessory/goldendeepcloak/New() + ..() + var/list/goldendeepcloak = list() + goldendeepcloak["golden deep cape"] = /obj/item/clothing/accessory/poncho/goldendeep + goldendeepcloak["golden deep flowing cloak"] = /obj/item/clothing/accessory/poncho/goldendeep/flowingcloak + goldendeepcloak["golden deep elegant cloak"] = /obj/item/clothing/accessory/poncho/goldendeep/elegantcloak + goldendeepcloak["golden deep fur wrap"] = /obj/item/clothing/accessory/poncho/goldendeep/furwrap + goldendeepcloak["golden deep desert adornment"] = /obj/item/clothing/accessory/poncho/goldendeep/desertadornment + gear_tweaks += new /datum/gear_tweak/path(goldendeepcloak) + +/datum/gear/head/goldendeep + display_name = "golden deep headgear selection" + description = "A selection of hats and other headgear worn by members of the Golden Deep." + path = /obj/item/clothing/head/goldendeep + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + 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" + +/datum/gear/head/goldendeep/New() + ..() + var/list/goldendeephat = list() + goldendeephat["golden deep furred crown"] = /obj/item/clothing/head/goldendeep + goldendeephat["golden deep cowl"] = /obj/item/clothing/head/goldendeep/cowl + goldendeephat["golden deep cube hood"] = /obj/item/clothing/head/goldendeep/cubehood + gear_tweaks += new /datum/gear_tweak/path(goldendeephat) + +/datum/gear/head/goldendeepchainjewelry + display_name = "golden deep chain jewelry" + path = /obj/item/clothing/head/goldendeep/chainjewelry + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + 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" + +/datum/gear/head/goldendeepchainjewelry/New() + ..() + var/list/chainjewelry = list() + chainjewelry["golden deep chain jewelry"] = /obj/item/clothing/head/goldendeep/chainjewelry + chainjewelry["golden deep chain jewelry (baseline)"] = /obj/item/clothing/head/goldendeep/chainjewelry/baseline + gear_tweaks += new /datum/gear_tweak/path(chainjewelry) + +/datum/gear/accessory/webbing/goldendeep + display_name = "golden deep thesian webbing" + path = /obj/item/clothing/accessory/storage/goldendeep + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + 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" + +/datum/gear/goldendeep + display_name = "golden deep sacred icon" + path = /obj/item/storage/backpack/goldendeep + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + 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" + +/datum/gear/goldendeep/New() + ..() + var/list/sacredicon = list() + sacredicon["golden deep sacred icon"] = /obj/item/storage/backpack/goldendeep + sacredicon["golden deep sacred icon (baseline)"] = /obj/item/storage/backpack/goldendeep/baseline + gear_tweaks += new /datum/gear_tweak/path(sacredicon) diff --git a/code/modules/clothing/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm index aa08b5cd955..9467bb6070a 100644 --- a/code/modules/clothing/factions/goldendeep.dm +++ b/code/modules/clothing/factions/goldendeep.dm @@ -55,3 +55,174 @@ item_state = "goldendeep_skirtsuit" icon = 'icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi' contained_sprite = TRUE + +//colorable items go under here + +//shirts +/obj/item/clothing/accessory/goldendeep + name = "fine shirt" + desc = "An expertly tailored shirt often found for formal events or doing good business." + icon_state = "fine_shirt" + item_state = "fine_shirt" + icon = 'icons/clothing/under/shirts/fine_shirt.dmi' + contained_sprite = TRUE + has_accents = TRUE + +/obj/item/clothing/accessory/goldendeep/pompous + name = "pompous shirt" + desc = "Poofy and ostentatious, this shirt of fine fabric screams wealth." + icon_state = "pompous_shirt" + item_state = "pompous_shirt" + icon = 'icons/clothing/under/shirts/pompous_shirt.dmi' + +/obj/item/clothing/accessory/goldendeep/gambeson + 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_state = "quilted_gambeson" + item_state = "quilted_gambeson" + icon = 'icons/clothing/under/shirts/quilted_gambeson.dmi' + +/obj/item/clothing/accessory/goldendeep/tabbard + name = "valiant tabbard" + desc = " Tabbards of Pactolous represent businesses and merchants, if not an individual's own organization." + icon_state = "valiant_tabbard" + item_state = "valiant_tabbard" + icon = 'icons/clothing/under/shirts/valiant_tabbard.dmi' + +/obj/item/clothing/accessory/goldendeep/clothwrappeduniform + name = "cloth wrapped uniform" + desc = "Casual and resilient, these intricate wraps protect one against the acid rains of Pactolous while keeping their style." + icon_state = "cloth_wrapped_uniform" + item_state = "cloth_wrapped_uniform" + icon = 'icons/clothing/under/shirts/cloth_wrapped_uniform.dmi' + +/obj/item/clothing/accessory/goldendeep/pullover + name = "armored pullover" + desc = " A statement piece with leather or jeweled adornment make anyone stand out wearing this strange garb." + icon_state = "armored_pullover" + item_state = "armored_pullover" + icon = 'icons/clothing/under/shirts/armored_pullover.dmi' + +/obj/item/clothing/accessory/goldendeep/raingarb + name = "pactolus rain garb" + desc = "Surprisingly sturdy for its patchwork appearance, pieces like this have been protecting workers from Pactolus' radioactive rains for years." + icon_state = "pactolus_raingarb" + item_state = "pactolus_raingarb" + icon = 'icons/clothing/under/shirts/pactolus_raingarb.dmi' + +//suits +/obj/item/clothing/suit/storage/goldendeep + name = "eccentric coat" + desc = "This coat is long with reinforcement to make someone look like an angel of old, or a clown." + icon_state = "eccentric_coat" + item_state = "eccentric_coat" + icon = 'icons/clothing/suits/coats/eccentric_coat.dmi' + contained_sprite = TRUE + has_accents = TRUE + +//cloaks + +/obj/item/clothing/accessory/poncho/goldendeep + name = "golden deep cape" + desc = "Viewed as ostentatious by outsiders (and perhaps insiders, for that matter) capes nonetheless remain as a means of quickly broadcasting one's status (or pretentions of status)." + icon_state = "golden_cape" + item_state = "golden_cape" + icon = 'icons/clothing/suits/capes/golden_cape.dmi' + contained_sprite = TRUE + icon_override = null + +/obj/item/clothing/accessory/poncho/goldendeep/flowingcloak + name = "flowing cloak" + desc = "A long and flowing cloak used by members of Golden Deep evocative of trenchcoats. Curiously, many investigatorial synthetics within the collective favor these cloaks." + icon_state = "flowing_cloak" + item_state = "flowing_cloak" + icon = 'icons/clothing/suits/capes/flowing_cloak.dmi' + has_accents = TRUE + +/obj/item/clothing/accessory/poncho/goldendeep/elegantcloak + name = "elegant cloak" + desc = "Billowing fabric for all classes with a regal clasp that hints at its original merchant designers." + icon_state = "elegant_cloak" + item_state = "elegant_cloak" + icon = 'icons/clothing/suits/capes/elegant_cloak.dmi' + has_accents = TRUE + +/obj/item/clothing/accessory/poncho/goldendeep/furwrap + name = "fur wrap" + desc = "The fur of an animal, soft and fluffy, now repurposed as a decorative neck wrap." + icon_state = "fur_wrap" + item_state = "fur_wrap" + icon = 'icons/clothing/suits/capes/fur_wrap.dmi' + +/obj/item/clothing/accessory/poncho/goldendeep/desertadornment + name = "desert adornment" + desc = "Lightweight and soft, this sleeveless coat feels like it's hardly anything at all, but it keeps the sun from bearing down on the wearer." + icon_state = "desert_adornment" + item_state = "desert_adornment" + icon = 'icons/clothing/suits/capes/desert_adornment.dmi' + +//head slot + +/obj/item/clothing/head/goldendeep + name = "furred crown" + desc = "Like a true monarch, has a metal rim capped with a cloth top piece. Peaked in a ornate point." + icon_state = "furred_crown" + item_state = "furred_crown" + icon = 'icons/clothing/head/furred_crown.dmi' + contained_sprite = TRUE + has_accents = TRUE + +/obj/item/clothing/head/goldendeep/cowl + name = "cowl" + desc = "A cloth hood with special fabric rated for the acid rain of Pactolous." + icon_state = "cowl" + item_state = "cowl" + icon = 'icons/clothing/head/cowl.dmi' + body_parts_covered = 0 + slot_flags = SLOT_EARS | SLOT_HEAD + +/obj/item/clothing/head/goldendeep/cubehood + name = "cube hood" + desc = "Ornate and with subtle religious undertones, would make any wearer loom like a revered parent." + icon_state = "cube_hood" + item_state = "cube_hood" + icon = 'icons/clothing/head/cube_hood.dmi' + body_parts_covered = 0 + slot_flags = SLOT_EARS | SLOT_HEAD + +/obj/item/clothing/head/goldendeep/chainjewelry + name = "chain jewelry" + desc = "Jingling and dancing with movement. This chain is of metals or jewels that flaunt the wealth of the wearer. Or some facsimile of it." + icon_state = "chain_jewelry" + item_state = "chain_jewelry" + icon = 'icons/clothing/head/chain_jewelry.dmi' + slot_flags = SLOT_EARS | SLOT_HEAD | SLOT_MASK + +/obj/item/clothing/head/goldendeep/chainjewelry/baseline + icon_state = "chain_jewelry_baseline" + item_state = "chain_jewelry_baseline" + +//accessories + +/obj/item/clothing/accessory/storage/goldendeep + name = "thesian webbing" + desc = "For the hard working Thesian of the Golden Deep. Able to carry tools and withstand the rigors of work within the collective." + icon_state = "thesian_webbing" + item_state = "thesian_webbing" + icon = 'icons/clothing/accessories/thesian_webbing.dmi' + contained_sprite = TRUE + has_accents = TRUE + +//backpack + +/obj/item/storage/backpack/goldendeep + name = "sacred icon" + desc = "A floating and imposing symbol with very discrete anti gravity emitters capable of rendering viewers blinded by its majesty, paralyzed, or dumbstruck." + icon = 'icons/clothing/backpacks/sacred_icon.dmi' + icon_state = "sacred_icon" + item_state = "sacred_icon" + contained_sprite = TRUE + +/obj/item/storage/backpack/goldendeep/baseline + icon_state = "sacred_icon_baseline" + item_state = "sacred_icon_baseline" diff --git a/html/changelogs/noblerow-goldendeep.yml b/html/changelogs/noblerow-goldendeep.yml new file mode 100644 index 00000000000..47f0020054a --- /dev/null +++ b/html/changelogs/noblerow-goldendeep.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, Stryker + +# 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: "Adds 19 new assorted Golden Deep clothing items to the Xenowear - IPC tab. Spritework done by Noble Row." diff --git a/icons/clothing/accessories/thesian_webbing.dmi b/icons/clothing/accessories/thesian_webbing.dmi new file mode 100644 index 00000000000..ad34619e5af Binary files /dev/null and b/icons/clothing/accessories/thesian_webbing.dmi differ diff --git a/icons/clothing/backpacks/sacred_icon.dmi b/icons/clothing/backpacks/sacred_icon.dmi new file mode 100644 index 00000000000..7cfb0c8ae20 Binary files /dev/null and b/icons/clothing/backpacks/sacred_icon.dmi differ diff --git a/icons/clothing/head/chain_jewelry.dmi b/icons/clothing/head/chain_jewelry.dmi new file mode 100644 index 00000000000..a7bd94dd0a5 Binary files /dev/null and b/icons/clothing/head/chain_jewelry.dmi differ diff --git a/icons/clothing/head/cowl.dmi b/icons/clothing/head/cowl.dmi new file mode 100644 index 00000000000..ec359ba639f Binary files /dev/null and b/icons/clothing/head/cowl.dmi differ diff --git a/icons/clothing/head/cube_hood.dmi b/icons/clothing/head/cube_hood.dmi new file mode 100644 index 00000000000..b7580823ea9 Binary files /dev/null and b/icons/clothing/head/cube_hood.dmi differ diff --git a/icons/clothing/head/furred_crown.dmi b/icons/clothing/head/furred_crown.dmi new file mode 100644 index 00000000000..989656393c2 Binary files /dev/null and b/icons/clothing/head/furred_crown.dmi differ diff --git a/icons/clothing/suits/capes/desert_adornment.dmi b/icons/clothing/suits/capes/desert_adornment.dmi new file mode 100644 index 00000000000..e30c1f0661b Binary files /dev/null and b/icons/clothing/suits/capes/desert_adornment.dmi differ diff --git a/icons/clothing/suits/capes/elegant_cloak.dmi b/icons/clothing/suits/capes/elegant_cloak.dmi new file mode 100644 index 00000000000..99d885e01d0 Binary files /dev/null and b/icons/clothing/suits/capes/elegant_cloak.dmi differ diff --git a/icons/clothing/suits/capes/flowing_cloak.dmi b/icons/clothing/suits/capes/flowing_cloak.dmi new file mode 100644 index 00000000000..71f4b896852 Binary files /dev/null and b/icons/clothing/suits/capes/flowing_cloak.dmi differ diff --git a/icons/clothing/suits/capes/fur_wrap.dmi b/icons/clothing/suits/capes/fur_wrap.dmi new file mode 100644 index 00000000000..92b7e052ad1 Binary files /dev/null and b/icons/clothing/suits/capes/fur_wrap.dmi differ diff --git a/icons/clothing/suits/capes/golden_cape.dmi b/icons/clothing/suits/capes/golden_cape.dmi new file mode 100644 index 00000000000..7f71b43c9f4 Binary files /dev/null and b/icons/clothing/suits/capes/golden_cape.dmi differ diff --git a/icons/clothing/suits/coats/eccentric_coat.dmi b/icons/clothing/suits/coats/eccentric_coat.dmi new file mode 100644 index 00000000000..dc66dd619b7 Binary files /dev/null and b/icons/clothing/suits/coats/eccentric_coat.dmi differ diff --git a/icons/clothing/under/shirts/armored_pullover.dmi b/icons/clothing/under/shirts/armored_pullover.dmi new file mode 100644 index 00000000000..cb8fc7725b5 Binary files /dev/null and b/icons/clothing/under/shirts/armored_pullover.dmi differ diff --git a/icons/clothing/under/shirts/cloth_wrapped_uniform.dmi b/icons/clothing/under/shirts/cloth_wrapped_uniform.dmi new file mode 100644 index 00000000000..8d97142b430 Binary files /dev/null and b/icons/clothing/under/shirts/cloth_wrapped_uniform.dmi differ diff --git a/icons/clothing/under/shirts/fine_shirt.dmi b/icons/clothing/under/shirts/fine_shirt.dmi new file mode 100644 index 00000000000..d30addb6ea7 Binary files /dev/null and b/icons/clothing/under/shirts/fine_shirt.dmi differ diff --git a/icons/clothing/under/shirts/pactolus_raingarb.dmi b/icons/clothing/under/shirts/pactolus_raingarb.dmi new file mode 100644 index 00000000000..09472d96667 Binary files /dev/null and b/icons/clothing/under/shirts/pactolus_raingarb.dmi differ diff --git a/icons/clothing/under/shirts/pompous_shirt.dmi b/icons/clothing/under/shirts/pompous_shirt.dmi new file mode 100644 index 00000000000..f6bdd357700 Binary files /dev/null and b/icons/clothing/under/shirts/pompous_shirt.dmi differ diff --git a/icons/clothing/under/shirts/quilted_gambeson.dmi b/icons/clothing/under/shirts/quilted_gambeson.dmi new file mode 100644 index 00000000000..0d8ad0d322d Binary files /dev/null and b/icons/clothing/under/shirts/quilted_gambeson.dmi differ diff --git a/icons/clothing/under/shirts/valiant_tabbard.dmi b/icons/clothing/under/shirts/valiant_tabbard.dmi new file mode 100644 index 00000000000..af9706cbd7b Binary files /dev/null and b/icons/clothing/under/shirts/valiant_tabbard.dmi differ