diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 0ff3ef3fba..57bf8848d5 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -401,6 +401,9 @@
 	if("waggingtail_human" in dna.species.mutant_bodyparts)
 		dna.species.mutant_bodyparts -= "waggingtail_human"
 		dna.species.mutant_bodyparts |= "tail_human"
+	if("mam_waggingtail" in dna.species.mutant_bodyparts)
+		dna.species.mutant_bodyparts -= "mam_waggingtail"
+		dna.species.mutant_bodyparts |= "mam_tail"
 	update_body()
 
 /mob/living/carbon/human/proc/OpenWings()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 0ee251c78b..a46a527223 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -448,7 +448,6 @@
 				bodypart = "tail"
 			else if(bodypart == "waggingtail_lizard" || bodypart == "waggingtail_human" || bodypart == "mam_waggingtail")
 				bodypart = "waggingtail"
-
 			if(bodypart == "mam_ears")
 				bodypart = "ears"
 
@@ -493,6 +492,7 @@
 							I.color = "#[H.eye_color]"
 				else
 					I.color = forced_colour
+
 			standing += I
 
 			if(S.hasinner)
@@ -508,6 +508,44 @@
 
 				standing += I
 
+			if(S.extra)
+				if(S.gender_specific)
+					icon_string = "[g]_[bodypart]_extra_[S.icon_state]_[layer]"
+				else
+					icon_string = "m_[bodypart]_extra_[S.icon_state]_[layer]"
+
+				I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer)
+
+				if(S.center)
+					I = center_image(I,S.dimension_x,S.dimension_y)
+
+				switch(S.extra_color_src)
+					if(MUTCOLORS)
+						if(fixed_mut_color)
+							I.color = "#[fixed_mut_color]"
+						else
+							I.color = "#[H.dna.features["mcolor"]]"
+					if(MUTCOLORS2)
+						if(fixed_mut_color2)
+							I.color = "#[fixed_mut_color2]"
+						else
+							I.color = "#[H.dna.features["mcolor2"]]"
+					if(MUTCOLORS3)
+						if(fixed_mut_color3)
+							I.color = "#[fixed_mut_color3]"
+						else
+							I.color = "#[H.dna.features["mcolor3"]]"
+					if(HAIR)
+						if(hair_color == "mutcolor")
+							I.color = "#[H.dna.features["mcolor"]]"
+						else
+							I.color = "#[H.hair_color]"
+					if(FACEHAIR)
+						I.color = "#[H.facial_hair_color]"
+					if(EYECOLOR)
+						I.color = "#[H.eye_color]"
+				standing += I
+
 		H.overlays_standing[layer] = standing.Copy()
 		standing = list()
 
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index fc8ce3a9b0..4c2f57b38b 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -316,10 +316,6 @@
 /datum/species/jelly/slime/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	..()
 	if(ishuman(C))
-		slime_split = new
-		slime_split.Grant(C)
-		swap_body = new
-		swap_body.Grant(C)
 
 		if(!bodies || !bodies.len)
 			bodies = list(C)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 5739bf379d..ab73e2ca32 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -60,7 +60,7 @@
 	var/dimension_x = 32
 	var/dimension_y = 32
 	var/center = FALSE	//Should we center the sprite?
-
+	var/extra_icon = 'icons/mob/mam_bodyparts.dmi'
 //////////////////////
 // Hair Definitions //
 //////////////////////
@@ -1457,10 +1457,12 @@
 /datum/sprite_accessory/mam_tails/fox
 	name = "Fox"
 	icon_state = "fox"
+	extra = 1
 
 /datum/sprite_accessory/mam_tails_animated/fox
 	name = "Fox"
 	icon_state = "fox"
+	extra = 1
 
 /datum/sprite_accessory/snouts/fox
 	name = "Fox"
diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi
index 0a2c9f9e37..169d833340 100644
Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index c03d342095..5614abfa87 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ