diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm index b19a6f71..209b2dfc 100644 --- a/hyperstation/code/obj/kinkyclothes.dm +++ b/hyperstation/code/obj/kinkyclothes.dm @@ -1,6 +1,6 @@ /obj/item/clothing/gloves/latexsleeves - name = "Latex Sleeves" - desc = "A pair of shiny latex sleeves that covers one arms." + name = "latex sleeves" + desc = "A pair of shiny latex sleeves that covers ones arms." icon_state = "latex" item_state = "latex" icon = 'hyperstation/icons/obj/clothing/gloves.dmi' @@ -8,7 +8,7 @@ mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/head/dominatrixcap - name = "Dominatrix Cap" + name = "dominatrix cap" desc = "A sign of authority, over the body." icon_state = "dominatrix" item_state = "dominatrix" @@ -17,10 +17,8 @@ mutantrace_variation = NO_MUTANTRACE_VARIATION /obj/item/clothing/shoes/highheels - name = "High Heels" + name = "high heels" desc = "They make the wearer appear taller, and noisey!" icon_state = "highheels" item_state = "highheels" icon = 'hyperstation/icons/obj/clothing/shoes.dmi' - alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi' - mutantrace_variation = NO_MUTANTRACE_VARIATION \ No newline at end of file diff --git a/hyperstation/icons/mobs/feet.dmi b/hyperstation/icons/mobs/feet.dmi index 8642cb27..cf74d737 100644 Binary files a/hyperstation/icons/mobs/feet.dmi and b/hyperstation/icons/mobs/feet.dmi differ diff --git a/hyperstation/icons/mobs/feet_digi.dmi b/hyperstation/icons/mobs/feet_digi.dmi deleted file mode 100644 index 8642cb27..00000000 Binary files a/hyperstation/icons/mobs/feet_digi.dmi and /dev/null differ diff --git a/hyperstation/icons/mobs/gloves.dmi b/hyperstation/icons/mobs/gloves.dmi index ed8384df..39e9b9b2 100644 Binary files a/hyperstation/icons/mobs/gloves.dmi and b/hyperstation/icons/mobs/gloves.dmi differ diff --git a/hyperstation/icons/obj/clothing/gloves.dmi b/hyperstation/icons/obj/clothing/gloves.dmi index 491c6c7e..3f3f8f0a 100644 Binary files a/hyperstation/icons/obj/clothing/gloves.dmi and b/hyperstation/icons/obj/clothing/gloves.dmi differ diff --git a/hyperstation/icons/obj/clothing/shoes.dmi b/hyperstation/icons/obj/clothing/shoes.dmi index 4a5cb493..af087b73 100644 Binary files a/hyperstation/icons/obj/clothing/shoes.dmi and b/hyperstation/icons/obj/clothing/shoes.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 38c0132e..83d6dc45 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 9ccd2c8c..ab08c67b 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 3df9fe5f..03b829e4 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index c67dda83..a266ccbd 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -48,13 +48,16 @@ /obj/item/clothing/under/stripper_green = 5, /obj/item/dildo/custom = 5, /obj/item/reagent_containers/pill/penis_enlargement = 3, - /obj/item/reagent_containers/pill/breast_enlargement = 3 + /obj/item/reagent_containers/pill/breast_enlargement = 3, + /obj/item/clothing/gloves/latexsleeves = 3, + /obj/item/clothing/shoes/highheels = 3 ) contraband = list(/obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, /obj/item/clothing/under/mankini = 1, - /obj/item/dildo/flared/huge = 1 + /obj/item/dildo/flared/huge = 1, + /obj/item/clothing/head/dominatrixcap = 1 ) premium = list( /obj/item/electropack/shockcollar = 3, diff --git a/modular_citadel/icons/mob/digishoes.dmi b/modular_citadel/icons/mob/digishoes.dmi index 3d568863..819a9dbe 100644 Binary files a/modular_citadel/icons/mob/digishoes.dmi and b/modular_citadel/icons/mob/digishoes.dmi differ diff --git a/modular_citadel/icons/mob/mam_markings.dmi b/modular_citadel/icons/mob/mam_markings.dmi index 8327be6e..f2744f47 100644 Binary files a/modular_citadel/icons/mob/mam_markings.dmi and b/modular_citadel/icons/mob/mam_markings.dmi differ diff --git a/modular_citadel/icons/mob/mam_tails.dmi b/modular_citadel/icons/mob/mam_tails.dmi index 5e03cc86..b53fbf33 100644 Binary files a/modular_citadel/icons/mob/mam_tails.dmi and b/modular_citadel/icons/mob/mam_tails.dmi differ diff --git a/modular_citadel/icons/mob/markings_notmammals.dmi b/modular_citadel/icons/mob/markings_notmammals.dmi index 59b10e93..77c0012a 100644 Binary files a/modular_citadel/icons/mob/markings_notmammals.dmi and b/modular_citadel/icons/mob/markings_notmammals.dmi differ diff --git a/modular_citadel/icons/mob/mutant_bodyparts.dmi b/modular_citadel/icons/mob/mutant_bodyparts.dmi index 0b195e55..b4865e09 100644 Binary files a/modular_citadel/icons/mob/mutant_bodyparts.dmi and b/modular_citadel/icons/mob/mutant_bodyparts.dmi differ diff --git a/sound/effects/footstep/heels.ogg b/sound/effects/footstep/heels.ogg new file mode 100644 index 00000000..64006f00 Binary files /dev/null and b/sound/effects/footstep/heels.ogg differ diff --git a/tgstation.dme b/tgstation.dme index bc108b37..1344e502 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2884,6 +2884,7 @@ #include "hyperstation\code\modules\crafting\recipes.dm" #include "hyperstation\code\obj\decal.dm" #include "hyperstation\code\obj\fluff.dm" +#include "hyperstation\code\obj\kinkyclothes.dm" #include "hyperstation\code\obj\milking machine.dm" #include "hyperstation\code\obj\plushes.dm" #include "hyperstation\code\obj\pregnancytester.dm"