diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm
index f890ffd94..777c13bd8 100644
--- a/modular_citadel/code/modules/arousal/organs/testicles.dm
+++ b/modular_citadel/code/modules/arousal/organs/testicles.dm
@@ -7,7 +7,7 @@
slot = "testicles"
size = BALLS_SIZE_MIN
var/size_name = "average"
- shape = "single"
+ shape = "Single" //Shape name has to be capital to work
var/sack_size = BALLS_SACK_SIZE_DEF
var/cached_size = 6
//fluid_mult = 0.133 // Set to a lower value due to production scaling with size (I.E. 6 inches the "normal" amount)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 68eb0762e..147602004 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -240,8 +240,30 @@
/datum/reagent/fermi/penis_enlarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch.
if(!ishuman(M))
return
+ var/obj/item/organ/genital/testicles/T = M.getorganslot("testicles") //Hyper Change, testicles come first so the dick isn't hidden behind the testicles layer
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
- var/obj/item/organ/genital/testicles/T = M.getorganslot("testicles") //Hyper Change
+ if(!T)//Hyper change// Adds testicles if there are none.
+
+ //If they have Acute hepatic pharmacokinesis, then route processing though liver.
+ if(HAS_TRAIT(M, TRAIT_PHARMA))
+ var/obj/item/organ/liver/L = M.getorganslot("liver")
+ if(L)
+ L.swelling+= 0.05
+ return..()
+ else
+ M.adjustToxLoss(1)
+ return..()
+
+ //otherwise proceed as normal
+ var/obj/item/organ/genital/testicles/nT = new
+ nT.Insert(M)
+ if(nT)
+ nT.size = BALLS_SIZE_MIN
+ to_chat(M, "Your groin feels warm, as you feel two sensitive orbs taking shape below.")
+ nT.cached_size = 1
+ nT.sack_size = BALLS_SACK_SIZE_DEF
+ T = nT
+
if(!P)//They do have a preponderance for escapism, or so I've heard.
//If they have Acute hepatic pharmacokinesis, then route processing though liver.
@@ -265,28 +287,6 @@
M.reagents.remove_reagent(type, 5)
P = nP
- if(!T)//Hyper change// Adds testicles if there are none.
-
- //If they have Acute hepatic pharmacokinesis, then route processing though liver.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
- var/obj/item/organ/liver/L = M.getorganslot("liver")
- if(L)
- L.swelling+= 0.05
- return..()
- else
- M.adjustToxLoss(1)
- return..()
-
- //otherwise proceed as normal
- var/obj/item/organ/genital/testicles/nT = new
- nT.Insert(M)
- if(nT)
- nT.size = BALLS_SIZE_MIN
- to_chat(M, "Your groin feels warm, as you feel two sensitive orbs taking shape below.")
- nT.cached_size = 1
- nT.sack_size = BALLS_SACK_SIZE_DEF
- T = nT
-
P.cached_length = P.cached_length + 0.1
//Hyper change// Increase ball size too
T.size = T.size + 0.1