diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 1d071557..45a49125 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -963,4 +963,12 @@ icon_state = "enzojacket" item_state = "enzojacket" body_parts_covered = CHEST|ARMS -//End \ No newline at end of file +//End + +//Might get moved later since I have no clue where to put this stuff for now - Luke_vale +/obj/item/clothing/suit/toggle/labcoat/formallab + name = "winter labcoat" + desc = "A stark white labcoat, thicker and kitted out with extra fluff to keep you warm even on the coldest of mad sceinctist nights." + icon_state = "labcoat_formal" + item_state = "labcoat_formal" + body_parts_covered = CHEST|ARMS diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index bfc59e55..b5ec7e12 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -123,7 +123,8 @@ /obj/item/clothing/head/cowboyhat/white = 3, /obj/item/clothing/head/cowboyhat/pink = 3, /obj/item/clothing/shoes/cowboyboots = 3, - /obj/item/clothing/shoes/cowboyboots/black = 3) + /obj/item/clothing/shoes/cowboyboots/black = 3, + /obj/item/clothing/under/polychromic/vsweater = 3) contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3, /obj/item/clothing/under/syndicate/tacticool/skirt = 3, /obj/item/clothing/mask/balaclava = 3, diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 68b090c9..41f42a43 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi index efefb543..cfe1617e 100644 Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 9ea46443..39d166fd 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 99474806..9777d33c 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -57,6 +57,7 @@ /obj/item/clothing/neck/stole/black = 2, /obj/item/clothing/under/polychromic/stripper = 3, /obj/item/clothing/under/polychromic/bikini = 3, + /obj/item/clothing/under/polychromic/onepeice = 3, /obj/item/clothing/under/polychromic/shortpants/pantsu = 3, /obj/item/clothing/under/polychromic/bulge = 3, /obj/item/clothing/suit/maidapron = 3, diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 062ed470..b43dd4c0 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -218,3 +218,8 @@ name = "Pharoah tunic" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/nemes + +/datum/gear/fluffcoat + name = "Winter labcoat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/toggle/labcoat/formallab \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index c6c93ff2..62a40d39 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -458,6 +458,12 @@ path = /obj/item/clothing/under/polychromic/bottomless cost = 2 +/datum/gear/polysweatervirgin + name = "Polychromic Virginkiller Sweater" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/vsweater + cost = 2 + /datum/gear/corset name = "Corset" category = SLOT_W_UNIFORM diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index 1a26629e..a5514898 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm @@ -209,4 +209,26 @@ primary_color = "#808080" //RGB in hexcode secondary_color = "#FFFFFF" hastertiary = FALSE - body_parts_covered= CHEST|GROIN \ No newline at end of file + body_parts_covered= CHEST|GROIN + +/obj/item/clothing/under/polychromic/vsweater + name = "virgin killer sweater" + desc = "A sweater designed to be as provocative as possible, with almost all of the back missing, bairly hiding anything from that angle. Warning: Doesn't actually kill virgins." + icon_state = "vkiller" + item_color = "vkiller" + item_state = "rainbow" + primary_color = "#E1D6C9" //RGB in hexcode + secondary_color = "#FFFFFF" + hastertiary = FALSE + body_parts_covered= CHEST|GROIN + +/obj/item/clothing/under/polychromic/onepeice + name = "polychromic swimsuit" + desc = "Perfect for summer, and those who want to have something with a bit more material." + icon_state = "onepeice" + item_color = "onepeice" + item_state = "rainbow" + primary_color = "#010052" //RGB in hexcode + secondary_color = "#eb7a7a" + tertiary_color = "#ffffff" + body_parts_covered = CHEST|GROIN \ No newline at end of file diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 5c4c534a..23018f84 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi index 42e122d9..274a4a77 100644 Binary files a/modular_citadel/icons/polyclothes/item/uniform.dmi and b/modular_citadel/icons/polyclothes/item/uniform.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi index b698c210..07d3b1aa 100644 Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and b/modular_citadel/icons/polyclothes/mob/uniform.dmi differ