From af1aefca47af14259bb1a286f34aa340b7168392 Mon Sep 17 00:00:00 2001
From: MistakeNot4892 <AGMogett@gmail.com>
Date: Wed, 1 Sep 2021 12:17:13 +1000
Subject: [PATCH] Separates Swimsuit and Athletic Lockers, Adds Wetsuits

---
 .../crates_lockers/closets/fitness.dm         | 32 +++++++++++++++++++
 code/modules/clothing/shoes/miscellaneous.dm  |  2 +-
 code/modules/clothing/under/miscellaneous.dm  | 22 +++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index ca2f81e3073..9d01a4efbe7 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -3,6 +3,35 @@
 	desc = "It's a storage unit for athletic wear."
 	closet_appearance = /decl/closet_appearance/wardrobe/mixed
 
+	starts_with = list(
+		/obj/item/clothing/under/shorts/grey,
+		/obj/item/clothing/under/shorts/black,
+		/obj/item/clothing/under/shorts/red,
+		/obj/item/clothing/under/shorts/blue,
+		/obj/item/clothing/under/shorts/green,
+		/obj/item/clothing/under/shorts/white,
+		/obj/item/clothing/suit/storage/toggle/track,
+		/obj/item/clothing/suit/storage/toggle/track/blue,
+		/obj/item/clothing/suit/storage/toggle/track/green,
+		/obj/item/clothing/suit/storage/toggle/track/red,
+		/obj/item/clothing/suit/storage/toggle/track/white,
+		/obj/item/clothing/under/pants/track,
+		/obj/item/clothing/under/pants/track/blue,
+		/obj/item/clothing/under/pants/track/green,
+		/obj/item/clothing/under/pants/track/white,
+		/obj/item/clothing/under/pants/track/red,
+		/obj/item/clothing/shoes/athletic = 2,
+		/obj/item/clothing/shoes/hitops,
+		/obj/item/clothing/shoes/hitops/red,
+		/obj/item/clothing/shoes/hitops/black,
+		/obj/item/clothing/shoes/hitops/blue
+		)
+
+/obj/structure/closet/athletic_swimwear
+	name = "athletic wardrobe"
+	desc = "It's a storage unit for swimwear."
+	closet_appearance = /decl/closet_appearance/wardrobe/mixed
+
 	starts_with = list(
 		/obj/item/clothing/under/shorts/grey,
 		/obj/item/clothing/under/shorts/black,
@@ -17,6 +46,9 @@
 		/obj/item/clothing/under/swimsuit/striped,
 		/obj/item/clothing/under/swimsuit/white,
 		/obj/item/clothing/under/swimsuit/earth,
+		/obj/item/clothing/under/wetsuit,
+		/obj/item/clothing/under/wetsuit_rec,
+		/obj/item/clothing/under/wetsuit_skimpy,
 		/obj/item/clothing/mask/snorkel = 2,
 		/obj/item/clothing/shoes/swimmingfins = 2)
 
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 9cb77eaf2e5..52aabe2bb4f 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -166,7 +166,7 @@
 
 /obj/item/clothing/shoes/athletic
 	name = "athletic shoes"
-	desc = "A pair of sleek atheletic shoes. Made by and for the sporty types."
+	desc = "A pair of sleek athletic shoes. Made by and for the sporty types."
 	icon_state = "sportshoe"
 	addblends = "sportshoe_a"
 	item_state_slots = list(slot_r_hand_str = "sportheld", slot_l_hand_str = "sportheld")
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 37fd676a4c1..5c11a4dd8e6 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -967,11 +967,33 @@ Uniforms and such
 	desc = "No honest man would wear this abomination"
 	icon_state = "mankini"
 
+<<<<<<< HEAD
 /obj/item/clothing/under/swimsuit/cowbikini
 	name = "cow print bikini"
 	desc = "A rather skimpy cow patterned swimsuit."
 	icon_state = "swim_cow"
 
+=======
+/obj/item/clothing/under/wetsuit
+	name = "wetsuit"
+	desc = "For when you need to scuba dive your way into an enemy base."
+	icon_state = "wetsuit"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+
+/obj/item/clothing/under/wetsuit_skimpy
+	name = "tactical wetsuit"
+	desc = "For when you need to scuba dive your way into an enemy base but still want to show off a little skin."
+	icon_state = "wetsuit_skimpy"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/wetsuit_rec
+	name = "recreational wetsuit"
+	desc = "For when you need to kayak your way into an enemy base."
+	icon_state = "wetsuit_rec"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	cold_protection = UPPER_TORSO|LOWER_TORSO
+>>>>>>> d0a201e0c38... Merge pull request #8230 from Cerebulon/swimlock
 
 /*
  * pyjamas