Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system

modular_sand/code/datums/components/interaction_menu_granter.dm

@@ -136,14 +136,8 @@
 			else
 				visibility = "Hidden by clothes"
 
-			var/extras = "None"
-			if(CHECK_BITFIELD(genital.genital_flags, GENITAL_CAN_STUFF))
-				extras = "Allows egg stuffing"
-
-			genital_entry["extras"] = extras
 			genital_entry["visibility"] = visibility
 			genital_entry["possible_choices"] = GLOB.genitals_visibility_toggles
-			genital_entry["extra_choices"] = list(GEN_ALLOW_EGG_STUFFING)
 			genital_entry["can_arouse"] = (
 				!!CHECK_BITFIELD(genital.genital_flags, GENITAL_CAN_AROUSE) \
 				&& !(HAS_TRAIT(get_genitals, TRAIT_PERMABONER) \
@@ -169,37 +163,6 @@
 			genitals += list(simulated_ass)
 	.["genitals"] = genitals
 
-	//Get their genitals
-	var/list/genital_fluids = list()
-	var/mob/living/carbon/target_genitals = target || self
-	if(istype(target_genitals))
-		for(var/obj/item/organ/genital/genital in target_genitals.internal_organs)
-			if(!(CHECK_BITFIELD(genital.genital_flags, GENITAL_FUID_PRODUCTION)))
-				continue
-			var/fluids = (clamp(genital.fluid_rate * ((world.time - genital.last_orgasmed) / (10 SECONDS)) * genital.fluid_mult, 0, genital.fluid_max_volume) / genital.fluid_max_volume)
-			var/list/genital_entry = list()
-			genital_entry["name"] = "[genital.name]"
-			genital_entry["key"] = REF(genital)
-			genital_entry["fluid"] = fluids
-			genital_fluids += list(genital_entry)
-	.["genital_fluids"] = genital_fluids
-
-	var/list/genital_interactibles = list()
-	if(istype(target_genitals))
-		for(var/obj/item/organ/genital/genital in target_genitals.internal_organs)
-			if(!genital.is_exposed())
-				continue
-			var/list/equipment_names = list()
-			for(var/obj/equipment in genital.contents)
-				equipment_names += equipment.name
-			var/list/genital_entry = list()
-			genital_entry["name"] = "[genital.name]"
-			genital_entry["key"] = REF(genital)
-			genital_entry["possible_choices"] = GLOB.genitals_interactions
-			genital_entry["equipments"] = equipment_names
-			genital_interactibles += list(genital_entry)
-	.["genital_interactibles"] = genital_interactibles
-
 	var/datum/preferences/prefs = self?.client.prefs
 	if(prefs)
 	//Getting char prefs

modular_sand/code/datums/interactions/interaction_datums/lewd/breasts.dm

@@ -41,8 +41,8 @@
 		if("f", "g", "h")
 			modifier = 3
 		else
-			if(milkers.size in milkers.breast_values)
-				modifier = clamp(milkers.breast_values[milkers.size] - 5, 0, INFINITY)
+			if(milkers.size in GLOB.breast_values)
+				modifier = clamp(GLOB.breast_values[milkers.size] - 5, 0, INFINITY)
 			else
 				modifier = 1
 	target.reagents.add_reagent(milktype, rand(1,3 * modifier))

modular_sand/code/datums/interactions/interaction_datums/lewd/nipsuck.dm

@@ -22,8 +22,8 @@
 				if("f", "g", "h")
 					modifier = 3
 				else
-					if(B.size in B.breast_values)
-						modifier = clamp(B.breast_values[B.size] - 5, 0, INFINITY)
+					if(B.size in GLOB.breast_values)
+						modifier = clamp(GLOB.breast_values[B.size] - 5, 0, INFINITY)
 					else
 						modifier = 1
 			if(B.fluid_id)
@@ -42,8 +42,8 @@
 				if("f", "g", "h")
 					modifier = 3
 				else
-					if(B.size in B.breast_values)
-						modifier = clamp(B.breast_values[B.size] - 5, 0, INFINITY)
+					if(B.size in GLOB.breast_values)
+						modifier = clamp(GLOB.breast_values[B.size] - 5, 0, INFINITY)
 					else
 						modifier = 1
 			if(B.fluid_id)
@@ -63,8 +63,8 @@
 				if("f", "g", "h")
 					modifier = 3
 				else
-					if(B.size in B.breast_values)
-						modifier = clamp(B.breast_values[B.size] - 5, 0, INFINITY)
+					if(B.size in GLOB.breast_values)
+						modifier = clamp(GLOB.breast_values[B.size] - 5, 0, INFINITY)
 					else
 						modifier = 1
 			if(B.fluid_id)

modular_sand/code/datums/interactions/interaction_datums/lewd/self/breasts.dm

@@ -79,8 +79,8 @@
 		if("f", "g", "h")
 			modifier = 3
 		else
-			if(milkers.size in milkers.breast_values)
-				modifier = clamp(milkers.breast_values[milkers.size] - 5, 0, INFINITY)
+			if(milkers.size in GLOB.breast_values)
+				modifier = clamp(GLOB.breast_values[milkers.size] - 5, 0, INFINITY)
 			else
 				modifier = 1
 	user.reagents.add_reagent(milktype, rand(1,3 * modifier) * user.get_fluid_mod(milkers), milkers) //SPLURT edit