Moves tongues to mutanttongue var

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

@@ -0,0 +1,12 @@
+diff a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm	(rejected hunks)
+@@ -58,8 +58,9 @@
+ 	if(!(NOBLOOD in dna.species.species_traits))
+ 		internal_organs += new /obj/item/organ/heart
+ 
+-	internal_organs += new dna.species.mutanteyes()
++	internal_organs += new dna.species.mutanteyes
+ 	internal_organs += new dna.species.mutantears
++	internal_organs += new dna.species.mutanttongue
+ 	internal_organs += new /obj/item/organ/brain
+ 	..()
+ 

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

@@ -35,7 +35,7 @@
 	var/say_mod = "says"	// affects the speech message
 	var/list/default_features = list() // Default mutant bodyparts for this species. Don't forget to set one for every mutant bodypart you allow this species to have.
 	var/list/mutant_bodyparts = list() 	// Parts of the body that are diferent enough from the standard human model that they cause clipping with some equipment
-	var/list/mutant_organs = list(/obj/item/organ/tongue)		//Internal organs that are unique to this race.
+	var/list/mutant_organs = list()		//Internal organs that are unique to this race.
 	var/speedmod = 0	// this affects the race's speed. positive numbers make it move slower, negative numbers make it move faster
 	var/armor = 0		// overall defense for the race... or less defense, if it's negative.
 	var/brutemod = 1	// multiplier for brute damage
@@ -131,6 +131,7 @@
 	var/obj/item/organ/appendix/appendix = C.getorganslot("appendix")
 	var/obj/item/organ/eyes/eyes = C.getorganslot("eye_sight")
 	var/obj/item/organ/ears/ears = C.getorganslot("ears")
+	var/obj/item/organ/tongue/tongue = C.getorganslot("tongue")
 
 	if((NOBLOOD in species_traits) && heart)
 		heart.Remove(C)
@@ -153,6 +154,11 @@
 		ears = new mutantears
 		ears.Insert(C)
 
+		if(tongue)
+			qdel(tongue)
+			tongue = new mutanttongue
+			tongue.Insert(C)
+
 	if((!(NOBREATH in species_traits)) && !lungs)
 		if(mutantlungs)
 			lungs = new mutantlungs()

code/modules/mob/living/carbon/human/species.dm.rej

@@ -0,0 +1,18 @@
+diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
+@@ -66,15 +66,10 @@
+ 	//Flight and floating
+ 	var/override_float = 0
+ 
+-
+-	//Eyes
+ 	var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
+-
+-	//Ears
+ 	var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
+-
+-	//Hands
+ 	var/obj/item/mutanthands = null
++	var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue
+ 
+ ///////////
+ // PROCS //

code/modules/mob/living/carbon/human/species_types/abductors.dm

@@ -4,6 +4,6 @@
 	say_mod = "gibbers"
 	sexes = 0
 	species_traits = list(NOBLOOD,NOBREATH,VIRUSIMMUNE,NOGUNS,NOHUNGER)
-	mutant_organs = list(/obj/item/organ/tongue/abductor)
+	mutanttongue = /obj/item/organ/tongue/abductor
 	var/scientist = 0 // vars to not pollute spieces list with castes
-	var/team = 1
+	var/team = 1

code/modules/mob/living/carbon/human/species_types/android.dm

@@ -5,7 +5,7 @@
 	species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOFIRE,NOBLOOD,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER,EASYLIMBATTACHMENT)
 	meat = null
 	damage_overlay_type = "synth"
-	mutant_organs = list(/obj/item/organ/tongue/robot)
+	mutanttongue = /obj/item/organ/tongue/robot
 	limbs_id = "synth"
 
 /datum/species/android/on_species_gain(mob/living/carbon/C)
@@ -18,4 +18,4 @@
 	. = ..()
 	for(var/X in C.bodyparts)
 		var/obj/item/bodypart/O = X
-		O.change_bodypart_status(BODYPART_ORGANIC,FALSE, TRUE)
+		O.change_bodypart_status(BODYPART_ORGANIC,FALSE, TRUE)

code/modules/mob/living/carbon/human/species_types/flypeople.dm

@@ -2,7 +2,7 @@
 	name = "Flyperson"
 	id = "fly"
 	say_mod = "buzzes"
-	mutant_organs = list(/obj/item/organ/tongue/fly)
+	mutanttongue = /obj/item/organ/tongue/fly
 	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly
 
 /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm	(rejected hunks)
+@@ -6,7 +6,7 @@
+ 	default_color = "00FF00"
+ 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
+ 	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs")
+-	mutant_organs = list(/obj/item/organ/tongue/lizard)
++	mutanttongue = /obj/item/organ/tongue/lizard
+ 	coldmod = 1.5
+ 	heatmod = 0.67
+ 	default_features = list("mcolor" = "0F0", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")

code/modules/mob/living/carbon/human/species_types/plasmamen.dm

@@ -6,7 +6,7 @@
 	meat = /obj/item/stack/sheet/mineral/plasma
 	species_traits = list(NOBLOOD,RESISTCOLD,RADIMMUNE,NOTRANSSTING,VIRUSIMMUNE,NOHUNGER)
 	mutantlungs = /obj/item/organ/lungs/plasmaman
-	mutant_organs = list(/obj/item/organ/tongue/bone/plasmaman)
+	mutanttongue = /obj/item/organ/tongue/bone/plasmaman
 	dangerous_existence = 1 //So so much
 	blacklisted = 1 //See above
 	burnmod = 1.5
@@ -66,4 +66,4 @@
 	if(lastname)
 		randname += " [lastname]"
 
-	return randname
+	return randname

code/modules/surgery/organs/organ_internal.dm

@@ -125,16 +125,13 @@
 	if(!getorganslot("tongue"))
 		var/obj/item/organ/tongue/T
 
-		if(dna && dna.species)
-			for(var/tongue_type in dna.species.mutant_organs)
-				if(ispath(tongue_type, /obj/item/organ/tongue))
-					T = new tongue_type()
-					T.Insert(src)
+		if(dna && dna.species && dna.species.mutanttongue)
+			T = new dna.species.mutanttongue()
+		else
+			T = new()
 
 		// if they have no mutant tongues, give them a regular one
-		if(!T)
-			T = new()
-			T.Insert(src)
+		T.Insert(src)
 
 	if(!getorganslot("eye_sight"))
 		var/obj/item/organ/eyes/E