diff --git a/modular_splurt/code/modules/client/loadout/shoes.dm b/modular_splurt/code/modules/client/loadout/shoes.dm index d10f823444..b75b1cd621 100644 --- a/modular_splurt/code/modules/client/loadout/shoes.dm +++ b/modular_splurt/code/modules/client/loadout/shoes.dm @@ -2,7 +2,7 @@ /datum/gear/shoes/footwraps name = "Cloth Footwraps" path= /obj/item/clothing/shoes/footwraps - + /datum/gear/shoes/invisiboots name = "Invisifiber Footwraps" path= /obj/item/clothing/shoes/invisiboots @@ -36,3 +36,7 @@ /datum/gear/shoes/puttee restricted_roles = list("Security Officer", "Warden", "Head of Security", "Brig Physician", "Blueshield") + +/datum/gear/shoes/highheel_sandals + name = "High-heel Sandals" + path = /obj/item/clothing/shoes/highheel_sandals diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index 29d91596d7..f30dde1839 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -146,3 +146,19 @@ path = /obj/item/clothing/under/goner/fake/poly loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC loadout_initial_colors = list("#E6E6E6") + +/datum/gear/uniform/leia_outfit + name = "Princess Leia Putfit" + path = /obj/item/clothing/under/misc/leia_outfit + +/datum/gear/uniform/leia_outfit/red + name = "Red Princess Leia Outfit" + path = /obj/item/clothing/under/misc/leia_outfit/red + +/datum/gear/uniform/leia_outfit/blue + name = "Blue Princess Leia Outfit" + path = /obj/item/clothing/under/misc/leia_outfit/blue + +/datum/gear/uniform/performer/polychromic + name = "Polychromic performers one piece" + path = /obj/item/clothing/under/performer/polychromic diff --git a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm index f5a8fac735..d87fd74ce7 100644 --- a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm @@ -84,3 +84,15 @@ build_path = /obj/item/clothing/shoes/jackboots/cbrn/mopp category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/obj/item/clothing/shoes/highheel_sandals + name = "high-heel sandals" + desc = "A pair of high-heel sandals" + icon = 'modular_splurt/icons/obj/clothing/shoes.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi' + anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi' + icon_state = "highheel_sandals" + +/obj/item/clothing/shoes/highheel_sandals/Initialize() + . = ..() + AddComponent(/datum/component/squeak, list('modular_splurt/sound/effects/footstep/highheel1.ogg' = 1,'modular_splurt/sound/effects/footstep/highheel2.ogg' = 1), 20) diff --git a/modular_splurt/code/modules/clothing/under/miscellaneous.dm b/modular_splurt/code/modules/clothing/under/miscellaneous.dm index 3f6b806260..e78b06bf55 100644 --- a/modular_splurt/code/modules/clothing/under/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/under/miscellaneous.dm @@ -311,3 +311,30 @@ /obj/item/clothing/under/misc/gear_harness body_parts_covered = NONE +/obj/item/clothing/under/misc/leia_outfit + name = "space princess outfit" + desc = "Chain for your Master's erotic asphyxiation not included." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "leia" + can_adjust = FALSE + +/obj/item/clothing/under/misc/leia_outfit/red + name = "red space princess outfit" + icon_state = "leia_red" + desc = "Now in sexy gold and red! Chain for your Master's erotic asphyxiation not included." + +/obj/item/clothing/under/misc/leia_outfit/blue + name = "blue space princess outfit" + icon_state = "leia_blue" + desc = "Now in sexy gold and blue! Chain for your Master's erotic asphyxiation not included." + +/obj/item/clothing/under/performer/polychromic + name = "polychromic performers one piece" + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "poly_performer" + +/obj/item/clothing/under/performer/polychromic/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#ffffff"), 1) diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm index d7d67e4011..a2d3023c87 100644 --- a/modular_splurt/code/modules/vending/clothesmate.dm +++ b/modular_splurt/code/modules/vending/clothesmate.dm @@ -16,7 +16,10 @@ /obj/item/clothing/under/officesexy = 3, /obj/item/clothing/suit/toggle/tunnelfox = 3, /obj/item/clothing/under/performer = 2, - /obj/item/clothing/under/bluedress = 3 + /obj/item/clothing/under/bluedress = 3, + /obj/item/clothing/under/misc/leia_outfit = 2, + /obj/item/clothing/under/misc/leia_outfit/red = 2, + /obj/item/clothing/under/misc/leia_outfit/blue = 2 ) var/list/extra_contraband = list( /obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3, diff --git a/modular_splurt/code/modules/vending/kinkmate.dm b/modular_splurt/code/modules/vending/kinkmate.dm index 1d2f3c5a94..53b6abb542 100644 --- a/modular_splurt/code/modules/vending/kinkmate.dm +++ b/modular_splurt/code/modules/vending/kinkmate.dm @@ -29,7 +29,8 @@ /obj/item/restraints/bondage_rope = 5, /obj/item/clothing/under/domina = 5, /obj/item/clothing/under/performer = 3, - /obj/item/clothing/shoes/invisiboots = 10 // Added here to go with the Gear Harness + /obj/item/clothing/shoes/invisiboots = 10, // Added here to go with the Gear Harness + /obj/item/clothing/shoes/highheel_sandals = 3 ) var/list/extra_contraband = list( //Lewd-Clothes diff --git a/modular_splurt/icons/mob/clothing/shoes.dmi b/modular_splurt/icons/mob/clothing/shoes.dmi index 0956dfbdd1..005bdc7b7d 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes.dmi and b/modular_splurt/icons/mob/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/mob/clothing/shoes_digi.dmi b/modular_splurt/icons/mob/clothing/shoes_digi.dmi index a37e1178f1..755d9c92e9 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes_digi.dmi and b/modular_splurt/icons/mob/clothing/shoes_digi.dmi differ diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi index 1555bade4d..3fe5d99405 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform.dmi and b/modular_splurt/icons/mob/clothing/uniform.dmi differ diff --git a/modular_splurt/icons/obj/clothing/shoes.dmi b/modular_splurt/icons/obj/clothing/shoes.dmi index 71b62b42bc..311174d23d 100644 Binary files a/modular_splurt/icons/obj/clothing/shoes.dmi and b/modular_splurt/icons/obj/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index 3880f77532..e9a7539a14 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ