diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index aac7e80d381..1c6fe450f07 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -336,7 +336,7 @@
 		if(reagents.has_reagent("lexorin")) return
 		if(M_NO_BREATH in mutations) return // No breath mutation means no breathing.
 		if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
-		if(species && (species.flags & NO_BREATHE || species.flags & IS_SYNTHETIC)) return
+		if(species && (species.flags & NO_BREATHE)) return
 
 		var/datum/organ/internal/lungs/L = internal_organs["lungs"]
 		L.process()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 3409bd0458e..9a02bc0d0fa 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -840,7 +840,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/proc/update_tail_showing(var/update_icons=1)
 	overlays_standing[TAIL_LAYER] = null
 
-	if(species.tail && species.flags & HAS_TAIL)
+	if(species.tail && species.bodyflags & HAS_TAIL)
 		if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space))
 			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
 
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index ebc385635a1..df36ee74cbf 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -78,8 +78,8 @@
 	primitive = /mob/living/carbon/monkey/unathi
 	darksight = 3
 
-	flags = HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
-	bodyflags = FEET_CLAWS
+	flags = HAS_LIPS | HAS_UNDERWEAR
+	bodyflags = FEET_CLAWS | HAS_TAIL
 
 	cold_level_1 = 280 //Default 260 - Lower is better
 	cold_level_2 = 220 //Default 200
@@ -109,8 +109,8 @@
 
 	primitive = /mob/living/carbon/monkey/tajara
 
-	flags = HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL | CAN_BE_FAT
-	bodyflags = FEET_PADDED
+	flags = HAS_LIPS | HAS_UNDERWEAR | CAN_BE_FAT
+	bodyflags = FEET_PADDED | HAS_TAIL
 
 /datum/species/skrell
 	name = "Skrell"
diff --git a/code/setup.dm b/code/setup.dm
index 353dc965166..52490849fdc 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -757,22 +757,22 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse
 #define HAS_SKIN_TONE 	256
 #define HAS_LIPS 		512
 #define HAS_UNDERWEAR 	1024
-#define HAS_TAIL 		2048
+#define IS_SYNTHETIC	2048
 #define IS_PLANT 		4096
 #define CAN_BE_FAT 		8192
 #define HAS_CHITTIN 	16384
 #define NO_INTORGANS	32768
 
-
+//Species Blood Flags
 #define BLOOD_GREEN 	1
 #define BLOOD_BLUE		2
 #define BLOOD_SLIME		4
-
+//Species Body Flags
 #define FEET_CLAWS		1
 #define FEET_PADDED		2
 #define FEET_NOSLIP		4
+#define HAS_TAIL 		8
 
-#define IS_SYNTHETIC 8192
 
 //Language flags.
 #define WHITELISTED 1  // Language is available if the speaker is whitelisted.