diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index ae43a10ee89..b2c93e97b13 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -145,6 +145,18 @@ display_name = "hoodie, black" path = /obj/item/clothing/suit/hooded/hoodie +/datum/gear/suit/corset + display_name = "black corset" + path = /obj/item/clothing/suit/corset + +/datum/gear/suit/corsetred + display_name = "red corset" + path = /obj/item/clothing/suit/corset/red + +/datum/gear/suit/corsetblue + display_name = "blue corset" + path = /obj/item/clothing/suit/corset/blue + //SUITS! /datum/gear/suit/blacksuit diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index be5c95375b8..f4a5c465aba 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -224,6 +224,3 @@ display_name = "pants, camo" path = /obj/item/clothing/under/pants/camo -/datum/gear/uniform/pants/corset - display_name = "black corset" - path = /obj/item/clothing/under/black_corset diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a5340ed91bc..067dd10030c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -966,3 +966,22 @@ name = "ladies red victorian coat" icon_state = "ladiesredvictoriancoat" item_state = "ladiesredvictoriancoat" + +/obj/item/clothing/suit/corset + name = "black corset" + desc = "A black corset for those fancy nights out." + icon_state = "corset" + item_state = "corset" + body_parts_covered = UPPER_TORSO + +/obj/item/clothing/suit/corset/red + name = "red corset" + desc = "A red corset those fancy nights out." + icon_state = "corset_red" + item_state = "corset_red" + +/obj/item/clothing/suit/corset/blue + name = "blue corset" + desc = "A blue corset for those fancy nights out." + icon_state = "corset_blue" + item_state = "corset_blue" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 871c02d550e..0b9e516a222 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -829,12 +829,4 @@ icon_state = "medicalgown" item_state = "medicalgown" item_color = "medicalgown" - body_parts_covered = UPPER_TORSO|LOWER_TORSO - -/obj/item/clothing/under/black_corset - name = "black corset" - desc = "A black corset and skirt for those fancy nights out." - icon_state = "black_corset" - item_state = "black_corset" - item_color = "black_corset" - flags_size = ONESIZEFITSALL \ No newline at end of file + body_parts_covered = UPPER_TORSO|LOWER_TORSO \ No newline at end of file diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 0cc4c2332e0..b4cb362e298 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index cb035153414..600c9aea661 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/species/drask/suit.dmi b/icons/mob/species/drask/suit.dmi index b323ea5c175..96ce0b8bb71 100644 Binary files a/icons/mob/species/drask/suit.dmi and b/icons/mob/species/drask/suit.dmi differ diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/species/drask/uniform.dmi index b75a49519be..951a2443fef 100644 Binary files a/icons/mob/species/drask/uniform.dmi and b/icons/mob/species/drask/uniform.dmi differ diff --git a/icons/mob/species/grey/suit.dmi b/icons/mob/species/grey/suit.dmi index 634acbfbffb..2766407b18b 100644 Binary files a/icons/mob/species/grey/suit.dmi and b/icons/mob/species/grey/suit.dmi differ diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi index 394ec2f7705..fdd6a52144c 100644 Binary files a/icons/mob/species/grey/uniform.dmi and b/icons/mob/species/grey/uniform.dmi differ diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi index 8c40cb79347..ca8289a3ccb 100644 Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi index a33a3c533d2..6d6ff4abca4 100644 Binary files a/icons/mob/species/vox/uniform.dmi and b/icons/mob/species/vox/uniform.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 89e3eb94136..b0941a22215 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 6046dc90bc5..02990685d64 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 92b77524bc4..95a6f6b5c83 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 702593f6cab..436d2fa3cea 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ