diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 8353514fb37..58315d2f2a2 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -142,5 +142,17 @@ display_name = "simple necklace" path = /obj/item/clothing/accessory/necklace +/datum/gear/accessory/corset + display_name = "corset, black" + path = /obj/item/clothing/accessory/corset + +/datum/gear/accessory/corsetred + display_name = "corset, red" + path = /obj/item/clothing/accessory/corset/red + +/datum/gear/accessory/corsetblue + display_name = "corset, blue" + path = /obj/item/clothing/accessory/corset/blue + diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 27fcc415956..ae43a10ee89 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -145,18 +145,6 @@ display_name = "hoodie, black" path = /obj/item/clothing/suit/hooded/hoodie -/datum/gear/suit/corset - display_name = "corset, black" - path = /obj/item/clothing/suit/corset - -/datum/gear/suit/corsetred - display_name = "corset, red" - path = /obj/item/clothing/suit/corset/red - -/datum/gear/suit/corsetblue - display_name = "corset, blue" - path = /obj/item/clothing/suit/corset/blue - //SUITS! /datum/gear/suit/blacksuit diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 04558e30f4a..0f557b6d9aa 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -247,9 +247,9 @@ /obj/item/clothing/shoes/footwraps name = "cloth footwraps" - desc = "A roll of treated canvas used for wrapping claws or paws" + desc = "A roll of treated canvas used for wrapping claws or paws." icon_state = "clothwrap" item_state = "clothwrap" force = 0 - silence_steps = 1 + silence_steps = TRUE w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 067dd10030c..a5340ed91bc 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -966,22 +966,3 @@ 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/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 1b9003fe880..65a47cc8338 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -550,11 +550,35 @@ icon_state = "cowboyshirt_reds" item_state = "cowboyshirt_reds" item_color = "cowboyshirt_reds" - species_fit = list("Vox") + species_fit = list("Vox", "Drask", "Grey") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/species/vox/suit.dmi', + "Drask" = 'icons/mob/species/drask/suit.dmi', + "Grey" = 'icons/mob/species/grey/suit.dmi' ) +/obj/item/clothing/accessory/corset + name = "black corset" + desc = "A black corset for those fancy nights out." + icon_state = "corset" + item_state = "corset" + item_color = "corset" + + +/obj/item/clothing/accessory/corset/red + name = "red corset" + desc = "A red corset those fancy nights out." + icon_state = "corset_red" + item_state = "corset_red" + item_color = "corset_red" + +/obj/item/clothing/accessory/corset/blue + name = "blue corset" + desc = "A blue corset for those fancy nights out." + icon_state = "corset_blue" + item_state = "corset_blue" + item_color = "corset_blue" + /obj/item/clothing/accessory/petcollar name = "pet collar" desc = "The latest fashion accessory for your favorite pets!" diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index b0941a22215..89e3eb94136 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index a482ece8b38..295293ad9de 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 95a6f6b5c83..92b77524bc4 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index ac64e6facf7..4f665031047 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ