Merge pull request #981 from ariaworld/lewd-smallupdate

[Lewd] [Semi-Modular] - Human Erect Penis and Balls Sprites-Fix & More!

modular_splurt/code/modules/client/loadout/socks.dm

@@ -2,7 +2,7 @@
 	name = "Cow Thigh High Socks"
 	path = /obj/item/clothing/underwear/socks/thigh/thigh_cow
 
-/datum/gear/socks/thigh/thigh_cow
+/datum/gear/socks/thigh/fishnet
 	name = "Fishnet tights"
 	path = /obj/item/clothing/underwear/socks/thigh/fishnet/white //This one is pretty much greyscale aka easier to recolor
 

modular_splurt/code/modules/client/loadout/uniform.dm

@@ -40,6 +40,10 @@
 	name = "Performers one piece"
 	path = /obj/item/clothing/under/performer
 
+/datum/gear/uniform/blutigen_undergarment
+	name = "Blutigen Undergarments"
+	path = /obj/item/clothing/under/blutigen_undergarment
+
 // Suggestion #151
 /datum/gear/uniform/waiter
 	name = "waiter's outfit"

modular_splurt/code/modules/clothing/masks/miscellaneous.dm

@@ -1,11 +1,15 @@
 //Main code edits
 /obj/item/clothing/mask/muzzle/attack_hand(mob/user, act_intent, attackchain_flags)
-	if(iscarbon(user))
-		var/mob/living/carbon/C = user
-		if(src == C.wear_mask)
-			to_chat(user, span_warning("You need help taking this off!"))
-			return
-	..()
+    if(iscarbon(user))
+        var/mob/living/carbon/C = user
+        if(src == C.wear_mask)
+            if(seamless)
+                to_chat(user, span_warning("You need help taking this off!"))
+                return
+            else
+                if(!do_after(C, 60, target = src))
+                    return
+    ..()
 
 //Own stuff
 

modular_splurt/code/modules/clothing/under/miscellaneous.dm

@@ -87,6 +87,17 @@
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 	body_parts_covered = CHEST
 
+/obj/item/clothing/under/blutigen_undergarment
+	name = "Blutigen Undergarments"
+	desc = "It'd barely cover your chest and groin."
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "blutigen_undergarment"
+	item_state = "blutigen_undergarment"
+	can_adjust = FALSE
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST
+
 /obj/item/clothing/under/bunnysuit/white
 	name = "white bunny outfit"
 	desc = "A simple white bunny outfit."

modular_splurt/code/modules/mob/living/living.dm

@@ -9,26 +9,36 @@
 		to_chat(usr, span_warning("You cannot toggle your gender while unconcious!"))
 		return
 
-	var/choice = tgui_alert(usr, "Select Gender.", "Gender", list("Both", "Male", "Female", "None", "Toggle Breasts"))
+	var/choice = tgui_alert(usr, "Select Gender.", "Gender", list("Both", "Male", "Female", "None", "Toggle Breasts", "Toggle Penis", "Toggle Pussy", "Toggle Balls"))
 	switch(choice)
 		if("Both")
 			has_penis = TRUE
 			has_balls = TRUE
 			has_vagina = TRUE
+			gender = PLURAL
 		if("Male")
 			has_penis = TRUE
 			has_balls = TRUE
 			has_vagina = FALSE
+			gender = MALE
 		if("Female")
 			has_penis = FALSE
 			has_balls = FALSE
 			has_vagina = TRUE
+			gender = FEMALE
 		if("None")
 			has_penis = FALSE
 			has_balls = FALSE
 			has_vagina = FALSE
+			gender = NEUTER
 		if("Toggle Breasts") // Idea/Initial code by @LunarFleet (github)
 			has_breasts = !has_breasts // Simplified line by @Zirok-BYOND (github)
+		if("Toggle Penis")
+			has_penis = !has_penis
+		if("Toggle Pussy")
+			has_vagina = !has_vagina 
+		if("Toggle Balls")
+			has_balls = !has_balls
 
 /// Toggle admin frozen
 /mob/living/proc/toggle_admin_freeze(client/admin)