diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index a9d9bda00c..313b6fc021 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -80,12 +80,18 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 #define isipcperson(A) (is_species(A, /datum/species/ipc))
 #define issynthliz(A) (is_species(A, /datum/species/synthliz))
 #define ismammal(A) (is_species(A, /datum/species/mammal))
-#define isavian(A) (is_species(A, /datum/species/avian))
-#define isaquatic(A) (is_species(A, /datum/species/aquatic))
-#define isinsect(A) (is_species(A, /datum/species/insect))
+#define isinsect(A) (is_species(A, /datum/species/insect) || isflyperson(A))
 #define isxenoperson(A) (is_species(A, /datum/species/xeno))
 #define isstartjelly(A) (is_species(A, /datum/species/jelly/roundstartslime))
 
+// Checks using categories that hold over groups of species, used by species drinks
+#define isundead(A) (isdullahan(A) || iszombie(A) || isskeleton(A) || isvampire(A))
+#define isplant(A) (ismush(A) || ispodperson(A))
+#define isrobotic(A) (isipcperson(A) || ispodperson(A))
+#define ishumanlike(A) (ishumanbasic(A) || isdwarf(A) || isangel(A))
+#define isfurry(A) (ismammal(A) || iscatperson(A))
+
+
 //more carbon mobs
 #define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
 
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 8d8049194b..031865da05 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -920,75 +920,75 @@
 
 /datum/chemical_reaction/coldscales
 	name = "Cold Scales"
-	id = /datum/reagent/consumable/ethanol/coldscales
-	results = list(/datum/reagent/consumable/ethanol/coldscales = 3)
+	id = /datum/reagent/consumable/ethanol/species_drink/coldscales
+	results = list(/datum/reagent/consumable/species_drink/ethanol/coldscales = 3)
 	required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/toxin/slimejelly = 1,  /datum/reagent/consumable/menthol = 1)
 
 /datum/chemical_reaction/oil_drum
 	name = "Oil Drum"
-	id = /datum/reagent/consumable/ethanol/oil_drum
-	results = list(/datum/reagent/consumable/ethanol/oil_drum = 3)
+	id = /datum/reagent/consumable/ethanol/species_drink/oil_drum
+	results = list(/datum/reagent/consumable/ethanol/species_drink/oil_drum = 3)
 	required_reagents = list(/datum/reagent/consumable/ethanol = 1,  /datum/reagent/oil = 1, /datum/reagent/consumable/ethanol/champagne = 12)
 
 /datum/chemical_reaction/nord_king
 	name = "Nord King"
-	id = /datum/reagent/consumable/ethanol/nord_king
-	results = list(/datum/reagent/consumable/ethanol/nord_king = 10)
+	id = /datum/reagent/consumable/ethanol/species_drink/nord_king
+	results = list(/datum/reagent/consumable/ethanol/species_drink/nord_king = 10)
 	required_reagents = list(/datum/reagent/consumable/ethanol = 5,  /datum/reagent/consumable/honey = 1, /datum/reagent/consumable/ethanol/red_mead = 10)
 
 /datum/chemical_reaction/velvet_kiss
 	name = "Velvet Kiss"
-	id = /datum/reagent/consumable/ethanol/velvet_kiss
-	results = list(/datum/reagent/consumable/ethanol/velvet_kiss = 15) //Limited races use this
+	id = /datum/reagent/consumable/ethanol/species_drink/velvet_kiss
+	results = list(/datum/reagent/consumable/ethanol/species_drink/velvet_kiss = 15) //Limited races use this
 	required_reagents = list(/datum/reagent/blood = 5,  /datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/wine = 10)
 
 /datum/chemical_reaction/abduction_fruit
 	name = "Abduction Fruit"
-	id = /datum/reagent/consumable/ethanol/abduction_fruit
-	results = list(/datum/reagent/consumable/ethanol/abduction_fruit = 3)
+	id = /datum/reagent/consumable/ethanol/species_drink/abduction_fruit
+	results = list(/datum/reagent/consumable/ethanol/species_drink/abduction_fruit = 3)
 	required_reagents = list(/datum/reagent/consumable/limejuice = 10,  /datum/reagent/consumable/strawberryjuice = 5, /datum/reagent/consumable/watermelonjuice = 10)
 
 /datum/chemical_reaction/bug_zapper
 	name = "Bug Zapper"
-	id = /datum/reagent/consumable/ethanol/bug_zapper
-	results = list(/datum/reagent/consumable/ethanol/bug_zapper = 20) //Harder to make
+	id = /datum/reagent/consumable/ethanol/species_drink/bug_zapper
+	results = list(/datum/reagent/consumable/ethanol/species_drink/bug_zapper = 20) //Harder to make
 	required_reagents = list(/datum/reagent/consumable/lemonjuice = 10,  /datum/reagent/teslium = 1, /datum/reagent/copper = 10)
 
 /datum/chemical_reaction/mush_crush
 	name = "Mush Crush"
-	id = /datum/reagent/consumable/ethanol/mush_crush
-	results = list(/datum/reagent/consumable/ethanol/mush_crush = 10)
+	id = /datum/reagent/consumable/ethanol/species_drink/mush_crush
+	results = list(/datum/reagent/consumable/ethanol/species_drink/mush_crush = 10)
 	required_reagents = list(/datum/reagent/iron = 5,  /datum/reagent/ash = 5, /datum/reagent/toxin/coffeepowder = 10)
 
 /datum/chemical_reaction/darkbrew
 	name = "Darkbrew"
-	id = /datum/reagent/consumable/ethanol/darkbrew
-	results = list(/datum/reagent/consumable/ethanol/darkbrew = 20)//Limited races use this
+	id = /datum/reagent/consumable/ethanol/species_drink/darkbrew
+	results = list(/datum/reagent/consumable/ethanol/species_drink/darkbrew = 20)//Limited races use this
 	required_reagents = list(/datum/reagent/liquid_dark_matter = 5,  /datum/reagent/toxin/bungotoxin = 5, /datum/reagent/toxin/coffeepowder = 10)
 
 /datum/chemical_reaction/hollow_bone
 	name = "Hollow Bone"
-	id = /datum/reagent/consumable/ethanol/hollow_bone
-	results = list(/datum/reagent/consumable/ethanol/hollow_bone = 10)
+	id = /datum/reagent/consumable/ethanol/species_drink/hollow_bone
+	results = list(/datum/reagent/consumable/ethanol/species_drink/hollow_bone = 10)
 	required_reagents = list(/datum/reagent/toxin/bonehurtingjuice = 5,  /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/coconutmilk = 10)
 
 /datum/chemical_reaction/frisky_kitty
 	name = "Frisky Kitty"
-	id = /datum/reagent/consumable/ethanol/frisky_kitty
-	results = list(/datum/reagent/consumable/ethanol/frisky_kitty = 2)
+	id = /datum/reagent/consumable/ethanol/species_drink/frisky_kitty
+	results = list(/datum/reagent/consumable/ethanol/species_drink/frisky_kitty = 2)
 	required_reagents = list(/datum/reagent/consumable/catnip_tea = 1,  /datum/reagent/consumable/milk = 1)
 	required_temp = 296 //Just above room temp (22.85'C)
 
 /datum/chemical_reaction/jell_wyrm
 	name = "Jell Wyrm"
-	id = /datum/reagent/consumable/ethanol/jell_wyrm
-	results = list(/datum/reagent/consumable/ethanol/jell_wyrm = 2)
+	id = /datum/reagent/consumable/ethanol/species_drink/jell_wyrm
+	results = list(/datum/reagent/consumable/ethanol/species_drink/jell_wyrm = 2)
 	required_reagents = list(/datum/reagent/toxin/slimejelly = 1,  /datum/reagent/toxin/carpotoxin = 1, /datum/reagent/carbondioxide = 5)
 	required_temp = 333 // (59.85'C)
 
 /datum/chemical_reaction/laval_spit
 	name = "Laval Spit"
-	id = /datum/reagent/consumable/ethanol/laval_spit
-	results = list(/datum/reagent/consumable/ethanol/laval_spit = 20) //Limited use
+	id = /datum/reagent/consumable/ethanol/species_drink/laval_spit
+	results = list(/datum/reagent/consumable/ethanol/species_drink/laval_spit = 20) //Limited use
 	required_reagents = list(/datum/reagent/iron = 5,  /datum/reagent/consumable/ethanol/mauna_loa = 10, /datum/reagent/sulfur = 5)
 	required_temp = 900 // (626.85'C)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index df71e85f4c..a840e6ee90 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -106,6 +106,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
 	var/icon_limbs //Overrides the icon used for the limbs of this species. Mainly for downstream, and also because hardcoded icons disgust me. Implemented and maintained as a favor in return for a downstream's implementation of synths.
 
+	var/tail_type //type of tail i.e. mam_tail
+	var/wagging_type //type of wagging i.e. waggingtail_lizard
+
 	/// Our default override for typing indicator state
 	var/typing_indicator_state
 
@@ -2246,11 +2249,29 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 ////////////////
 
 /datum/species/proc/can_wag_tail(mob/living/carbon/human/H)
-	return FALSE
+	if(!tail_type || !wagging_type)
+		return FALSE
+	else
+		return mutant_bodyparts[tail_type] || mutant_bodyparts[wagging_type]
 
 /datum/species/proc/is_wagging_tail(mob/living/carbon/human/H)
-	return FALSE
+	return mutant_bodyparts["waggingtail_lizard"]
 
 /datum/species/proc/start_wagging_tail(mob/living/carbon/human/H)
+	if(tail_type && wagging_type)
+		if(mutant_bodyparts[tail_type])
+			mutant_bodyparts[wagging_type] = mutant_bodyparts[tail_type]
+			mutant_bodyparts -= tail_type
+			if(mutant_bodyparts["spines"] || mutant_bodyparts["waggingspines"]) //special lizard thing
+				mutant_bodyparts["waggingspines"] = mutant_bodyparts["spines"]
+				mutant_bodyparts -= "spines"
+			H.update_body()
 
 /datum/species/proc/stop_wagging_tail(mob/living/carbon/human/H)
+	if(tail_type && wagging_type)
+		mutant_bodyparts[tail_type] = mutant_bodyparts[wagging_type]
+		mutant_bodyparts -= wagging_type
+		if(mutant_bodyparts["spines"] || mutant_bodyparts["waggingspines"]) //special lizard thing
+			mutant_bodyparts["spines"] = mutant_bodyparts["waggingspines"]
+			mutant_bodyparts -= "waggingspines"
+		H.update_body()
diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
index bec2b1ab03..390f5ec184 100644
--- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
@@ -17,20 +17,5 @@
 	exotic_bloodtype = "BUG"
 	exotic_blood_color = BLOOD_COLOR_BUG
 
-/datum/species/insect/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/insect/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/insect/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_tail"])
-		mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"]
-		mutant_bodyparts -= "mam_tail"
-	H.update_body()
-
-/datum/species/insect/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_waggingtail"])
-		mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"]
-		mutant_bodyparts -= "mam_waggingtail"
-	H.update_body()
+	tail_type = "mam_tail"
+	wagging_type = "mam_waggingtail"
diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm
index be3d335833..2752357cc1 100644
--- a/code/modules/mob/living/carbon/human/species_types/felinid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm
@@ -9,23 +9,8 @@
 	mutantears = /obj/item/organ/ears/cat
 	mutanttail = /obj/item/organ/tail/cat
 
-/datum/species/human/felinid/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/human/felinid/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/human/felinid/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_tail"])
-		mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"]
-		mutant_bodyparts -= "mam_tail"
-	H.update_body()
-
-/datum/species/human/felinid/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_waggingtail"])
-		mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"]
-		mutant_bodyparts -= "mam_waggingtail"
-	H.update_body()
+	tail_type = "mam_tail"
+	wagging_type = "mam_waggingtail"
 
 /datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
 	if(ishuman(C))
diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index 807b3437c3..8b633e31d7 100644
--- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -3,7 +3,7 @@
 	id = "mammal"
 	default_color = "4B4B4B"
 	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,CAN_SCAR)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST
 	mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None",
 						 "mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian")
@@ -14,6 +14,9 @@
 	liked_food = MEAT | FRIED
 	disliked_food = TOXIC
 
+	tail_type = "mam_tail"
+	wagging_type = "mam_waggingtail"
+
 /datum/species/mammal/can_wag_tail(mob/living/carbon/human/H)
 	return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"]
 
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index 22d8cb30fd..b33bac9b97 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -10,6 +10,9 @@
 	disliked_food = GROSS | RAW
 	liked_food = JUNKFOOD | FRIED
 
+	tail_type = "tail_human"
+	wagging_type = "waggingtail_human"
+
 /datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
 		stop_wagging_tail(H)
@@ -18,21 +21,3 @@
 	if(H)
 		stop_wagging_tail(H)
 	. = ..()
-
-/datum/species/human/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["tail_human"] || mutant_bodyparts["waggingtail_human"]
-
-/datum/species/human/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["waggingtail_human"]
-
-/datum/species/human/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["tail_human"])
-		mutant_bodyparts["waggingtail_human"] = mutant_bodyparts["tail_human"]
-		mutant_bodyparts -= "tail_human"
-	H.update_body()
-
-/datum/species/human/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["waggingtail_human"])
-		mutant_bodyparts["tail_human"] = mutant_bodyparts["waggingtail_human"]
-		mutant_bodyparts -= "waggingtail_human"
-	H.update_body()
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 31f326fd53..8a215795d7 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -25,6 +25,9 @@
 	species_language_holder = /datum/language_holder/jelly
 	mutant_brain = /obj/item/organ/brain/jelly
 
+	tail_type = "mam_tail"
+	wagging_type = "mam_waggingtail"
+
 /obj/item/organ/brain/jelly
 	name = "slime nucleus"
 	desc = "A slimey membranous mass from a slime person"
@@ -128,33 +131,6 @@
 		return
 	to_chat(H, "<span class='warning'>...but there is not enough of you to go around! You must attain more mass to heal!</span>")
 
-/datum/species/jelly/spec_death(gibbed, mob/living/carbon/human/H)
-	if(H)
-		stop_wagging_tail(H)
-
-/datum/species/jelly/spec_stun(mob/living/carbon/human/H,amount)
-	if(H)
-		stop_wagging_tail(H)
-	. = ..()
-
-/datum/species/jelly/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/jelly/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/jelly/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_tail"])
-		mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"]
-		mutant_bodyparts -= "mam_tail"
-	H.update_body()
-
-/datum/species/jelly/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_waggingtail"])
-		mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"]
-		mutant_bodyparts -= "mam_waggingtail"
-	H.update_body()
-
 
 ////////////////////////////////////////////////////////SLIMEPEOPLE///////////////////////////////////////////////////////////////////
 
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 8a5b391562..d7885a6d58 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -27,6 +27,9 @@
 	inert_mutation = FIREBREATH
 	species_language_holder = /datum/language_holder/lizard
 
+	tail_type = "tail_lizard"
+	wagging_type = "waggingtail_lizard"
+
 /datum/species/lizard/random_name(gender,unique,lastname)
 	if(unique)
 		return random_unique_lizard_name(gender)
@@ -38,28 +41,6 @@
 
 	return randname
 
-/datum/species/lizard/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["tail_lizard"] || mutant_bodyparts["waggingtail_lizard"]
-
-/datum/species/lizard/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["waggingtail_lizard"]
-
-/datum/species/lizard/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["tail_lizard"])
-		mutant_bodyparts["waggingtail_lizard"] = mutant_bodyparts["tail_lizard"]
-		mutant_bodyparts["waggingspines"] = mutant_bodyparts["spines"]
-		mutant_bodyparts -= "tail_lizard"
-		mutant_bodyparts -= "spines"
-	H.update_body()
-
-/datum/species/lizard/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["waggingtail_lizard"])
-		mutant_bodyparts["tail_lizard"] = mutant_bodyparts["waggingtail_lizard"]
-		mutant_bodyparts["spines"] = mutant_bodyparts["waggingspines"]
-		mutant_bodyparts -= "waggingtail_lizard"
-		mutant_bodyparts -= "waggingspines"
-	H.update_body()
-
 /*
  Lizard subspecies: ASHWALKERS
 */
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index e4f69174e9..4a8d948917 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -71,20 +71,5 @@
 	light_burnheal = -0.2
 	light_toxheal = -0.7
 
-/datum/species/pod/pseudo_weak/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/pod/pseudo_weak/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/pod/pseudo_weak/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_tail"])
-		mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"]
-		mutant_bodyparts -= "mam_tail"
-	H.update_body()
-
-/datum/species/pod/pseudo_weak/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_waggingtail"])
-		mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"]
-		mutant_bodyparts -= "mam_waggingtail"
-	H.update_body()
+	tail_type = "mam_tail"
+	wagging_type = "mam_waggingtail"
diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
index 23b900488c..d5eb9e10e0 100644
--- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
@@ -20,20 +20,5 @@
 	exotic_bloodtype = "S"
 	exotic_blood_color = BLOOD_COLOR_OIL
 
-/datum/species/synthliz/can_wag_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/synthliz/is_wagging_tail(mob/living/carbon/human/H)
-	return mutant_bodyparts["mam_waggingtail"]
-
-/datum/species/synthliz/start_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_tail"])
-		mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"]
-		mutant_bodyparts -= "mam_tail"
-	H.update_body()
-
-/datum/species/synthliz/stop_wagging_tail(mob/living/carbon/human/H)
-	if(mutant_bodyparts["mam_waggingtail"])
-		mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"]
-		mutant_bodyparts -= "mam_waggingtail"
-	H.update_body()
+	tail_type = "mam_tail"
+	wagging_type = "mam_waggingtail"
diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm
index 85f1fbf386..7dee33c3c8 100644
--- a/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -43,7 +43,6 @@
 		return TRUE
 	return ..()
 
-
 /datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H)
 	if(S && !istype(S, type))
 		name = S.name
diff --git a/code/modules/mob/living/carbon/human/species_types/xeno.dm b/code/modules/mob/living/carbon/human/species_types/xeno.dm
index 273fe833d8..4b5e697d31 100644
--- a/code/modules/mob/living/carbon/human/species_types/xeno.dm
+++ b/code/modules/mob/living/carbon/human/species_types/xeno.dm
@@ -5,7 +5,7 @@
 	say_mod = "hisses"
 	default_color = "00FF00"
 	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
 	mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 385a82baa5..3f3b1da208 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2270,25 +2270,29 @@ All effects don't start immediately, but rather get worse over time; the rate is
 ////////////////////
 //Race-Base-Drinks//
 ////////////////////
+/datum/reagent/consumable/ethanol/species_drink
+	var/species_required
+	var/disgust = 25
+	boozepwr = 50
 
-/datum/reagent/consumable/ethanol/coldscales
+/datum/reagent/consumable/ethanol/species_drink/on_mob_life(mob/living/carbon/C)
+	if(1) //a big ugly switch case that sets definitions against species checks
+		quality = RACE_DRINK
+	else
+		C.adjust_disgust(disgust)
+
+/datum/reagent/consumable/ethanol/species_drink/coldscales
 	name = "Coldscales"
 	color = "#5AEB52" //(90, 235, 82)
 	description = "A cold looking drink made for people with scales."
-	boozepwr = 50 //strong!
 	taste_description = "dead flies"
 	glass_icon_state = "coldscales"
 	glass_name = "glass of Coldscales"
 	glass_desc = "A soft green drink that looks inviting!"
 
-/datum/reagent/consumable/ethanol/coldscales/on_mob_life(mob/living/carbon/M)
-	if(islizard(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "lizard"
 
-/datum/reagent/consumable/ethanol/oil_drum
+/datum/reagent/consumable/ethanol/species_drink/oil_drum
 	name = "Oil Drum"
 	color = "#000000" //(0, 0, 0)
 	description = "Industrial grade oil mixed with some ethanol to make it a drink. Somehow not known to be toxic."
@@ -2298,31 +2302,20 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "Drum of oil"
 	glass_desc = "A gray can of booze and oil..."
 
-/datum/reagent/consumable/ethanol/oil_drum/on_mob_life(mob/living/carbon/M)
-	if(isipcperson(M) || issynthliz(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "robot"
 
-/datum/reagent/consumable/ethanol/nord_king
+/datum/reagent/consumable/ethanol/species_drink/nord_king
 	name = "Nord King"
 	color = "#EB1010" //(235, 16, 16)
 	description = "Strong mead mixed with more honey and ethanol. Beloved by its human patrons."
-	boozepwr = 50 //strong!
 	taste_description = "honey and red wine"
 	glass_icon_state = "nord_king"
 	glass_name = "Keg of Nord King"
 	glass_desc = "A dripping keg of red mead."
 
-/datum/reagent/consumable/ethanol/nord_king/on_mob_life(mob/living/carbon/M)
-	if(ishumanbasic(M) || isdwarf(M) || isangel(M)) //Humans and angel races are rare
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "basic"
 
-/datum/reagent/consumable/ethanol/velvet_kiss
+/datum/reagent/consumable/ethanol/species_drink/velvet_kiss
 	name = "Velvet Kiss"
 	color = "#EB1010" //(235, 16, 16)
 	description = "A bloody drink mixed with wine."
@@ -2332,14 +2325,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Velvet Kiss"
 	glass_desc = "Red and white drink for the upper classes or undead."
 
-/datum/reagent/consumable/ethanol/velvet_kiss/on_mob_life(mob/living/carbon/M)
-	if(iszombie(M) || isvampire(M) || isdullahan(M)) //Rare races!
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "undead"
 
-/datum/reagent/consumable/ethanol/abduction_fruit
+/datum/reagent/consumable/ethanol/species_drink/abduction_fruit
 	name = "Abduction Fruit"
 	color = "#DEFACD" //(222, 250, 205)
 	description = "Mixing of juices to make an alien taste."
@@ -2349,14 +2337,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Abduction Fruit"
 	glass_desc = "Mixed fruits that were never meant to be mixed..."
 
-/datum/reagent/consumable/ethanol/abduction_fruit/on_mob_life(mob/living/carbon/M)
-	if(isabductor(M) || isxenoperson(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "alien"
 
-/datum/reagent/consumable/ethanol/bug_zapper
+/datum/reagent/consumable/ethanol/species_drink/bug_zapper
 	name = "Bug Zapper"
 	color = "#F5882A" //(222, 250, 205)
 	description = "Copper and lemon juice. Hardly even a drink."
@@ -2366,14 +2349,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Bug Zapper"
 	glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption."
 
-/datum/reagent/consumable/ethanol/bug_zapper/on_mob_life(mob/living/carbon/M)
-	if(isinsect(M) || isflyperson(M) || ismoth(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "bug"
 
-/datum/reagent/consumable/ethanol/mush_crush
+/datum/reagent/consumable/ethanol/species_drink/mush_crush
 	name = "Mush Crush"
 	color = "#F5882A" //(222, 250, 205)
 	description = "Soil in a glass."
@@ -2383,14 +2361,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Mush Crush"
 	glass_desc = "Popular among people that want to grow their own food rather than drink the soil."
 
-/datum/reagent/consumable/ethanol/mush_crush/on_mob_life(mob/living/carbon/M)
-	if(ispodperson(M) || ismush(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "plant"
 
-/datum/reagent/consumable/ethanol/darkbrew
+/datum/reagent/consumable/ethanol/species_drink/darkbrew
 	name = "Darkbrew"
 	color = "#000000" //(0, 0, 0)
 	description = "Contained dark matter mixed with coffee."
@@ -2400,14 +2373,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Darkbrew"
 	glass_desc = "A pitch black drink that's commonly confused with a type of coffee."
 
-/datum/reagent/consumable/ethanol/darkbrew/on_mob_life(mob/living/carbon/M)
-	if(isshadow(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "shadow"
 
-/datum/reagent/consumable/ethanol/hollow_bone
+/datum/reagent/consumable/ethanol/species_drink/hollow_bone
 	name = "Hollow Bone"
 	color = "#FCF7D4" //(252, 247, 212)
 	description = "Shockingly none-harmful mix of toxins and milk."
@@ -2415,16 +2383,11 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "Milk and salt"
 	glass_icon_state = "hollow_bone"
 	glass_name = "skull of Hollow Bone"
-	glass_desc = "Mixing of milk and bone hurting juice for enjoyment for rather skinny people."
+	glass_desc = "Mixing of milk and bone hurting juice for the enjoyment of rather skinny people."
 
-/datum/reagent/consumable/ethanol/hollow_bone/on_mob_life(mob/living/carbon/M)
-	if(isplasmaman(M) || isskeleton(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "skeleton"
 
-/datum/reagent/consumable/ethanol/frisky_kitty
+/datum/reagent/consumable/ethanol/species_drink/frisky_kitty
 	name = "Frisky Kitty"
 	color = "#FCF7D4" //(252, 247, 212)
 	description = "Warm milk mixed with a catnip."
@@ -2434,14 +2397,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "cup of Drisky Kitty"
 	glass_desc = "Warm milk and some catnip."
 
-/datum/reagent/consumable/ethanol/frisky_kitty/on_mob_life(mob/living/carbon/M)
-	if(ismammal(M) || iscatperson(M)) //well its not to bad for mammals
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "furry"
 
-/datum/reagent/consumable/ethanol/jell_wyrm
+/datum/reagent/consumable/ethanol/species_drink/jell_wyrm
 	name = "Jell Wyrm"
 	color = "#FF6200" //(255, 98, 0)
 	description = "Horrible mix of Co2, toxins and heat. Meant for slime based life."
@@ -2451,15 +2409,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Jell Wyrm"
 	glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for."
 
-/datum/reagent/consumable/ethanol/jell_wyrm/on_mob_life(mob/living/carbon/M)
-	if(isjellyperson(M) || isstartjelly(M) || isslimeperson(M) || isluminescent(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-		M.adjustToxLoss(1, 0) //Low tox due to being carp + jell toxins.
-	return ..()
+	species_required = "jelly"
 
-/datum/reagent/consumable/ethanol/laval_spit //Yes Laval
+/datum/reagent/consumable/ethanol/species_drink/laval_spit //Yes Laval
 	name = "Laval Spit"
 	color = "#DE3009" //(222, 48, 9)
 	description = "Heat minerals and some mauna loa. Meant for rock based life."
@@ -2469,15 +2421,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "glass of Laval Spit"
 	glass_desc = "Piping hot drink for those who can stomach the heat of lava."
 
-/datum/reagent/consumable/ethanol/laval_spit/on_mob_life(mob/living/carbon/M)
-	if(isgolem(M))
-		quality = RACE_DRINK
-	else
-		M.adjust_disgust(25)
-	return ..()
+	species_required = "golem"
 
 ///////////////
-//Barrle Wine//
+//Barrel Wine//
 ///////////////
 
 /datum/reagent/consumable/ethanol/fruit_wine
diff --git a/tgstation.dme b/tgstation.dme
index 2c5d30e2b7..b2c5ff47a9 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2484,6 +2484,7 @@
 #include "code\modules\mob\living\carbon\human\species_types\synthliz.dm"
 #include "code\modules\mob\living\carbon\human\species_types\synths.dm"
 #include "code\modules\mob\living\carbon\human\species_types\vampire.dm"
+#include "code\modules\mob\living\carbon\human\species_types\xeno.dm"
 #include "code\modules\mob\living\carbon\human\species_types\zombies.dm"
 #include "code\modules\mob\living\carbon\monkey\combat.dm"
 #include "code\modules\mob\living\carbon\monkey\death.dm"