diff --git a/aurorastation.dme b/aurorastation.dme index 724d001d7f6..b3a4c4fe2eb 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1505,6 +1505,7 @@ #include "code\modules\clothing\factions\goldendeep.dm" #include "code\modules\clothing\factions\himeo.dm" #include "code\modules\clothing\factions\idris.dm" +#include "code\modules\clothing\factions\jargon.dm" #include "code\modules\clothing\factions\konyang.dm" #include "code\modules\clothing\factions\vysoka.dm" #include "code\modules\clothing\glasses\glasses.dm" 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 d21a661e277..555cb0573be 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -276,4 +276,40 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ workcloak["ix cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/ix workcloak["oqi cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/oqi workcloak["iqi cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/iqi - gear_tweaks += new /datum/gear_tweak/path(workcloak) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/path(workcloak) + +/datum/gear/accessory/skrell/tees + display_name = "skrellian wetshirts" + path = /obj/item/clothing/accessory/tshirt/skrell + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/skrell/tees/New() + ..() + var/list/tees = list() + tees["ocean wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/ocean + tees["maelstrom wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/maelstrom + tees["reef wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/reef + tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula + tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/purple + tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/teal + tees["black eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/black + tees["white eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/white + tees["jargon eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/jargon + gear_tweaks += new /datum/gear_tweak/path(tees) + +/datum/gear/accessory/skrell/dress + display_name = "skrellian formal wetshirts" + path = /obj/item/clothing/accessory/dressshirt/skrell + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/skrell/dress/New() + ..() + var/list/dress = list() + dress["ocean formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/ocean + 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) diff --git a/code/modules/clothing/factions/jargon.dm b/code/modules/clothing/factions/jargon.dm new file mode 100644 index 00000000000..ffc527141d2 --- /dev/null +++ b/code/modules/clothing/factions/jargon.dm @@ -0,0 +1,80 @@ +/obj/item/clothing/accessory/dressshirt/skrell + desc = "A formal wetshirt in Skrell style." + icon = 'icons/clothing/under/shirts/skrell_casual.dmi' + +/obj/item/clothing/accessory/dressshirt/skrell/ocean + name = "ocean formal wetshirt" + desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "ocean_dressshirt" + item_state = "ocean_dressshirt" + +/obj/item/clothing/accessory/dressshirt/skrell/maelstrom + name = "maelstrom formal wetshirt" + desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "maelstrom_dressshirt" + item_state = "maelstrom_dressshirt" + +/obj/item/clothing/accessory/dressshirt/skrell/reef + name = "reef formal wetshirt" + desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Jargon Space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "reef_dressshirt" + item_state = "reef_dressshirt" + +/obj/item/clothing/accessory/tshirt/skrell + icon = 'icons/clothing/under/shirts/skrell_casual.dmi' + desc = "A wetshirt in Skrell style." + contained_sprite = TRUE + +/obj/item/clothing/accessory/tshirt/skrell/ocean + name = "ocean wetshirt" + desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "ocean_tee" + item_state = "ocean_tee" + +/obj/item/clothing/accessory/tshirt/skrell/maelstrom + name = "maelstrom wetshirt" + desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "maelstrom_tee" + item_state = "maelstrom_tee" + +/obj/item/clothing/accessory/tshirt/skrell/reef + name = "reef wetshirt" + desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Jargon Space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "reef_tee" + item_state = "reef_tee" + +/obj/item/clothing/accessory/tshirt/skrell/nebula + name = "pink eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "pink_skrell_hawaiian" + item_state = "pink_skrell_hawaiian" + +/obj/item/clothing/accessory/tshirt/skrell/nebula/purple + name = "purple eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "purple_skrell_hawaiian" + item_state = "purple_skrell_hawaiian" + +/obj/item/clothing/accessory/tshirt/skrell/nebula/teal + name = "teal eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "teal_skrell_hawaiian" + item_state = "teal_skrell_hawaiian" + +/obj/item/clothing/accessory/tshirt/skrell/nebula/black + name = "black eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "black_skrell_hawaiian" + item_state = "black_skrell_hawaiian" + +/obj/item/clothing/accessory/tshirt/skrell/nebula/white + name = "white eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "white_skrell_hawaiian" + item_state = "white_skrell_hawaiian" + +/obj/item/clothing/accessory/tshirt/skrell/nebula/jargon + name = "jargon eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "jargon_skrell_hawaiian" + item_state = "jargon_skrell_hawaiian" diff --git a/html/changelogs/mattatlas-skrelldrip.yml b/html/changelogs/mattatlas-skrelldrip.yml new file mode 100644 index 00000000000..02f040e1d89 --- /dev/null +++ b/html/changelogs/mattatlas-skrelldrip.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: MattAtlas + +# 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 casual t-shirts and dress shirts for Skrell under their loadout. Includes reef shirts and hawaiian shirts in Silversun style." diff --git a/icons/clothing/under/shirts/skrell_casual.dmi b/icons/clothing/under/shirts/skrell_casual.dmi new file mode 100644 index 00000000000..94d5abc63fa Binary files /dev/null and b/icons/clothing/under/shirts/skrell_casual.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 5454003e319..1628ff2bf73 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ