diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm
index 298d9168c1..3e8d0b0e45 100644
--- a/code/modules/arousal/arousal.dm
+++ b/code/modules/arousal/arousal.dm
@@ -348,7 +348,7 @@
 		if(!G.linked_organ)
 			to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
 			return
-	fluid_source = G.linked_organ.reagents
+		fluid_source = G.linked_organ.reagents
 	total_fluids = fluid_source.total_volume
 
 	if(mb_time && !remote) //Skip warning if this is an instant climax.
diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm
index bfd807d3b6..60fce42fd0 100644
--- a/code/modules/arousal/genitals.dm
+++ b/code/modules/arousal/genitals.dm
@@ -45,8 +45,14 @@
 	linked_organ = null
 	. = ..()
 
+//GS13 Port - Make gentials actually produce "reagents"
 /obj/item/organ/genital/on_life()
-	return
+	if(QDELETED(src))
+		return
+	if(!reagents || !owner)
+		return
+
+	generate_fluid(reagents)
 
 /obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle")
 	if(!(genital_flags & GENITAL_CAN_AROUSE))
diff --git a/code/modules/arousal/organs/penis.dm b/code/modules/arousal/organs/penis.dm
index 6aee84de3c..7e0f31ed43 100644
--- a/code/modules/arousal/organs/penis.dm
+++ b/code/modules/arousal/organs/penis.dm
@@ -12,7 +12,6 @@
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN|GENITAL_CAN_TAUR
 	linked_organ_slot = ORGAN_SLOT_TESTICLES
 	fluid_transfer_factor = 0.5
-	producing = TRUE
 	shape = DEF_COCK_SHAPE
 	size = 2 //arbitrary value derived from length and diameter for sprites.
 	layer_index = PENIS_LAYER_INDEX
diff --git a/code/modules/arousal/organs/testicles.dm b/code/modules/arousal/organs/testicles.dm
index 57f16be9b8..2fdb0fb2c2 100644
--- a/code/modules/arousal/organs/testicles.dm
+++ b/code/modules/arousal/organs/testicles.dm
@@ -13,6 +13,7 @@
 	var/size_name = "average"
 	shape = DEF_BALLS_SHAPE
 	fluid_id = /datum/reagent/consumable/semen
+	producing				= TRUE
 	masturbation_verb = "massage"
 	can_climax				= TRUE
 	layer_index = TESTICLES_LAYER_INDEX
diff --git a/tgstation.dme b/tgstation.dme
index 6b7e5de851..f3bbf44f7f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4057,6 +4057,7 @@
 #include "hyperstation\code\game\objects\railings.dm"
 #include "hyperstation\code\game\objects\structures\bench.dm"
 #include "hyperstation\code\game\objects\structures\sauna_oven.dm"
+#include "hyperstation\code\modules\arousal\arousalhud.dm"
 #include "hyperstation\code\modules\clothing\sizeaccessories.dm"
 #include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm"
 #include "hyperstation\code\modules\mob\living\status_indicators.dm"
@@ -4067,11 +4068,10 @@
 #include "hyperstation\code\modules\resize\sizechems.dm"
 #include "hyperstation\code\modules\resize\sizegun.dm"
 #include "hyperstation\code\modules\surgery\organs\augments_arms.dm"
-#include "hyperstation\code\modules\arousal\arousalhud.dm"
 #include "hyperstation\code\obj\ashtray.dm"
 #include "hyperstation\code\obj\decal.dm"
-#include "hyperstation\code\obj\kinkyclothes.dm"
 #include "hyperstation\code\obj\fleshlight.dm"
+#include "hyperstation\code\obj\kinkyclothes.dm"
 #include "hyperstation\code\obj\sizeitems.dm"
 #include "hyperstation\code\obj\stargate_clothing.dm"
 #include "hyperstation\code\obj\ZaoCorp\hat.dm"