diff --git a/aurorastation.dme b/aurorastation.dme index 47bf12fc465..87d7e68d511 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1372,6 +1372,7 @@ #include "code\modules\clothing\factions\elyra.dm" #include "code\modules\clothing\factions\europa.dm" #include "code\modules\clothing\factions\gadpathur.dm" +#include "code\modules\clothing\factions\goldendeep.dm" #include "code\modules\clothing\factions\himeo.dm" #include "code\modules\clothing\factions\konyang.dm" #include "code\modules\clothing\factions\vysoka.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 563252724fc..3bb5bd4ac8d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -46,6 +46,7 @@ armbands["hydroponics armband"] = /obj/item/clothing/accessory/armband/hydro armbands["science armband"] = /obj/item/clothing/accessory/armband/science armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac + armbands["tau ceti armband"] = /obj/item/clothing/accessory/armband/tauceti gear_tweaks += new/datum/gear_tweak/path(armbands) /datum/gear/accessory/armband_coloured diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index ab8a1ad85f6..225ff3e9485 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -79,6 +79,11 @@ l_hoodie["sleeveless hoodie"] = /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/sleeveless gear_tweaks += new/datum/gear_tweak/path(l_hoodie) +/datum/gear/suit/mars + display_name = "martian hoodie" + description = "An orange hoodie, typically worn in solidarity with Mars' recent misfortunes." + path = /obj/item/clothing/suit/storage/hooded/wintercoat/mars + /datum/gear/suit/labcoat display_name = "labcoat" path = /obj/item/clothing/suit/storage/toggle/labcoat diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm index 78570b1fb7c..1d585d60d72 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm @@ -120,3 +120,20 @@ idris["Black Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/black idris["Brown Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/brown gear_tweaks += new/datum/gear_tweak/path(idris) + +/datum/gear/uniform/goldendeep + display_name = "golden deep outfit selection" + description = "A selection of formal outfits worn by members of the Golden Deep." + path = /obj/item/clothing/under/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" + +/datum/gear/uniform/goldendeep/New() + ..() + var/goldendeep = list() + goldendeep["golden deep dress"] = /obj/item/clothing/under/goldendeep + goldendeep["golden deep wrap"] = /obj/item/clothing/under/goldendeep/wrap + goldendeep["golden deep vest"] = /obj/item/clothing/under/goldendeep/vest + goldendeep["golden deep suit"] = /obj/item/clothing/under/goldendeep/suit + goldendeep["golden deep skirtsuit"] = /obj/item/clothing/under/goldendeep/skirtsuit + gear_tweaks += new/datum/gear_tweak/path(goldendeep) diff --git a/code/modules/clothing/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm new file mode 100644 index 00000000000..ab95fe9479d --- /dev/null +++ b/code/modules/clothing/factions/goldendeep.dm @@ -0,0 +1,57 @@ +/obj/item/clothing/under/goldendeep + name = "golden deep dress" + desc = "A simple dress with a flowing skirt made from electroplated thermoplastic accented by cobalts, used by representatives of the Golden Deep. Despite this garment's aesthetic similarities to \ + metallic gold, it is as flexible as silk and surprisingly light!" + desc_fluff = "The Lux-I Golden Dress was popularised 8 years ago by Lux-Igmatic, one of the first official Golden Deep positronic citizens. Owing to its success outside of the GD fashion scene, it quickly caught on \ + due to the appeal among other civilisations of the Orion Spur. Lux-Igmatic made a considerable fortune before the methods to create the gold-laced fabric design were leaked to competitors. Gold-lace and \ + gold-appearance clothing is now popular within many Golden Deep brands, but this was the first, and still carries considerable prestige (and a price tag to match)." + icon_state = "goldendeep_dress" + item_state = "goldendeep_dress" + icon = 'icons/clothing/under/uniforms/goldendeep_dress.dmi' + contained_sprite = TRUE + +/obj/item/clothing/under/goldendeep/wrap + name = "golden deep wraps" + desc = "A simple dress with a flowing skirt made from electroplated thermoplastic, used by representatives of the Golden Deep. Despite this garment's aesthetic similarities to metallic gold, it is as flexible as silk, breathable and designed to flow in the wind." + desc_fluff = "The casual blending of modern metallurgical methods and traditional Golden Deep fashion gives the golden wraps a strong appeal. Back when IPCs were a new concept and the designs weren't as refined as they are today, wraps were a popular clothing \ + choice due to their low surface area - thereby not blocking airflow to keep the chassis cool. Nowadays, of course, cooling through clothes is hardly a problem at all, but there remains some fondness for the garments once worn by their poorer \ + (and more poorly-designed) predecessors." + icon_state = "goldendeep_wrap" + item_state = "goldendeep_wrap" + icon = 'icons/clothing/under/uniforms/goldendeep_wrap.dmi' + contained_sprite = TRUE + +/obj/item/clothing/under/goldendeep/vest + name = "golden deep vest" + desc = "A vest made from a from electroplated thermoplastic accompanied by a gem-encrusted skirt, used by representatives of the Golden Deep. Despite this garment's aesthetic similarities to metallic gold, it is as flexible as silk and surprisingly light!" + desc_fluff = "With the increasing popularity of gold-effect clothing within Golden Deep society, it was only a matter of time before casual clothing lines got in on the action. Following the leak of Lux-Igmatic's methods, other corporations jumped at the \ + opportunity, and soon enough it was impossible to pass a clothing store without seeing these vests on display. Using an innovative process to reduce the amount of metal being woven into these garments, the cost has been kept relatively low. The pricetag \ + may still be far out of the reach of the masses, but it barely approaches a fraction of the cost of a golden two piece, and is certainly far, far cheaper than the dresses made by Lux-Igmatic themself." + icon_state = "goldendeep_vest" + item_state = "goldendeep_vest" + icon = 'icons/clothing/under/uniforms/goldendeep_vest.dmi' + slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING + contained_sprite = TRUE + +/obj/item/clothing/under/goldendeep/suit + name = "golden deep suit" + desc = "A two piece suit made from a flexible electroplated thermoplastic and a tasteful synthetic silk tie. It is commonly worn by members of the Golden Deep looking to fit in with human culture." + desc_fluff = "Two piece suits and skirtsuits have always been a mainstay of Golden Deep culture; representing a certain amount of gravitas inherent with the business-formal aesthetic that they embody. \ + It wasn't until 2458, however, that the golden suits were seen in greater numbers among Golden Deep citizens. Until then, it had been trendy to stick with flowing, breathable clothing options among other citizens. \ + Trading with external societies has become more competitive, and as such old rivalries among GD citizens and traders have been rekindled - necessitating the need to 'keep up appearances' even within exclusively \ + Golden Deep social circles." + icon_state = "goldendeep_suit" + item_state = "goldendeep_suit" + icon = 'icons/clothing/under/uniforms/goldendeep_suit.dmi' + contained_sprite = TRUE + +/obj/item/clothing/under/goldendeep/skirtsuit + name = "golden deep skirtsuit" + desc = "A flowing skirtsuit made from a flexible electroplated thermoplastic and a tasteful synthetic silk tie. It is commonly worn by members of the Golden Deep looking to fit in with human culture." + desc_fluff = "Two piece suits and skirtsuits have always been a mainstay of Golden Deep culture; representing a certain amount of gravitas inherent with the business-formal aesthetic that they embody. It wasn't until 2458, however, that the golden suits \ + were seen in greater numbers among Golden Deep citizens. Until then, it had been trendy to stick with flowing, breathable clothing options among other citizens. Trading with external societies has become more competitive, and as such old rivalries among \ + GD citizens and traders have been rekindled - necessitating the need to 'keep up appearances' even within exclusively Golden Deep social circles." + icon_state = "goldendeep_skirtsuit" + item_state = "goldendeep_skirtsuit" + icon = 'icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi' + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 21cea31dcd9..da6b5f8fe4c 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -228,3 +228,13 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/sleeveless icon_state = "hoodie_sleeveless" item_state = "hoodie_sleeveless" + +/obj/item/clothing/suit/storage/hooded/wintercoat/mars + name = "martian hoodie" + desc = "An orange hoodie jacket featuring the face of Warrant Officer August 'Gus' Maldarth, typically worn as a symbol of both solidarity with Mars, and a sign of protest against the Sol Alliance government. \ + Strangely, Maldarth seems to be mispelled as 'Maldrath' on this garment. Additionally, #GusticeForGus can be seen written on the back. It seems to have typeface issues." + desc_fluff = "In November 2462, the planet of Mars was devastated by a phoron explosion widely believed to be\ + caused by experiments the Solarian government was conducting on the planet. As a result, an earlier whistleblower,\ + Gus Maldarth was regarded as a martyr after being silenced by operatives allegedly working on the behalf of Sol." + icon_state = "hoodie_mars" + item_state = "hoodie_mars" diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 8264dacde3e..de2e2240b69 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -71,4 +71,11 @@ /obj/item/clothing/accessory/armband/colourable name = "armband" desc = "An armband in 16,777,216 designer colors." - icon_state = "armband_colour" \ No newline at end of file + icon_state = "armband_colour" + +/obj/item/clothing/accessory/armband/tauceti + name = "tau ceti armband" + desc = "An armband tailored to look like the flag of the Republic of Biesel." + desc_fluff = "While initially adopted during the early days of the TCFL to account for a sudden increase in volunteers and a lack of uniforms, during the height of the Republic of Biesel's conflicts with the Sol Alliance,\ + it has been worn as a symbol of independence and patriotism." + icon_state = "tauceti" \ No newline at end of file diff --git a/html/changelogs/stryker-loadout.yml b/html/changelogs/stryker-loadout.yml new file mode 100644 index 00000000000..ad7f469f397 --- /dev/null +++ b/html/changelogs/stryker-loadout.yml @@ -0,0 +1,6 @@ +author: Stryker, Kyres, NiennaB +changes: + - rscadd: "Adds a Martian hoodie to the loadout under suits and accessories." + - rscadd: "Adds a Tau Ceti armband to the armband selection." + - rscadd: "Adds a Golden Deep dress, wrap, and vest done by Kyres as well as suit and skirtsuit by NiennaB to Xenowear - IPC. (FTs by IPC team.)" + - tweak: "Changes Golden Deep arm and headchain accessories to match the color palette of the clothes." \ No newline at end of file diff --git a/icons/clothing/under/uniforms/goldendeep_dress.dmi b/icons/clothing/under/uniforms/goldendeep_dress.dmi new file mode 100644 index 00000000000..0b7e596c2ca Binary files /dev/null and b/icons/clothing/under/uniforms/goldendeep_dress.dmi differ diff --git a/icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi b/icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi new file mode 100644 index 00000000000..d1f5b770a6e Binary files /dev/null and b/icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi differ diff --git a/icons/clothing/under/uniforms/goldendeep_suit.dmi b/icons/clothing/under/uniforms/goldendeep_suit.dmi new file mode 100644 index 00000000000..b8a49a0c5a3 Binary files /dev/null and b/icons/clothing/under/uniforms/goldendeep_suit.dmi differ diff --git a/icons/clothing/under/uniforms/goldendeep_vest.dmi b/icons/clothing/under/uniforms/goldendeep_vest.dmi new file mode 100644 index 00000000000..5cbc72e55c9 Binary files /dev/null and b/icons/clothing/under/uniforms/goldendeep_vest.dmi differ diff --git a/icons/clothing/under/uniforms/goldendeep_wrap.dmi b/icons/clothing/under/uniforms/goldendeep_wrap.dmi new file mode 100644 index 00000000000..a9cf9ae3c20 Binary files /dev/null and b/icons/clothing/under/uniforms/goldendeep_wrap.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index d598de62a84..cc1ed620de8 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index a801684bcb0..5b767063e32 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 492a1d34e53..41f6377fd4b 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 6b02c5cd7f8..2ac052926c4 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 79b7e6aad0c..597efcfbea5 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index f7c61db30b9..371bdf1a3ff 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/hoodies.dmi b/icons/obj/hoodies.dmi index 466c8063a9e..c4cb7dce390 100644 Binary files a/icons/obj/hoodies.dmi and b/icons/obj/hoodies.dmi differ