diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 2a1d6f2f847..a8099815283 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -100,6 +100,14 @@ /obj/item/clothing/suit/storage/toggle/hoodie/smw = 1, /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 1, //SKYRAT EDIT: ADDITION: END - HOODIES + //SKYRAT EDIT: ADDITION: START - Coats/Hawaiian + /obj/item/clothing/suit/urban/polychromic = 3, + /obj/item/clothing/suit/toggle/jacket/cardigan = 2, + /obj/item/clothing/suit/hawaiian_blue = 1, + /obj/item/clothing/suit/hawaiian_orange = 1, + /obj/item/clothing/suit/hawaiian_purple = 1, + /obj/item/clothing/suit/hawaiian_green = 1, + //SKYRAT EDIT: ADDITION: END - Coats/Hawaiian /obj/item/clothing/glasses/regular = 2, /obj/item/clothing/glasses/regular/jamjar = 1, /obj/item/clothing/glasses/orange = 1, diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi index cdcd375a0f7..575b03f845e 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/underwear.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/underwear.dmi index b4be221456e..308997cd5b4 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/underwear.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/underwear.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi index 9b066d348f9..782226203fc 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/modules/customization/modules/client/loadout/suit.dm b/modular_skyrat/modules/customization/modules/client/loadout/suit.dm index 4fe38c22dd8..f778d6ba23f 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/suit.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/suit.dm @@ -112,6 +112,12 @@ extra_info = LOADOUT_INFO_THREE_COLORS cost = 3 +/datum/loadout_item/suit/coat/urban + name = "Urban Coat" + path = /obj/item/clothing/suit/urban/polychromic + extra_info = LOADOUT_INFO_THREE_COLORS + cost = 3 + //JACKETS /datum/loadout_item/suit/jacket subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS @@ -185,6 +191,11 @@ path = /obj/item/clothing/suit/flakjack cost = 2 +/datum/loadout_item/suit/jacket/cardigan + name = "Cardigan" + path = /obj/item/clothing/suit/toggle/jacket/cardigan + extra_info = LOADOUT_INFO_ONE_COLOR + //HOODIES /datum/loadout_item/suit/hoodie subcategory = LOADOUT_SUBCATEGORY_SUIT_HOODIES diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm index fd2e7595c02..69a3c203c48 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm @@ -163,3 +163,15 @@ desc = "conceal your face in shame with this nanotrasen brand hood" flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR mutant_variants = NONE + +/obj/item/clothing/suit/urban/polychromic + name = "urban coat" + desc = "A coat built for urban life." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + icon_state = "urbanjacket" + +/obj/item/clothing/suit/urban/polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("5D5", "EEA", "333")) + diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm index e6e9b3ca680..3e8fe4775f8 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm @@ -100,3 +100,14 @@ desc = "Warm and comfy, the inner fur seems to be removable, not this one though, someone's sewn it in and left the buttons!" icon_state = "modern_winter" +/obj/item/clothing/suit/toggle/jacket/cardigan + name = "cardigan" + desc = "It's like, half a jacket." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + icon_state = "cardigan" + mutant_variants = NONE + +/obj/item/clothing/suit/toggle/jacket/cardigan/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("FFF")) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index 82510020f7b..a555e662de7 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -223,6 +223,11 @@ name = "Thigh-high - Fishnet" icon_state = "fishnet" +/datum/sprite_accessory/socks/fishnet_thigh + name = "Pantyhose - Ripped" + icon_state = "pantyhose_ripped" + use_static = null + /datum/sprite_accessory/underwear icon = 'modular_skyrat/modules/customization/icons/mob/clothing/underwear.dmi' ///Whether the underwear uses a special sprite for digitigrade style (i.e. briefs, not panties). Adds a "_d" suffix to the icon state @@ -346,6 +351,16 @@ icon_state = "thong_babydoll" gender = FEMALE +/datum/sprite_accessory/underwear/chastbelt + name = "Chastity Belt" + icon_state = "chastbelt" + use_static = TRUE + +/datum/sprite_accessory/underwear/chastcage + name = "Chastity Cage" + icon_state = "chastcage" + use_static = null + /datum/sprite_accessory/underwear/male_briefs has_digitigrade = TRUE @@ -537,3 +552,33 @@ icon_state = "tubetop" gender = FEMALE use_static = null + +/datum/sprite_accessory/undershirt/chastbra + name = "Chastity Bra" + icon_state = "chastbra" + gender = FEMALE + use_static = TRUE + +/datum/sprite_accessory/undershirt/pasties + name = "Pasties" + icon_state = "pasties" + gender = FEMALE + use_static = null + +/datum/sprite_accessory/undershirt/pasties_alt + name = "Pasties - Alt" + icon_state = "pasties_alt" + gender = FEMALE + use_static = null + +/datum/sprite_accessory/undershirt/shibari + name = "Shibari" + icon_state = "shibari" + gender = FEMALE + use_static = null + +/datum/sprite_accessory/undershirt/shibari_sleeves + name = "Shibari Sleeves" + icon_state = "shibari_sleeves" + gender = FEMALE + use_static = null