diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index 0de678ce9cf..3724319a06a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -379,3 +379,45 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ dress["maelstrom formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/maelstrom dress["reef formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/reef gear_tweaks += new /datum/gear_tweak/path(dress) + +/datum/gear/uniform/skrell/wetsuit + display_name = "casual wetsuit" + path = /obj/item/clothing/under/skrell/wetsuit + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ADDITIONAL_COLOR_SELECTION + +/datum/gear/ears/skrell/tailband + display_name = "SCS tailband" + path = /obj/item/clothing/ears/skrell/tailband + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + cost = 0 + +/datum/gear/ears/skrell/tailband/New() + ..() + var/list/tailband = list() + tailband["Ox Tailband"] = /obj/item/clothing/ears/skrell/tailband/ + tailband["Ix Tailband"] = /obj/item/clothing/ears/skrell/tailband/ix + tailband["Oqi Tailband"] = /obj/item/clothing/ears/skrell/tailband/oqi + tailband["Iqi Tailband"] = /obj/item/clothing/ears/skrell/tailband/iqi + gear_tweaks += new /datum/gear_tweak/path(tailband) + +/datum/gear/accessory/skrell/nationcapes + display_name = "nation capes" + path = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/skrell/nationcapes/New() + ..() + var/list/nationcapes = list() + nationcapes["Jargon Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes + nationcapes["Free Traverse Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/traverse + nationcapes["Sol Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/sol + nationcapes["Coalition Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/coc + nationcapes["Biesel Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/biesel + gear_tweaks += new /datum/gear_tweak/path(nationcapes) + diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index bd4a689e1c3..b37eb386ea2 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -219,3 +219,28 @@ name = "Long Worker's Cap" desc = "A simple clothing item used by Skrell to cover their headtails. It comes with a main sleeve for the middle headtail, with smaller sleeves for the outer headtails to help keep it in place. This one is longer to account for Skrell with longer headtails." item_state = "skrell_cap_long" + +/obj/item/clothing/ears/skrell/tailband + name = "ox tailband" + desc = "A band meant to be worn on a Skrell's main headtail. This one has the ox symbol on it." + icon = 'icons/obj/contained_items/skrell/tailband.dmi' + item_state = "ox" + icon_state = "tailband" + +/obj/item/clothing/ears/skrell/tailband/ix + name = "ix tailband" + desc = "A band meant to be worn on a Skrell's main headtail. This one has the ix symbol on it." + item_state = "ix" + icon_state = "tailband" + +/obj/item/clothing/ears/skrell/tailband/oqi + name = "oqi tailband" + desc = "A band meant to be worn on a Skrell's main headtail. This one has the oqi symbol on it." + item_state = "oqi" + icon_state = "tailband" + +/obj/item/clothing/ears/skrell/tailband/iqi + name = "iqi tailband" + desc = "A band meant to be worn on a Skrell's main headtail. This one has the iqi symbol on it." + item_state = "iqi" + icon_state = "tailband" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/xeno/skrell.dm b/code/modules/clothing/under/accessories/xeno/skrell.dm index 4f15ea67f76..068edee6e8d 100644 --- a/code/modules/clothing/under/accessories/xeno/skrell.dm +++ b/code/modules/clothing/under/accessories/xeno/skrell.dm @@ -55,4 +55,44 @@ name = "brown skrell poncho" icon_state = "skr_poncho_brn" item_state = "skr_poncho_brn" - overlay_state = "skr_poncho_brn" \ No newline at end of file + overlay_state = "skr_poncho_brn" + +//Capes +/obj/item/clothing/accessory/poncho/shouldercape/nationcapes + name = "\improper Jargon cape" + desc = "A cape that has the Jargon flag on the back." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Jargon Federation - specifically, the inner systems." + icon = 'icons/obj/contained_items/skrell/nationcapes.dmi' + icon_override = 'icons/obj/contained_items/skrell/nationcapes.dmi' + item_state = "jargcape" + icon_state = "jargcape" + flippable = TRUE + contained_sprite = TRUE + +/obj/item/clothing/accessory/poncho/shouldercape/nationcapes/traverse + name = "\improper Traverse cape" + desc = "A cape that has the Free Traverse flag on the back." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Jargon Federation - specifically, the Traverse. As the Free Traverse Flag is linked to the lyukal and general Traverse independence movements, it is not recommended to wear this flag openly in Federation space." + item_state = "travcape" + icon_state = "travcape" + +/obj/item/clothing/accessory/poncho/shouldercape/nationcapes/sol + name = "\improper Sol cape" + desc = "A cape that has the Solarian Alliance flag on the back." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Sol Alliance. Unlike similar capes, it is generally acceptable to Fed-aligned Skrell to wear this due to the Sol Alliance's relationship with the Federation." + item_state = "solcape" + icon_state = "solcape" + +/obj/item/clothing/accessory/poncho/shouldercape/nationcapes/coc + name = "\improper CoC cape" + desc = "A cape that has the Coalition of Colonies flag on the back." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Coalition of Colonies. Due to the poor relationship between the Coalition of Colonies and the Jargon Federation, Fed-aligned Skrell do not approve of this cape." + item_state = "coccape" + icon_state = "coccape" + +/obj/item/clothing/accessory/poncho/shouldercape/nationcapes/biesel + name = "\improper Biesel cape" + desc = "A cape that has the Republic of Biesel flag on the back." + desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Republic of Biesel. Due to the mix of both pro-Fed and anti-Fed Skrell in the Republic, this cape usually does not warrant strong emotions until the wearer's political leanings are known." + item_state = "biescape" + icon_state = "biescape" diff --git a/code/modules/clothing/under/xenos/skrell.dm b/code/modules/clothing/under/xenos/skrell.dm index 7f38972036c..076109859b1 100644 --- a/code/modules/clothing/under/xenos/skrell.dm +++ b/code/modules/clothing/under/xenos/skrell.dm @@ -312,6 +312,14 @@ item_state = "iqi_med_jacket" icon_state = "iqi_med_jacket" +/obj/item/clothing/under/skrell/wetsuit + name = "casual wetsuit" + desc = "A wetsuit intended as casualwear for Skrell. Can be worn on its own or under additional clothes." + icon = 'icons/obj/contained_items/skrell/wetsuit.dmi' + icon_state = "wetsuit" + item_state = "wetsuit" + var/additional_color = COLOR_GRAY + /obj/item/clothing/suit/storage/toggle/skrell/starcoat name = "star coat" desc = "A very fashionable coat, that traps moisture and provides good insulation. Starry patterns have been woven into its fabric." diff --git a/html/changelogs/moreskrellclothes.yml b/html/changelogs/moreskrellclothes.yml new file mode 100644 index 00000000000..bb584beb39b --- /dev/null +++ b/html/changelogs/moreskrellclothes.yml @@ -0,0 +1,13 @@ +# Your name. +author: WhatsUpBrotendo, Ryverstyx + +# 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: "Added a casual wetsuit, SCS tailbands, and nation-related capes to the Skrell loadout." diff --git a/icons/obj/contained_items/skrell/nationcapes.dmi b/icons/obj/contained_items/skrell/nationcapes.dmi new file mode 100644 index 00000000000..a860bed5514 Binary files /dev/null and b/icons/obj/contained_items/skrell/nationcapes.dmi differ diff --git a/icons/obj/contained_items/skrell/tailband.dmi b/icons/obj/contained_items/skrell/tailband.dmi new file mode 100644 index 00000000000..5191f3a6bff Binary files /dev/null and b/icons/obj/contained_items/skrell/tailband.dmi differ diff --git a/icons/obj/contained_items/skrell/wetsuit.dmi b/icons/obj/contained_items/skrell/wetsuit.dmi new file mode 100644 index 00000000000..7dcf5ae8dab Binary files /dev/null and b/icons/obj/contained_items/skrell/wetsuit.dmi differ