1/2

code/__HELPERS/mobs.dm

@@ -119,7 +119,7 @@
 
 	return ha_style
 
-/proc/random_marking_style(var/location = "body", species = SPECIES_HUMAN, var/datum/robolimb/robohead, var/body_accessory, var/alt_head)
+/proc/random_marking_style(location = "body", species = SPECIES_HUMAN, datum/robolimb/robohead, body_accessory, alt_head, gender)
 	var/m_style = "None"
 	var/list/valid_markings = list()
 	for(var/marking in GLOB.marking_styles_list)
@@ -129,6 +129,8 @@
 			continue
 		if(S.marking_location != location) //If the marking isn't for the location we desire, skip.
 			continue
+		if((gender == MALE && S.gender == FEMALE) || (gender == FEMALE && S.gender == MALE))	// If the marking is not for that gender, skip that as well.
+			continue
 		if(!(species in S.species_allowed)) //If the user's head is not of a species the marking style allows, skip it. Otherwise, add it to the list.
 			continue
 		if(location == "tail")

code/modules/client/preference/preferences.dm

@@ -1554,7 +1554,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 						m_colours["head"] = rand_hex_color()
 				if("m_style_body")
 					if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings.
-						m_styles["body"] = random_marking_style("body", species)
+						m_styles["body"] = random_marking_style("body", species, gender = src.gender)
 				if("m_body_colour")
 					if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings.
 						m_colours["body"] = rand_hex_color()
@@ -1646,7 +1646,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 							m_colours["head"] = "#000000"
 
 						if(NS.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos.
-							m_styles["body"] = random_marking_style("body", species)
+							m_styles["body"] = random_marking_style("body", species, gender = src.gender)
 						else
 							m_styles["body"] = "None"
 							m_colours["body"] = "#000000"

code/modules/mob/living/carbon/human/appearance.dm

@@ -18,6 +18,11 @@
 	if(current_fhair.gender != NEUTER && current_fhair.gender != gender)
 		reset_facial_hair()
 
+	var/body_marking = m_styles["body"]
+	var/datum/sprite_accessory/current_bmarking = GLOB.marking_styles_list[body_marking]
+	if(current_bmarking.gender != NEUTER && current_bmarking.gender != gender)
+		reset_markings("body")
+
 	if(update_dna)
 		update_dna()
 	sync_organ_dna(assimilate = 0)
@@ -463,7 +468,9 @@
 			else
 				if(!S.tails_allowed || !(bodypart_tail.body_accessory.name in S.tails_allowed))
 					continue
-		else if(!(dna.species.name in S.species_allowed)) //If the user is not of a species the marking style allows, skip it. Otherwise, add it to the list.
+		if((H.gender == MALE && S.gender == FEMALE) || (H.gender == FEMALE && S.gender == MALE))
+			continue
+		if(!(dna.species.name in S.species_allowed)) //If the user is not of a species the marking style allows, skip it. Otherwise, add it to the list.
 			continue
 		if(location == "head")
 			var/datum/sprite_accessory/body_markings/head/M = GLOB.marking_styles_list[S.name]

code/modules/mob/new_player/preferences_setup.dm

@@ -33,7 +33,7 @@
 		m_styles["head"] = random_marking_style("head", species, robohead, null, alt_head)
 		m_colours["head"] = randomize_skin_color(1)
 	if(S.bodyflags & HAS_BODY_MARKINGS)
-		m_styles["body"] = random_marking_style("body", species)
+		m_styles["body"] = random_marking_style("body", species, gender = src.gender)
 		m_colours["body"] = randomize_skin_color(1)
 	if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings.
 		m_styles["tail"] = random_marking_style("tail", species, null, body_accessory)

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_body_markings.dm

@@ -2,22 +2,28 @@
 	icon = 'icons/mob/sprite_accessories/tajaran/tajaran_body_markings.dmi'
 	species_allowed = list(SPECIES_TAJARAN)
 
-/datum/sprite_accessory/body_markings/tajara/belly_flat_taj
-	name = "Tajaran Belly"
-	icon_state = "belly"
-
 /datum/sprite_accessory/body_markings/tajara/belly_crest_taj
 	name = "Tajaran Chest Crest"
 	icon_state = "crest"
 
-/datum/sprite_accessory/body_markings/tajara/belly_full_taj
-	name = "Tajaran Belly 2"
-	icon_state = "fullbelly"
-
 /datum/sprite_accessory/body_markings/tajara/points_taj
 	name = "Tajaran Points"
 	icon_state = "points"
 
-/datum/sprite_accessory/body_markings/tajara/patchy_taj
-	name = "Tajaran Patches"
-	icon_state = "patch"
+/datum/sprite_accessory/body_markings/tajara/belly_man_taj
+	name = "Tajaran Male Belly"
+	icon_state = "fullbelly_man"
+
+/datum/sprite_accessory/body_markings/tajara/patchy_man_taj
+	name = "Tajaran Male Patches"
+	icon_state = "patch_man"
+
+/datum/sprite_accessory/body_markings/tajara/belly_woman_taj
+	name = "Tajaran Female Belly"
+	icon_state = "fullbelly_woman"
+	gender = FEMALE
+
+/datum/sprite_accessory/body_markings/tajara/patchy_woman_taj
+	name = "Tajaran Female Patches"
+	icon_state = "patch_woman"
+	gender = FEMALE

code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_facial_hair.dm

@@ -10,14 +10,6 @@
 	name = "Tajara Mutton"
 	icon_state = "facial_mutton"
 
-/datum/sprite_accessory/facial_hair/tajara/taj_pencilstache
-	name = "Tajara Pencilstache"
-	icon_state = "facial_pencilstache"
-
-/datum/sprite_accessory/facial_hair/tajara/taj_moustache
-	name = "Tajara Moustache"
-	icon_state = "facial_moustache"
-
 /datum/sprite_accessory/facial_hair/tajara/taj_goatee
 	name = "Tajara Goatee"
 	icon_state = "facial_goatee"
@@ -26,6 +18,26 @@
 	name = "Tajara Faded Goatee"
 	icon_state = "facial_goatee_faded"
 
+/datum/sprite_accessory/facial_hair/tajara/taj_moustache
+	name = "Tajara Moustache"
+	icon_state = "facial_moustache"
+
 /datum/sprite_accessory/facial_hair/tajara/taj_smallstache
-	name = "Tajara Smallstache"
+	name = "Tajara Small Moustache"
 	icon_state = "facial_smallstache"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_longstache
+	name = "Tajara Long Moustache"
+	icon_state = "facial_long_moustache"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_trimstache
+	name = "Tajara Trimmed Moustache"
+	icon_state = "facial_trimoustache"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_pencilstache
+	name = "Tajara Pencil Moustache"
+	icon_state = "facial_pencilstache"
+
+/datum/sprite_accessory/facial_hair/tajara/taj_hulkhogan
+	name = "Tajara Hulk Hogan"
+	icon_state = "facial_hulkhogan"