From 4f1c3ee9bd56ac256da8b88a292edcb99be8f5de Mon Sep 17 00:00:00 2001
From: Roxy <75404941+TealSeer@users.noreply.github.com>
Date: Sat, 27 Jun 2026 16:43:18 -0400
Subject: [PATCH] ADJ to FRONT layer

---
 code/__DEFINES/~~bubber_defines/mobs.dm       |  16 ++++++++--------
 .../genitals/testicles_onmob.dmi              | Bin 1323 -> 1326 bytes
 .../new_player/sprite_accessories/genitals.dm |   2 +-
 .../modules/surgery/organs/genitals.dm        |   2 +-
 .../genitals/testicles_onmob.dmi              | Bin 4166 -> 4172 bytes
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/__DEFINES/~~bubber_defines/mobs.dm b/code/__DEFINES/~~bubber_defines/mobs.dm
index 7b8379ec665..3b798de68dc 100644
--- a/code/__DEFINES/~~bubber_defines/mobs.dm
+++ b/code/__DEFINES/~~bubber_defines/mobs.dm
@@ -45,11 +45,11 @@
 #define BODYPART_ICON_GAS 'modular_skyrat/modules/bodyparts/icons/serpentid_parts_greyscale.dmi'
 
 // Genital Layers
-#define BUTT_LAYER_OFFSET 0.8
-#define ANUS_LAYER_OFFSET  0.7
-#define VAGINA_LAYER_OFFSET 0.6
-#define TESTICLES_LAYER_OFFSET 0.5
-#define GENITAL_LAYER_OFFSET 0.4
-#define PENIS_LAYER_OFFSET 0.3
-#define BELLY_LAYER_OFFSET 0.2
-#define BREASTS_LAYER_OFFSET 0.1
+#define BUTT_LAYER_OFFSET 0.08
+#define ANUS_LAYER_OFFSET  0.07
+#define VAGINA_LAYER_OFFSET 0.06
+#define TESTICLES_LAYER_OFFSET 0.05
+#define GENITAL_LAYER_OFFSET 0.04
+#define PENIS_LAYER_OFFSET 0.03
+#define BELLY_LAYER_OFFSET 0.02
+#define BREASTS_LAYER_OFFSET 0.01
diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi
index 17ccc9df8b228724699a50f9ce73ebc47bf93ef9..01a7869949f102d62f9d0ff048d79f50393d8b4e 100644
GIT binary patch
delta 205
zcmV;;05bop3a$!}Z2`}bZXAEPeToKlL;u)Z2&fEVV%!@dRhozz+UV;Gx@$b$&K>Uk
zrjwhpqFUDtE4MX$*wMS&l`WZCWRyHz7y4<Cf|B04b00o~4{fkhOa>FI5AJxe-rQR^
zn#`>ByXKHk(z(&kcPKfH?O^B3zb+Qlrf$mrH#tgjm=q`}U{a!_gh@Pwk_sj@N@|$Q
zQ8I_g%y_&eKB6cv%OhBUvm%0(I4dJqg|jMx)i|po*!&lpvZ^WHujK_P`uj#xot$^G
HLILRmdVgc!

delta 202
zcmV;*05$)v3abi`Z2`=YZXAD^K1Bn&p?_=+k`l#4UZEjUrHQC%8-0C2cM?yxbBBAs
z>Esr)ZuV_Q^{FK<>w|mT>6Xe(NwT*a;y4e2lWer^I>z4+Vjt}s^T|XTqC4MgFwfq3
zQ<|MV<|G@O56cyjU3@>;C9~DFx;eC+{(qBUAcH}UfgA<}1_~II7$`YmP+_2g!3qN_
z7%WXdixCp40irAc<tWM%P=TT%0hK5!6HtYsDgmw5(SkOe{=Sb7b^`Gl`!5E6vqb^v
E13&avp#T5?

diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
index 82e57e99116..dcba8822e51 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
@@ -138,7 +138,7 @@
 	always_color_customizable = TRUE
 	special_x_dimension = TRUE
 	default_color = DEFAULT_SKIN_OR_PRIMARY
-	relevent_layers = list(BODY_ADJ_LAYER, BODY_BEHIND_LAYER)
+	relevent_layers = list(BODY_FRONT_LAYER, BODY_BEHIND_LAYER)
 	var/has_size = TRUE
 
 /datum/sprite_accessory/genital/testicles/get_special_icon(mob/living/carbon/human/target_mob)
diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
index b46b6876e54..baced4cc745 100644
--- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
+++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
@@ -314,7 +314,7 @@
 
 /datum/bodypart_overlay/mutant/genital/testicles
 	feature_key = ORGAN_SLOT_TESTICLES
-	layers = EXTERNAL_ADJACENT | EXTERNAL_BEHIND
+	layers = EXTERNAL_FRONT | EXTERNAL_BEHIND
 	layer_offset = TESTICLES_LAYER_OFFSET
 
 /obj/item/organ/genital/testicles/update_genital_icon_state()
diff --git a/modular_zubbers/icons/mob/sprite_accesory/genitals/testicles_onmob.dmi b/modular_zubbers/icons/mob/sprite_accesory/genitals/testicles_onmob.dmi
index 2356e79335556e9a13c15afb449f1a830ea22181..a7392efc6b0e4e19d86afb16f21e92af7761e580 100644
GIT binary patch
delta 329
zcmV-P0k;0eAj}|;VSh4uR9JLGWpiV4X>fFDZ*Bkpc$}rzy>5dr6hPq_KZO<cDgpAd
zWQm|HL#R}Bw@`6wOG#Q`t9|`K>LF8xb2k_clBIk7iCiC=r?%7eu~k2I4F2n)_quvm
zs_fSf(M>O9p)zOvr;GnDA@<QukBhU3Hbnn^vcY`!el$xH%zxwSOZT==+2F@8e@SH@
zV}G{u^Xg8z;%ULtlBX3<*F4?ubj#BnPv?<1G|z2Uvzef6A!tiMTM62=pxp@Ct)Shp
zHaOcy2e&@OZ0}RdHb2E|_fyQaKgDeSQ_OCF6tg?v=FEIb;B4QVn%8i?)7^(L#1vu(
zF@qREOdtjj^F4?0<MeU(IC~sDP96u3bH}lhP$z&+z?=X%!F4YHPQaT0H^EsYut`{x
bpmx8_b<@??U&24kKxqeW5h$CpmI1I1z1pM<

delta 323
zcmV-J0lfaqAjTk&VSg-oR9JLGWpiV4X>fFDZ*Bkpc$}rz&5FV>6hPs1^Ath%qHX=z
zxEN{C4%k-+MWYFfGtvZoeeIZqD;MYP+QlgZ?#)NXdQ)$kR#*E*-E1HH->+Wlaxzuf
z-5;ZSz7)C2ob_iHUoRnc(LNtX7ZYuW{_taixpuxcQxnWr^?yB5+0pl5_>Rg>eRr|L
z^Xx-7qhU_Nf`%mx=QLc<a7n`z4Tk~P)Vrpw*bLA%7qo?-Ed}jd&@Ke+QqZng8=UQ;
zLtCCwvgau!o1Rj#>nSDMo>H>!DJ2`9QnK@JXXR4?XZh{KyoU3f?m9>vgbp$Xk%PoR
z;2>`hH%J?YjW@H#QRAd>&^TutGftTVGRzo83=@Vgb<7vW3)6+qC}B&2mV~U&?O4}s
V_5VBf0KaQcQ&1)nShJh~unq^poGbtU