Merge pull request #4629 from Varoxus/bodysuit

Bodysuit underwear

code/modules/mob/dead/new_player/sprite_accessories/socks.dm

@@ -16,7 +16,6 @@
 	icon_state = "socks_knee"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/bee_knee
 	name = "Knee-high - Bee"
 	icon_state = "bee_knee"
@@ -54,24 +53,20 @@
 	icon_state = "striped_knee"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/thin_knee
 	name = "Knee-high - Thin"
 	icon_state = "thin_knee"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/uk_knee
 	name = "Knee-High - UK"
 	icon_state = "uk_knee"
 
-
 /datum/sprite_accessory/underwear/socks/socks_norm
 	name = "Normal"
 	icon_state = "socks_norm"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/bee_norm
 	name = "Normal - Bee"
 	icon_state = "bee_norm"
@@ -80,7 +75,6 @@
 	name = "Normal - Christmas"
 	icon_state = "christmas_norm"
 
-
 /datum/sprite_accessory/underwear/socks/candycaner_norm
 	name = "Normal - Red Candy Cane"
 	icon_state = "candycaner_norm"
@@ -89,7 +83,6 @@
 	name = "Normal - Green Candy Cane"
 	icon_state = "candycaneg_norm"
 
-
 /datum/sprite_accessory/underwear/socks/pantyhose
 	name = "Pantyhose"
 	icon_state = "pantyhose"
@@ -99,7 +92,6 @@
 	icon_state = "socks_short"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/stockings_blue
 	name = "Stockings - Blue"
 	icon_state = "stockings_blue"
@@ -120,12 +112,10 @@
 	name = "Stockings - Orange"
 	icon_state = "stockings_orange"
 
-
 /datum/sprite_accessory/underwear/socks/stockings_programmer
 	name = "Stockings - Programmer"
 	icon_state = "stockings_lpink"
 
-
 /datum/sprite_accessory/underwear/socks/stockings_purple
 	name = "Stockings - Purple"
 	icon_state = "stockings_purple"
@@ -134,13 +124,11 @@
 	name = "Stockings - Yellow"
 	icon_state = "stockings_yellow"
 
-
 /datum/sprite_accessory/underwear/socks/socks_thigh
 	name = "Thigh-high"
 	icon_state = "socks_thigh"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/bee_thigh
 	name = "Thigh-high - Bee"
 	icon_state = "bee_thigh"
@@ -153,18 +141,14 @@
 	name = "Thigh-high - Commie"
 	icon_state = "commie_thigh"
 
-
 /datum/sprite_accessory/underwear/socks/fishnet
 	name = "Thigh-high - Fishnet"
 	icon_state = "fishnet"
 
-
 /datum/sprite_accessory/underwear/socks/usa_thigh
 	name = "Thigh-high - Freedom"
 	icon_state = "assblastusa_thigh"
 
-
-
 /datum/sprite_accessory/underwear/socks/rainbow_thigh
 	name = "Thigh-high - Rainbow"
 	icon_state = "rainbow_thigh"
@@ -182,13 +166,11 @@
 	icon_state = "striped_thigh"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/thin_thigh
 	name = "Thigh-high - Thin"
 	icon_state = "thin_thigh"
 	has_color = TRUE
 
-
 /datum/sprite_accessory/underwear/socks/uk_thigh
 	name = "Thigh-high - UK"
 	icon_state = "uk_thigh"
@@ -250,3 +232,18 @@
 /datum/sprite_accessory/underwear/socks/tsthinredbow
 	name = "Thigh Socks - Pantyhose Redbow"
 	icon_state = "tsthinredbow"
+
+//new bodysuit - placed in the socks file as an alternative so that a person can still have a bra/panties on "underneath" the suit if they so wished.
+/datum/sprite_accessory/underwear/socks/bodysuit
+	name = "Bodysuit"
+	icon_state = "bodysuit"
+	has_color = TRUE
+	covers_groin = TRUE
+	covers_chest = TRUE
+	covers_belly = TRUE
+
+//"revealing" variant, doesn't cover any bodyparts. Meant to be used in combination with bras/panties specifically.
+/datum/sprite_accessory/underwear/socks/bodysuit_r
+	name = "Bodysuit(revealing)"
+	icon_state = "bodysuit"
+	has_color = TRUE

code/modules/mob/dead/new_player/sprite_accessories/underwear.dm

@@ -99,7 +99,6 @@
 	has_color = TRUE
 	gender = FEMALE
 
-
 /datum/sprite_accessory/underwear/bottom/female_beekini
 	name = "Panties - Bee-kini"
 	icon_state = "panties_bee-kini"
@@ -115,13 +114,11 @@
 	icon_state = "panties_cow"
 	gender = FEMALE
 
-
 /datum/sprite_accessory/underwear/bottom/fishnet_lower
 	name = "Panties - Fishnet"
 	icon_state = "fishnet_lower"
 	gender = FEMALE
 
-
 /datum/sprite_accessory/underwear/bottom/female_usastripe
 	name = "Panties - Freedom"
 	icon_state = "panties_assblastusa"
@@ -138,7 +135,6 @@
 	has_color = TRUE
 	gender = FEMALE
 
-
 /datum/sprite_accessory/underwear/bottom/panties_slim
 	name = "Panties - Slim"
 	icon_state = "panties_slim"
@@ -163,7 +159,6 @@
 	has_color = TRUE
 	gender = FEMALE
 
-
 /datum/sprite_accessory/underwear/bottom/panties_uk
 	name = "Panties - UK"
 	icon_state = "panties_uk"
@@ -187,7 +182,6 @@
 	gender = FEMALE
 	covers_chest = TRUE
 
-
 /datum/sprite_accessory/underwear/bottom/thong
 	name = "Thong"
 	icon_state = "thong"
@@ -226,4 +220,11 @@
 	has_color = TRUE
 	gender = FEMALE
 
-
+//new bodysuit - covers all bodyparts. There is a "revealing" variant in the socks file that is meant to be used in combination with both bras and panties.
+/datum/sprite_accessory/underwear/bottom/bodysuit
+	name = "Bodysuit"
+	icon_state = "bodysuit"
+	has_color = TRUE
+	covers_groin = TRUE
+	covers_chest = TRUE
+	covers_belly = TRUE