From 26676707493bbd41a086abe9d5af006232f0912e Mon Sep 17 00:00:00 2001
From: Stev-the-third <61610777+Stev-the-third@users.noreply.github.com>
Date: Thu, 26 Jun 2025 07:09:59 +1000
Subject: [PATCH] New Wetsuits for Skrell (#20870)

Art by spookywastaken in Discord/Spookypineapple in Byond. Approved and
requested by Skrell Lore.


![Export](https://github.com/user-attachments/assets/f19c2eed-0ef2-4c6c-bb44-1655fb540653)

---------

Co-authored-by: steviii <cormallenfield123@gmail.com>
---
 code/game/objects/random/loot.dm              |   2 +
 .../loadout/items/xeno/skrell.dm              |  25 +++++++-
 code/modules/clothing/under/xenos/skrell.dm   |  36 ++++++++++-
 html/changelogs/stev-the-third-wetsuits.yml   |  59 ++++++++++++++++++
 .../item/clothing/under/skrell/wetsuit.dmi    | Bin 656 -> 2942 bytes
 5 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/stev-the-third-wetsuits.yml

diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm
index 750b513b0a3..fe92ab761fe 100644
--- a/code/game/objects/random/loot.dm
+++ b/code/game/objects/random/loot.dm
@@ -54,6 +54,8 @@
 		/obj/item/clothing/under/overalls = 1,
 		/obj/item/clothing/under/syndicate/tacticool = 0.4,
 		/obj/item/clothing/under/syndicate/tracksuit = 0.2,
+		/obj/item/clothing/under/skrell/wetsuit/swimstars = 0.1, // WE LOVE SWIMSTARS!
+		/obj/item/clothing/under/skrell/wetsuit/swimstars/alt = 0.1,
 		/obj/item/device/firing_pin = 0.3,
 		/obj/item/device/firing_pin/clown = 0.01,
 		/obj/item/device/flashlight = 1,
diff --git a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm
index aba52c8b70d..27aeab6681d 100644
--- a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm
+++ b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm
@@ -410,12 +410,35 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell)
 	gear_tweaks += new /datum/gear_tweak/path(dress)
 
 /datum/gear/uniform/skrell/wetsuit
-	display_name = "casual wetsuit"
+	display_name = "casual wetsuits and swimsuits"
 	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_ACCENT_COLOR_SELECTION
 
+/datum/gear/uniform/skrell/wetsuit/New()
+	..()
+	var/list/wetsuit = list()
+	wetsuit["casual wetsuit"] = /obj/item/clothing/under/skrell/wetsuit
+	wetsuit["casual dark wetsuit"] = /obj/item/clothing/under/skrell/wetsuit/dark
+	wetsuit["casual swimsuit"] = /obj/item/clothing/under/skrell/wetsuit/swimsuit
+	wetsuit["casual swimsuit, alt"] = /obj/item/clothing/under/skrell/wetsuit/swimsuit/alt
+	gear_tweaks += new /datum/gear_tweak/path(wetsuit)
+
+/datum/gear/uniform/skrell/swimstars
+	display_name = "swimstars swimsuits"
+	path = /obj/item/clothing/under/skrell/wetsuit/swimstars
+	whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
+	sort_category = "Xenowear - Skrell"
+	flags = GEAR_NO_SELECTION
+
+/datum/gear/uniform/skrell/swimstars/New()
+	..()
+	var/list/swimstars = list()
+	swimstars["swimstars wetsuit"] = /obj/item/clothing/under/skrell/wetsuit/swimstars
+	swimstars["swimstars wetsuit, alt"] = /obj/item/clothing/under/skrell/wetsuit/swimstars/alt
+	gear_tweaks += new /datum/gear_tweak/path(swimstars)
+
 /datum/gear/ears/skrell/tailband
 	display_name = "SCI tailband"
 	path = /obj/item/clothing/ears/skrell/tailband
diff --git a/code/modules/clothing/under/xenos/skrell.dm b/code/modules/clothing/under/xenos/skrell.dm
index b196b070f81..5a17b1ba4eb 100644
--- a/code/modules/clothing/under/xenos/skrell.dm
+++ b/code/modules/clothing/under/xenos/skrell.dm
@@ -314,12 +314,46 @@
 
 /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."
+	desc = "A wetsuit made as standard apparel for skrell, and functions as underclothes for non-hydrophobic apparel. Acceptable to wear on its own, or as a base for other clothing worn atop it."
 	icon = 'icons/obj/item/clothing/under/skrell/wetsuit.dmi'
 	icon_state = "wetsuit"
 	item_state = "wetsuit"
 	has_accents = TRUE
 
+/obj/item/clothing/under/skrell/wetsuit/dark
+	name = "casual wetsuit"
+	desc = "A wetsuit made as standard apparel for skrell, and functions as underclothes for non-hydrophobic apparel. Acceptable to wear on its own, or as a base for other clothing worn atop it. This set is darker, for easier accessorizing."
+	icon_state = "wetsuit_dark"
+	item_state = "wetsuit_dark"
+	has_accents = TRUE
+
+/obj/item/clothing/under/skrell/wetsuit/swimsuit
+	name = "casual swimsuit"
+	desc = "A wetsuit made as standard apparel for skrell. This one is stylized after human swimwear, and is more popular among the younger generations. This swimsuit is Nioh'wan, or 'full-moon', and covers as much as the usual wetsuit would, without the pantlegs or sleeves."
+	desc_extended = "Adopting human swimwear styles, modern swimsuit-style wetsuits have levels of stylization and showiness referred to by the phases of the moon. Nioh'wan, or 'full moon', covers as much as a wetsuit would usually, but lacks pantlegs. Nioh'miki, or 'half moon', cuts down further to mimic the appearance of human one-piece swimsuit. Nioh'waji, or 'crescent moon', has portions of the swimsuit with the fabric removed to further stylize itself, while Nioh'riri, or 'new moon', is essentially a two-piece swimsuit."
+	icon_state = "swim"
+	item_state = "swim"
+	has_accents = TRUE
+
+/obj/item/clothing/under/skrell/wetsuit/swimsuit/alt
+	name = "casual swimsuit"
+	desc = "A wetsuit made as standard apparel for skrell. This one is stylized after human swimwear, and is more popular among the younger generations. These swimsuits have varying levels of stylization."
+	icon_state = "swim_alt"
+	item_state = "swim_alt"
+	has_accents = TRUE
+
+/obj/item/clothing/under/skrell/wetsuit/swimstars
+	name = "swimstars swimsuit"
+	desc = "A wetsuit made as standard apparel for skrell. This one is stylized after human swimwear, and is more popular among the younger generations. These swimsuits are stylized after the original styles of the skrell characters from the animated series Swimstars, which have since caught on with younger skrell to the point of being officially produced."
+	icon_state = "swimstars"
+	item_state = "swimstars"
+
+/obj/item/clothing/under/skrell/wetsuit/swimstars/alt
+	name = "swimstars swimsuit"
+	desc = "A wetsuit made as standard apparel for skrell. This one is stylized after human swimwear, and is more popular among the younger generations. These swimsuits are stylized after the original styles of the skrell characters from the animated series Swimstars, which have since caught on with younger skrell to the point of being officially produced."
+	icon_state = "swimstars_alt"
+	item_state = "swimstars_alt"
+
 /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/stev-the-third-wetsuits.yml b/html/changelogs/stev-the-third-wetsuits.yml
new file mode 100644
index 00000000000..4fd180ab3cc
--- /dev/null
+++ b/html/changelogs/stev-the-third-wetsuits.yml
@@ -0,0 +1,59 @@
+################################
+# 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: steviii
+
+# 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:
+  - imageadd: "Adds new wetsuits and swimsuits for Skrell."
+  - rscadd: "Adds swimstars swimsuits and adds them to the maint loot pool."
diff --git a/icons/obj/item/clothing/under/skrell/wetsuit.dmi b/icons/obj/item/clothing/under/skrell/wetsuit.dmi
index 1dd67b318e067a48d5585820acf34c25a5a5782c..21912d6999388c113dbaa2f339dca58557f56ca6 100644
GIT binary patch
literal 2942
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

literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq003YB003YF0{{R35VmRy0000FP)t-sz`($=
zva;&x>iGEh-QC@gL|vo+0004WQchC<K<3zH0001cdQ@0+L}hbha%pgMX>V=-0C=2J
zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5
zsXVo$xHPjwiHkEOv#1y-V#vjrR+N~V3SpzGi!aSXC^aFZG(Iso8JBWp1y?^8u#*9E
z7B-f@$ymJr00F2;L_t(oh3%IOZo?o9g-yZ%@^^p+I6wm&fB^SD(_Cp<ZCHsSP205P
ziAsIMA8rCM6yVbDk(itv&j6E~XFHq#X18ib0I`6i8O8W$#P50Y`~K`$+%S7Gz>>!$
z4-ANz03x{^+tWw2V|xwAd$(EePk-xI4Tk)t(Zsxxlu;R_!qX?`og*HEj%g)cB0vX}
z2zX$Cbrb*uZqy@iryl3cv3cl>qSvAKj`_)=*u;4@Ab?>BVZwV*6eve5GmbvyjR4Z4
z$aU$A<~Kc}Xh1SLGoW}%rGzzVqu%Gdy^MYY;8LKES>RG>0;eVNu<Q+ANxG2OQ&J(C
zm(iCl{V|DZH>rD==4}bo%Y8n0=`}AS$ywD(A)qK!$wnYRcf<P3fsWN7n6Y@bGn@vX
z1b_nK{qrID84w77-&tKkI&#493<>&EfW+;^p8+a~AQhhn6=ZX5ELI2VrPa;i``AHv
zN7QEyH}!aGm{#7CGY`qRok5m+USda!OP4PFsCuky?l|l_Rn>p!%MgCruj>CH5TR?=
q(n3}J{|^%QXO-=7U%kOxI?x-Vx;O1c5lJ=x0000<MNUMnLSTZ&Jt!9d