diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index b0208f9db..145d8e873 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -405,8 +405,9 @@
 		if(cosmetic_icon && is_organic_limb())
 			if(cosmetic_icon.icon)
 				base_bp_icon = cosmetic_icon.icon
-				use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE
-				color_src = cosmetic_icon.color_src ? cosmetic_icon.color_src : MUTCOLORS
+				use_digitigrade = cosmetic_icon.support_digitigrade != null ? use_digitigrade : NOT_DIGITIGRADE
+				color_src = cosmetic_icon.color_src != null ? cosmetic_icon.color_src : MUTCOLORS
+				should_draw_gender = cosmetic_icon.support_gender != null ? cosmetic_icon.support_gender : should_draw_gender
 				if(!H.dna.features["cosmetic_markings"])
 					body_markings = null
 					auxmarking = null
diff --git a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm
index a08db8726..6c65ca5b9 100644
--- a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm
+++ b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm
@@ -23,6 +23,12 @@ safely.
 	var/color_src = MUTCOLORS
 	/** Whether or not this cosmetic part has an alternate form for digitigrade legs. */
 	var/support_digitigrade = TRUE
+	/** 
+		WE
+		HATE
+		GENDER!!!!!!!!!!
+	*/
+	var/support_gender = FALSE
 	/** Species IDs that support this cosmetic part. Bypassed with "show mismatched markings" option. */
 	var/list/supported_species
 
@@ -151,4 +157,4 @@ safely.
 	icon_state = "ipc_jointed"
 	supported_species = list("ipc")
 	color_src = MATRIXED
-	support_digitigrade = FALSE
\ No newline at end of file
+	support_digitigrade = FALSE
diff --git a/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm b/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm
index 25b93526f..ff5fa8590 100644
--- a/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm
+++ b/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm
@@ -14,4 +14,4 @@
 		var/datum/cosmetic_part/part = cosmetic_pref
 		var/obj/item/bodypart/body_part = get_bodypart(zone)
 		if(body_part && part)
-			body_part.apply_cosmetic(part)
\ No newline at end of file
+			body_part.apply_cosmetic(part)