Merge branch 'master' into various-misc

hyperstation/code/modules/arousal/arousalhud.dm

@@ -32,10 +32,14 @@
 	if(user.pulling)
 		dat	+= "<a href='byond://?src=[REF(src)];kiss=1'>Kiss [user.pulling]</A>"
 		dat	+=	"(Kiss a partner, or object.)<BR>"
+	else
+		dat	+= "<span class='linkOff'>Kiss</span></A>"
+		dat	+=	"(Requires a partner)<BR>"
 
+
+	if(user.pulling)
 		dat	+= "<a href='byond://?src=[REF(src)];climaxover=1'>Climax over [user.pulling]</A>" //you can cum on objects if you really want...
 		dat	+=	"(Orgasm over a person or object.)<BR>"
-
 		if(isliving(user.pulling))
 			if(iscarbon(user.pulling))
 				dat	+= "<a href='byond://?src=[REF(src)];climaxwith=1'>Climax with [user.pulling]</A>"
@@ -43,8 +47,13 @@
 
 				var/mob/living/carbon/human/H = user.pulling
 				if(H.breedable && P && H)
-					dat	+= "<a href='byond://?src=[REF(src)];impreg=1'>Impregnate [user.pulling]</A>"
-					dat	+=	"(Climax inside another person, knocking them up.)<BR>"
+					dat	+= "<a href='byond://?src=[REF(src)];impreg=1'>Impregnate [U.pulling] ([clamp(U.impregchance,0,100)]%)</A>"
+					dat	+=	"(Climax inside another person, and attempt to knock them up.)<BR>"
+	else
+		dat	+= "<span class='linkOff'>Climax over</span></A>"
+		dat	+=	"(Requires a partner)<BR>"
+		dat	+= "<span class='linkOff'>Climax with</span></A>"
+		dat	+=	"(Requires a partner)<BR>"
 
 	//old code needs to be cleaned
 	if(P)

hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -7,6 +7,5 @@
 	metabolization_rate = 1 * REAGENTS_METABOLISM
 	taste_description = "sweetness"
 
-/datum/reagent/consumable/alienhoney/on_mob_life(mob/living/carbon/M) //can still be eaten/drank, but will provide no benefits like normal honey. Still good for a food sauce.
-	M.reagents.add_reagent(/datum/reagent/consumable/sugar,2) //metabolisms in the system as sugar.
+/datum/reagent/consumable/alienhoney/on_mob_life(mob/living/carbon/M)
 	..()

hyperstation/code/modules/resize/resizing.dm

@@ -44,7 +44,7 @@ mob/living/get_effective_size()
 	if(size_multiplier == previous_size)
 		return 1
 	src.update_transform() //WORK DAMN YOU
-	src.update_mobsize() 
+	src.update_mobsize()
 	//Going to change the health and speed values too
 	src.remove_movespeed_modifier(MOVESPEED_ID_SIZE)
 	src.add_movespeed_modifier(MOVESPEED_ID_SIZE, multiplicative_slowdown = (abs(size_multiplier - 1) * 0.8 ))
@@ -67,7 +67,7 @@ mob/living/get_effective_size()
 
 		if(tmob.pulledby == H)
 			return 0
-		
+
 		//Micro is on a table.
 		var/turf/steppyspot = tmob.loc
 		for(var/thing in steppyspot.contents)
@@ -91,6 +91,7 @@ mob/living/get_effective_size()
 					tmob.visible_message("<span class='notice'>[src] carefully slithers around [tmob].</span>", "<span class='notice'>[src]'s huge tail slithers besides you.</span>")
 				else
 					tmob.visible_message("<span class='notice'>[src] carefully steps over [tmob].</span>", "<span class='notice'>[src] steps over you carefully.</span>")
+
 				return 1
 
 		//Smaller person stepping under a larger person
@@ -133,7 +134,20 @@ mob/living/get_effective_size()
 						tmob.visible_message("<span class='danger'>[src] carefully rolls their tail over [tmob]!</span>", "<span class='danger'>[src]'s huge tail rolls over you!</span>")
 					else
 						tmob.visible_message("<span class='danger'>[src] carefully steps on [tmob]!</span>", "<span class='danger'>[src] steps onto you with force!</span>")
-					return 1
+
+					//horny traits
+
+					if(HAS_TRAIT(src, TRAIT_MICROPHILE))
+						src.adjustArousalLoss(8)
+						if (src.getArousalLoss() >= 100 && ishuman(tmob) && tmob.has_dna())
+							src.mob_climax(forced_climax=TRUE)
+
+					if(HAS_TRAIT(tmob, TRAIT_MACROPHILE))
+						tmob.adjustArousalLoss(10)
+						if (tmob.getArousalLoss() >= 100 && ishuman(tmob) && tmob.has_dna())
+							tmob.mob_climax(forced_climax=TRUE)
+
+						return 1
 
 			if(H.a_intent == "harm" && H.canmove && !H.buckled)
 				now_pushing = 0
@@ -149,6 +163,19 @@ mob/living/get_effective_size()
 						tmob.visible_message("<span class='danger'>[src] mows down [tmob] under their tail!</span>", "<span class='userdanger'>[src] plows their tail over you mercilessly!</span>")
 					else
 						tmob.visible_message("<span class='danger'>[src] slams their foot down on [tmob], crushing them!</span>", "<span class='userdanger'>[src] crushes you under their foot!</span>")
+
+					//horny traits
+
+					if(HAS_TRAIT(src, TRAIT_MICROPHILE))
+						src.adjustArousalLoss((get_effective_size()/tmob.get_effective_size()*3))
+						if (src.getArousalLoss() >= 100 && ishuman(tmob) && tmob.has_dna())
+							src.mob_climax(forced_climax=TRUE)
+
+					if(HAS_TRAIT(tmob, TRAIT_MACROPHILE))
+						tmob.adjustArousalLoss((get_effective_size()/tmob.get_effective_size()*3))
+						if (tmob.getArousalLoss() >= 100 && ishuman(tmob) && tmob.has_dna())
+							tmob.mob_climax(forced_climax=TRUE)
+
 					return 1
 
 			if(H.a_intent == "grab" && H.canmove && !H.buckled)
@@ -215,7 +242,7 @@ mob/living/get_effective_size()
 		mob_size = 2 //the default human size
 	if(size_multiplier > 1)
 		mob_size = 3
-			
+
 //Proc for instantly grabbing valid size difference. Code optimizations soon(TM)
 /*
 /mob/living/proc/sizeinteractioncheck(var/mob/living/tmob)