From fca2da81e4b1167fd550559142130436e29fbf76 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:22:36 +0100
Subject: [PATCH] Trait fix

---
 hyperstation/code/modules/resize/resizing.dm | 27 ++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm
index 84833a66..e78cc839 100644
--- a/hyperstation/code/modules/resize/resizing.dm
+++ b/hyperstation/code/modules/resize/resizing.dm
@@ -92,18 +92,6 @@ mob/living/get_effective_size()
 				else
 					tmob.visible_message("<span class='notice'>[src] carefully steps over [tmob].</span>", "<span class='notice'>[src] steps over you carefully.</span>")
 
-				//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
 
 		//Smaller person stepping under a larger person
@@ -146,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