latexxx

.gitignore

@@ -196,3 +196,4 @@ Temporary Items
 /tools/LinuxOneShot/TGS_Config
 /tools/LinuxOneShot/TGS_Instances
 /tools/LinuxOneShot/TGS_Logs
+.vscode/launch.json

.vscode/launch.json

@@ -7,6 +7,14 @@
       "name": "Launch DreamSeeker",
       "preLaunchTask": "Build All",
       "dmb": "${workspaceFolder}/${command:CurrentDMB}"
-    }
+    },
+	{
+		"type": "byond",
+		"request": "launch",
+		"name": "Launch DreamDaemon",
+		"preLaunchTask": "Build All",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+		"dreamDaemon": true
+	}
   ]
 }

code/modules/vending/kinkmate.dm

@@ -35,9 +35,9 @@
 				/obj/item/reagent_containers/glass/bottle/crocin = 10,
 				/obj/item/reagent_containers/glass/bottle/camphor = 5,
 				/obj/item/storage/daki = 4,
-				/obj/item/clothing/head/helmet/space/deprivation_helmet = 5,
-				/obj/item/clothing/neck/mind_collar = 3,
-				//obj/item/clothing/under/misc/latex_catsuit = 1
+				///obj/item/clothing/head/helmet/space/deprivation_helmet = 5,
+				///obj/item/clothing/neck/mind_collar = 3,
+				///obj/item/clothing/under/misc/latex_catsuit = 10
 				)
 	contraband = list(
 				/obj/item/clothing/neck/petcollar/locked = 2,
@@ -49,7 +49,7 @@
 				/obj/item/clothing/under/costume/jabroni = 2,
 				/obj/item/clothing/gloves/evening/black = 2,
 				/obj/item/dildo/flared/huge = 3,
-				/obj/item/clothing/glasses/hypno = 10
+				///obj/item/clothing/glasses/hypno = 3
 				)
 	premium = list(
 				/obj/item/clothing/accessory/skullcodpiece/fake = 3,

modular_sand/code/game/objects/items/lewd_items/lewd.dm

@@ -0,0 +1,5 @@
+/obj/item/key/latex
+	name = "Latex Adjustment Override"
+	desc = "This is a strange device that ensurs your 'gifts' are recieved perminantly"
+	icon = 'modular_sand/icons/obj/lewd_items/lewd_items.dmi'
+	icon_state = "lustwish_discount"

modular_sand/code/modules/clothing/lewd_clothing/foot/lewd_shoes.dm

@@ -0,0 +1,129 @@
+//heels item
+/obj/item/clothing/shoes/lewd
+	name = "Lewd"
+	desc = "This is me being lazy"
+	icon_state = "latexheels"
+	item_state = "latexheels"
+	icon = 'modular_sand/icons/obj/clothing/lewd_clothes/foot/lewd_shoes.dmi'
+	mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/feet/lewd_shoes.dmi'
+	anthro_mob_worn_overlay = 'modular_sand/icons/mob/clothing/lewd_clothing/feet/lewd_shoes_digi.dmi'
+	mutantrace_variation = STYLE_DIGITIGRADE
+	can_be_tied = FALSE
+	strip_delay = 120
+
+/obj/item/clothing/shoes/lewd/latexheels
+	name = "latex heels"
+	desc = "Your feet hurt just looking at them."
+	icon_state = "latexheels"
+	item_state = "latexheels"
+	can_be_tied = FALSE
+	slowdown = 4
+
+//it takes time to put them off, do not touch
+/obj/item/clothing/shoes/latexheels/attack_hand(mob/user)
+	if(iscarbon(user))
+		var/mob/living/carbon/C = user
+		if(src == C.shoes)
+			if(!do_after(C, 40, target = src))
+				return
+	. = ..()
+
+//start processing
+/obj/item/clothing/shoes/latexheels/equipped(mob/user, slot)
+	. = ..()
+	var/mob/living/carbon/human/C = user
+	if(src == C.shoes)
+		START_PROCESSING(SSobj, src)
+	C.update_inv_shoes()
+	C.hud_used.hidden_inventory_update()
+	. = ..()
+
+
+/* --------------- This code is way to advanced for this codebase and I don't feel like porting the newer body_position code over
+					a single pair of heels.
+//stop processing
+/obj/item/clothing/shoes/latexheels/dropped(mob/user)
+	. = ..()
+	var/mob/living/carbon/human/H = user
+	STOP_PROCESSING(SSobj, src)
+	if(discomfort >= 80)
+		to_chat(H, span_purple("The latex heels no longer hurt your legs."))
+	discomfort = 0
+	slowdown = 4
+
+// Heels pain processor
+/obj/item/clothing/shoes/latexheels/process(delta_time)
+	var/mob/living/carbon/human/U = loc
+	if(discomfort <= 100 && U.body_position != LYING_DOWN)
+		discomfort += 1
+	if(discomfort >= 0 && U.body_position == LYING_DOWN)
+		discomfort -= 2
+		message_sent = FALSE
+		slowdown = 4
+
+	//Pain effect
+	if(discomfort >= 80 && U.body_position != LYING_DOWN)
+		U.adjustPain(1)
+
+	if(discomfort >=100 && U.body_position != LYING_DOWN)
+		U.adjustPain(4)
+		slowdown = 6
+		if(prob(10))
+			U.Knockdown(1)
+
+	//Discomfort milestone signalling that something is really wrong
+	if(discomfort >= 100 && U.body_position != LYING_DOWN && message_sent == FALSE)
+		if(HAS_TRAIT(U, TRAIT_MASOCHISM))
+			to_chat(U, span_notice("These heels are causing my feet incredible pain... And I kind of like it!"))
+		else
+			to_chat(U, span_notice("These heels are really hurting my feet!"))
+		message_sent = TRUE
+*/
+//to make sound when we walking in this
+/obj/item/clothing/shoes/latexheels/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, list('modular_sand/sound/lewd/highheel1.ogg' = 1,'modular_sand/sound/lewd/highheel2.ogg' = 1), 70)
+
+/////////////////
+///Latex socks///
+/////////////////
+
+/obj/item/clothing/shoes/latex_socks
+	name = "latex socks"
+	desc = "A pair of shiny, form fitting socks made out of a durable material."
+	icon_state = "latexsocks"
+	item_state = "latexsocks"
+	w_class = WEIGHT_CLASS_SMALL
+
+//start processing
+/obj/item/clothing/shoes/latex_socks/equipped(mob/user, slot)
+	. = ..()
+	var/mob/living/carbon/human/C = user
+	C.update_inv_shoes()
+	C.hud_used.hidden_inventory_update()
+
+//////////////////
+///Domina heels///
+//////////////////
+
+/obj/item/clothing/shoes/dominaheels //added for Kubic request
+	name = "dominant heels"
+	desc = "A pair of aesthetically pleasing heels."
+	icon_state = "dominaheels"
+	item_state = "dominaheels"
+	equip_delay_other = 60
+	strip_delay = 60
+	slowdown = 1
+
+//it takes time to put them off, do not touch
+/obj/item/clothing/shoes/dominaheels/attack_hand(mob/user)
+	if(iscarbon(user))
+		var/mob/living/carbon/C = user
+		if(src == C.shoes)
+			if(!do_after(C, 20, target = src))
+				return
+	. = ..()
+//to make sound when we walking in this
+/obj/item/clothing/shoes/dominaheels/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, list('modular_sand/sound/lewd/highheel1.ogg' = 1,'modular_sand/sound/lewd/highheel2.ogg' = 1), 70)

modular_sand/code/modules/clothing/lewd_clothing/gloves/lewd_gloves.dm

@@ -0,0 +1,69 @@
+//normal ball mittens
+/obj/item/clothing/gloves/ball_mittens
+	name = "Ball mittens"
+	desc = "A nice, comfortable pair of inflatable ball gloves."
+	icon_state = "ballmittens"
+	item_state = "ballmittens"
+	icon = 'modular_sand/icons/obj/clothing/lewd_clothes/gloves/lewd_gloves.dmi'
+	mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/gloves/lewd_gloves.dmi'
+	//equip_delay_other = 60
+	// equip_delay_self = 60
+	// strip_delay = 60
+	breakouttime = 10
+
+//That part allows reinforcing this item with handcuffs
+/obj/item/clothing/gloves/ball_mittens/attackby(obj/item/I, mob/user, params)
+    if(istype(I, /obj/item/restraints/handcuffs))
+        var/obj/item/clothing/gloves/ball_mittens_reinforced/W = new /obj/item/clothing/gloves/ball_mittens_reinforced
+        remove_item_from_storage(user)
+        user.put_in_hands(W)
+        to_chat(user, span_notice("You reinforced the belts on [src] with [I]."))
+        qdel(I)
+        qdel(src)
+        return
+    . = ..()
+
+//ball_mittens reinforced
+/obj/item/clothing/gloves/ball_mittens_reinforced //We getting this item by using handcuffs on normal ball mittens
+	name = "reinforced ball mittens"
+	desc = "Do not put these on, it's REALLY hard to take them off! But they look so comfortable..."
+	icon_state = "ballmittens"
+	item_state = "ballmittens"
+	icon = 'modular_sand/icons/obj/clothing/lewd_clothes/gloves/lewd_gloves.dmi'
+	mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/gloves/lewd_gloves.dmi'
+	// equip_delay_other = 80
+	// equip_delay_self = 80
+	// strip_delay = 80
+	breakouttime = 1000 //do not touch this, i beg you.
+
+//latex gloves
+/obj/item/clothing/gloves/latex_gloves
+	name = "Latex gloves"
+	desc = "Awesome looking gloves that are satisfying to the touch."
+	icon_state = "latexgloves"
+	item_state = "latexgloves"
+	w_class = WEIGHT_CLASS_SMALL
+	icon = 'modular_sand/icons/obj/clothing/lewd_clothes/gloves/lewd_gloves.dmi'
+	mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/gloves/lewd_gloves.dmi'
+	var/seamless = FALSE
+
+//Lock
+
+/obj/item/clothing/gloves/latex_gloves/attackby(/obj/item/gloves, mob/user, params)
+	if(istype(gloves, /obj/item/key/latex))
+		if(seamless != FALSE)
+			to_chat(user, "<span class='warning'>The gloves seem to loosen!</span>")
+			seamless = FALSE
+		else
+			to_chat(user, "<span class='warning'>The gloves suddenly tighten!</span>")
+			seamless = TRUE
+	return
+
+/obj/item/clothing/gloves/latex_gloves/attack_hand(mob/living/carbon/human/user)
+	var/mob/living/carbon/human/C = user
+	if(iscarbon(user) && seamless && (user.get_item_by_slot(SLOT_GLOVES)))
+		to_chat(C, span_purple(pick("You rub your gloved fingers together as you search for some sort of escape.",
+									"You can't find any leverage to remove these gloves!",
+									"Your pointless clawing seems to only make things more skin tight")))
+		return
+	. = ..()

modular_sand/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm

@@ -8,6 +8,8 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 25, "rad" = 0, "fire" = 20, "acid" = 15, "wound" = 0)
 	icon = 'modular_sand/icons/obj/clothing/lewd_clothes/head/lewd_hats.dmi'
 	mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/head/lewd_hats.dmi'
+	anthro_mob_worn_overlay = 'modular_sand/icons/mob/clothing/lewd_clothing/head/lewd_hats.dmi'
+	mutantrace_variation = STYLE_MUZZLE
 	lefthand_file = 'modular_sand/icons/mob/inhands/lewd_items/lewd_inhand_left.dmi'
 	righthand_file = 'modular_sand/icons/mob/inhands/lewd_items/lewd_inhand_right.dmi'
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT|HIDEFACIALHAIR
@@ -18,6 +20,7 @@
 	var/earmuffs = FALSE
 	var/prevent_vision = FALSE
 	var/color_changed = FALSE
+	var/seamless = FALSE
 
 	var/static/list/helmet_designs
 	actions_types = list(/datum/action/item_action/toggle_vision,
@@ -180,7 +183,18 @@
 	icon_state = "[initial(icon_state)]_[current_helmet_color]"
 	item_state = "[initial(icon_state)]_[current_helmet_color]"
 
-//Apply the effects
+//Lock
+/obj/item/clothing/head/helmet/space/deprivation_helmet/attackby(/obj/item/helm, mob/user, params)
+	var/obj/item/key/latex/pii = helm
+	if(istype(pii, /obj/item/key/latex))
+		if(seamless != FALSE)
+			to_chat(user, "<span class='warning'>The latches suddenly relax!</span>")
+			seamless = FALSE
+		else
+			to_chat(user, "<span class='warning'>The latches suddenly tighten!</span>")
+			seamless = TRUE
+	return
+
 /obj/item/clothing/head/helmet/space/deprivation_helmet/equipped(mob/living/carbon/human/user, slot)
 	. = ..()
 	if(slot != SLOT_HEAD)
@@ -197,7 +211,6 @@
 		user.become_blind("deprivation_helmet_[REF(src)]")
 		to_chat(user, span_purple("The helmet is blocking your vision! You can't make out anything on the other side..."))
 
-
 //Here goes code that heals the wearer after unequipping helmet
 /obj/item/clothing/head/helmet/space/deprivation_helmet/dropped(mob/living/carbon/human/user)
 	. = ..()
@@ -220,3 +233,11 @@
 		if(prevent_vision == TRUE)
 			to_chat(user, span_purple("The helmet no longer restricts your vision."))
 
+/obj/item/clothing/head/helmet/space/deprivation_helmet/attack_hand(mob/living/carbon/human/user)
+	if(iscarbon(user) && seamless && (user.get_item_by_slot(SLOT_HEAD) == src))
+		to_chat(user, span_purple(pick("You roam your hands around the helmet for some sort of release!",
+									"You find it impossible to leverage your fingers underneath the helmet",
+									"The durable material seems to reflect your pointless force.")))
+		return
+	. = ..()
+

modular_sand/code/modules/clothing/lewd_clothing/uniform/latex_catsuit.dm

@@ -6,89 +6,80 @@
 	icon = 'modular_sand/icons/obj/clothing/lewd_clothes/uniform/lewd_uniform.dmi'
 	mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform.dmi'
 	anthro_mob_worn_overlay = 'modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform-digi.dmi'
-	taur_mob_worn_overlay = 'modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform-taur.dmi'
 	lefthand_file = 'modular_sand/icons/mob/inhands/lewd_items/lewd_inhand_left.dmi'
 	righthand_file = 'modular_sand/icons/mob/inhands/lewd_items/lewd_inhand_right.dmi'
 	//equip_sound = 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg'
 	can_adjust = FALSE
 	strip_delay = 80
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
+	var/seamless = FALSE
+//Lock
+/obj/item/clothing/under/misc/latex_catsuit/attackby(/obj/item/suit, mob/living/carbon/human/user, params)
+	if(istype(suit, /obj/item/key/latex))
+		if(seamless != FALSE)
+			to_chat(user, "<span class='warning'>The suit seems to relax!</span>")
+			seamless = FALSE
+		else
+			to_chat(user, "<span class='warning'>The suit suddenly tightens!</span>")
+			seamless = TRUE
+	return
 
-	var/mutable_appearance/breasts_overlay
-	var/mutable_appearance/breasts_icon_overlay
-/*//this fragment of code makes unequipping not instant
-/obj/item/clothing/under/misc/latex_catsuit/attack_hand(mob/user)
-	if(iscarbon(user))
-		var/mob/living/carbon/human/C = user
-		if(src == C.w_uniform)
+/obj/item/clothing/under/misc/latex_catsuit/attack_hand(mob/living/carbon/human/user)
+	var/mob/living/carbon/human/C = user
+	if(iscarbon(user) && seamless && (src == C.w_uniform))
+		to_chat(C, span_purple(pick("Your hands uselessly roam across your rubber predicament and you fail to find a seam",
+									"You find it impossible to leverage your fingers beneath the suit.",
+									"The suit almost seems to be tightening away from your pointless clawing")))
+		return
+
+	else
+		if(iscarbon(user) && src == C.w_uniform)
 			if(!do_after(C, 60, target = src))
 				return
 	. = ..()
-*/
-// //some gender identification magic
-/obj/item/clothing/under/misc/latex_catsuit/equipped(mob/living/U, slot)
-	. = ..()
+
+//some gender identification magic
+/obj/item/clothing/under/misc/latex_catsuit/equipped(mob/living/carbon/human/U, slot)
 	var/mob/living/carbon/human/C = U
-	var/obj/item/organ/genital/breasts/B = C.getorganslot(ORGAN_SLOT_BREASTS)
-	/*if(src == C.w_uniform)
+	if(src == C.w_uniform)
 		if(U.gender == FEMALE)
 			icon_state = "latex_catsuit_female"
-			U.update_inv_w_uniform()
+			C.update_inv_w_uniform()
+			C.remove_overlay(HANDS_PART_LAYER)
 
-		if(U.gender == MALE)
+		else
 			icon_state = "latex_catsuit_male"
-			U.update_inv_w_uniform()
+			C.update_inv_w_uniform()
+			C.remove_overlay(HANDS_PART_LAYER)
 
-	//For giving taurs proper sprites
+	var/variation_flag = NONE
+	var/datum/sprite_accessory/taur/T
 	if(C.dna.species.mutant_bodyparts["taur"])
-		breasts_overlay = mutable_appearance('modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform-snake.dmi', "none")
-		update_overlays()
-	else
-		breasts_overlay = mutable_appearance('modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform.dmi', "none")
-		update_overlays()
-*/
-	//Breasts overlay for catsuit
-	if(B?.shape == "Pair")
-		breasts_overlay.icon_state = "breasts_double"
-		breasts_icon_overlay.icon_state = "iconbreasts_double"
-		accessory_overlay = breasts_overlay
-		add_overlay(breasts_icon_overlay)
-		update_overlays()
-	if(B?.shape == "Quad")
-		breasts_overlay.icon_state = "breasts_quad"
-		breasts_icon_overlay.icon_state = "iconbreasts_quad"
-		accessory_overlay = breasts_overlay
-		add_overlay(breasts_icon_overlay)
-		update_overlays()
-	if(B?.shape == "Sextuple")
-		breasts_overlay.icon_state = "breasts_sextuple"
-		breasts_icon_overlay.icon_state = "iconbreasts_sextuple"
-		accessory_overlay = breasts_overlay
-		add_overlay(breasts_icon_overlay)
-		update_overlays()
+		T = GLOB.taur_list[C.dna.features["taur"]]
+
+	if(T?.taur_mode)
+		variation_flag |= src.mutantrace_variation & T.taur_mode || src.mutantrace_variation & T.alt_taur_mode
+		switch(variation_flag)
+			if(STYLE_HOOF_TAURIC)
+				mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform-hoof.dmi'
+			if(STYLE_SNEK_TAURIC)
+				mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform-snake.dmi'
+			if(STYLE_PAW_TAURIC)
+				mob_overlay_icon = 'modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform-paw.dmi'
+
+		worn_x_dimension = 64 //To fix the offset
+		worn_y_dimension = 32
 
 	if(C.dna.species.mutant_bodyparts["taur"] && src == C.w_uniform)
 		C.remove_overlay(BODY_BEHIND_LAYER)
 		C.remove_overlay(BODY_FRONT_LAYER)
-	C.regenerate_icons()
+	. = ..()
 
 /obj/item/clothing/under/misc/latex_catsuit/dropped(mob/living/U)
 	. = ..()
 	var/mob/living/carbon/human/C = U
-	accessory_overlay = null
-	breasts_overlay.icon_state = "none"
-	cut_overlay(breasts_icon_overlay)
-	breasts_icon_overlay.icon_state = "none"
+	C.apply_overlay(HANDS_LAYER)
 	if(C.dna.species.mutant_bodyparts["taur"] && src == C.w_uniform)
 		C.apply_overlay(BODY_BEHIND_LAYER)
 		C.apply_overlay(BODY_FRONT_LAYER)
-
-//Plug to bypass the bug with instant suit equip/drop
-/obj/item/clothing/under/misc/latex_catsuit/MouseDrop(atom/over_object)
-
-/obj/item/clothing/under/misc/latex_catsuit/Initialize()
-	. = ..()
-	breasts_overlay = mutable_appearance('modular_sand/icons/mob/clothing/lewd_clothing/uniform/lewd_uniform.dmi', "none", ABOVE_MOB_LAYER)
-	breasts_overlay.icon_state = "breasts"
-	breasts_icon_overlay = mutable_appearance('modular_sand/icons/obj/clothing/lewd_clothes/uniform/lewd_uniform.dmi', "none")
-	breasts_icon_overlay.icon_state = "breasts"
+	C.regenerate_icons() //Just in case

tgstation.dme

@@ -3913,6 +3913,7 @@
 #include "modular_sand\code\game\objects\items\devices\PDA\PDA.dm"
 #include "modular_sand\code\game\objects\items\devices\radio\headset.dm"
 #include "modular_sand\code\game\objects\items\devices\radio\radio.dm"
+#include "modular_sand\code\game\objects\items\lewd_items\lewd.dm"
 #include "modular_sand\code\game\objects\items\plushes\goat_boss.dm"
 #include "modular_sand\code\game\objects\items\plushes\plushes.dm"
 #include "modular_sand\code\game\objects\items\robot\robot_upgrades.dm"
@@ -3980,6 +3981,8 @@
 #include "modular_sand\code\modules\clothing\head\misc.dm"
 #include "modular_sand\code\modules\clothing\lewd_clothing\collar\kink_collars.dm"
 #include "modular_sand\code\modules\clothing\lewd_clothing\eyes\hypnogoggles.dm"
+#include "modular_sand\code\modules\clothing\lewd_clothing\foot\lewd_shoes.dm"
+//#include "modular_sand\code\modules\clothing\lewd_clothing\gloves\lewd_gloves.dm"
 #include "modular_sand\code\modules\clothing\lewd_clothing\head\deprivation_helmet.dm"
 #include "modular_sand\code\modules\clothing\lewd_clothing\uniform\latex_catsuit.dm"
 #include "modular_sand\code\modules\clothing\masks\miscellaneous.dm"