diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index fd6294dd..fe002159 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -51,8 +51,9 @@ /obj/item/reagent_containers/pill/penis_enlargement = 3, /obj/item/reagent_containers/pill/breast_enlargement = 3, /obj/item/clothing/gloves/latexsleeves = 3, - /obj/item/clothing/shoes/highheels = 3 - + /obj/item/clothing/shoes/highheels = 3, + /obj/item/clothing/under/polychromic/stripper = 3, + /obj/item/clothing/under/polychromic/bikini = 3 ) contraband = list(/obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, diff --git a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ba4fa378..552e5125 100644 --- a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -18,6 +18,18 @@ new /obj/item/clothing/under/polychromic/shorts(src) new /obj/item/clothing/under/polychromic/shorts(src) new /obj/item/clothing/under/polychromic/shorts(src) + new /obj/item/clothing/under/polychromic/shortpants/pantsu(src) + new /obj/item/clothing/under/polychromic/shortpants/pantsu(src) + new /obj/item/clothing/under/polychromic/shortpants/pantsu(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/stripper(src) + new /obj/item/clothing/under/polychromic/stripper(src) + new /obj/item/clothing/under/polychromic/stripper(src) + new /obj/item/clothing/under/polychromic/bottomless(src) + new /obj/item/clothing/under/polychromic/bottomless(src) + new /obj/item/clothing/under/polychromic/bottomless(src) new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/mask/bandana/blue(src) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 99098631..11fe7d69 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -360,10 +360,31 @@ name = "Pink stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_pink - cost = 3 /datum/gear/greenstripper name = "Green stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green - cost = 3 + +/datum/gear/polybikini + name = "Polychromic Bikini" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/bikini + cost = 2 + +/datum/gear/polystripper + name = "Polychromic Stripper Outfit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/stripper + cost = 2 + +/datum/gear/polypantsu + name = "Polychromic Panties" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/shortpants/pantsu + +/datum/gear/polybottomless + name = "Polychromic Bottomless Shirt" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/bottomless + cost = 2 \ No newline at end of file diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index c0f7a5d6..8a1d0767 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm @@ -165,4 +165,26 @@ primary_color = "#808080" //RGB in hexcode secondary_color = "#FFFFFF" tertiary_color = "#8CC6FF" + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/under/polychromic/bikini + name = "polychromic bikini" + desc = "Perfect for summer." + icon_state = "polybikini" + item_color = "polybikini" + item_state = "rainbow" + primary_color = "#808080" //RGB in hexcode + secondary_color = "#FFFFFF" + tertiary_color = "#8CC6FF" + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/under/polychromic/stripper + name = "polychromic stripper outfit" + desc = "Sexy with style." + icon_state = "polystripper" + item_color = "polystripper" + item_state = "rainbow" + primary_color = "#808080" //RGB in hexcode + secondary_color = "#FFFFFF" + tertiary_color = "#8CC6FF" body_parts_covered = CHEST|GROIN \ No newline at end of file diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi index 87c3479a..356cc12a 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 15b5262b..30c4d491 100644 Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and b/modular_citadel/icons/polyclothes/mob/uniform.dmi differ