further conversion

code/datums/datacore.dm

@@ -280,7 +280,7 @@ var/record_id_num = 1001
 		G.fields["p_stat"]		= "Active"
 		G.fields["m_stat"]		= "Stable"
 		G.fields["sex"]			= capitalize(H.gender)
-		G.fields["species"]		= H.get_species()
+		G.fields["species"]		= H.dna.species.name
 		G.fields["photo"]		= get_id_photo(H)
 		G.fields["photo-south"] = "'data:image/png;base64,[icon2base64(icon(G.fields["photo"], dir = SOUTH))]'"
 		G.fields["photo-west"] = "'data:image/png;base64,[icon2base64(icon(G.fields["photo"], dir = WEST))]'"

code/datums/diseases/kingstons.dm

@@ -16,26 +16,26 @@
 	switch(stage)
 		if(1)
 			if(prob(10))
-				if(affected_mob.get_species() == "Tajaran")
+				if(istajaran(affected_mob))
 					to_chat(affected_mob, "<span class='notice'>You feel good.</span>")
 				else
 					to_chat(affected_mob, "<span class='notice'>You feel like playing with string.</span>")
 		if(2)
 			if(prob(10))
-				if(affected_mob.get_species() == "Tajaran")
+				if(istajaran(affected_mob))
 					to_chat(affected_mob, "<span class='danger'>Something in your throat itches.</span>")
 				else
 					to_chat(affected_mob, "<span class='danger'>You NEED to find a mouse.</span>")
 		if(3)
 			if(prob(10))
-				if(affected_mob.get_species() == "Tajaran")
+				if(istajaran(affected_mob))
 					to_chat(affected_mob, "<span class='danger'>You feel something in your throat!</span>")
 					affected_mob.emote("cough")
 				else
 					affected_mob.say(pick(list("Mew", "Meow!", "Nya!~")))
 		if(4)
 			if(prob(5))
-				if(affected_mob.get_species() == "Tajaran")
+				if(istajaran(affected_mob))
 					affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a hairball!</span>", \
 													"<span class='userdanger'>You cough up a hairball!</span>")
 					affected_mob.Stun(5)
@@ -59,7 +59,7 @@
 	severity = BIOHAZARD
 	var/list/virspecies = list(/datum/species/human, /datum/species/tajaran, /datum/species/unathi,/datum/species/skrell, /datum/species/vulpkanin) //no karma races sorrys.
 	var/list/virsuffix = list("pox", "rot", "flu", "cough", "-gitis", "cold", "rash", "itch", "decay")
-	var/chosentype
+	var/datum/species/chosentype
 	var/chosensuff
 
 /datum/disease/kingstons/advanced/New()
@@ -70,26 +70,27 @@
 
 /datum/disease/kingstons/advanced/stage_act()
 	..()
-	switch(stage)
-		if(1)
-			if(prob(10))
-				to_chat(affected_mob, "<span class='notice'>You feel awkward.</span>")
-		if(2)
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You itch.</span>")
-		if(3)
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>Your skin starts to flake!</span>")
+	if(ishuman(affected_mob))
+		var/mob/living/carbon/human/twisted = affected_mob
+		switch(stage)
+			if(1)
+				if(prob(10))
+					to_chat(twisted, "<span class='notice'>You feel awkward.</span>")
+			if(2)
+				if(prob(10))
+					to_chat(twisted, "<span class='danger'>You itch.</span>")
+			if(3)
+				if(prob(10))
+					to_chat(twisted, "<span class='danger'>Your skin starts to flake!</span>")
 
-		if(4)
-			if(prob(5))
-				if(affected_mob.get_species() != chosentype)
-					affected_mob.visible_message("<span class='danger'>[affected_mob]'s skin splits and form contorts!</span>", \
-													"<span class='userdanger'>Your body mutates into a [chosentype]!</span>")
-					var/mob/living/carbon/human/twisted = affected_mob
-					twisted.set_species(chosentype)
-				else
-					affected_mob.visible_message("<span class='danger'>[affected_mob] scratches at thier skin!</span>", \
-													"<span class='userdanger'>You scratch your skin to try not to itch!</span>")
-					affected_mob.adjustBruteLoss(-5)
-					affected_mob.adjustStaminaLoss(5)
+			if(4)
+				if(prob(5))
+					if(!istype(twisted.dna.species, chosentype))
+						twisted.visible_message("<span class='danger'>[twisted]'s skin splits and form contorts!</span>", \
+														"<span class='userdanger'>Your body mutates into a [initial(chosentype.name)]!</span>")
+						twisted.set_species(chosentype)
+					else
+						twisted.visible_message("<span class='danger'>[twisted] scratches at thier skin!</span>", \
+														"<span class='userdanger'>You scratch your skin to try not to itch!</span>")
+						twisted.adjustBruteLoss(-5)
+						twisted.adjustStaminaLoss(5)

code/datums/diseases/transformation.dm

@@ -194,12 +194,12 @@
 		if(1)
 			if(ishuman(affected_mob))
 				var/mob/living/carbon/human/H = affected_mob
-				if(H.dna.species.name == "Slime People")
+				if(isslimeperson(H))
 					stage = 5
 		if(3)
 			if(ishuman(affected_mob))
 				var/mob/living/carbon/human/human = affected_mob
-				if(human.dna.species.name != "Slime People")
+				if(!isslimeperson(human))
 					human.set_species(/datum/species/slime)
 
 /datum/disease/transformation/corgi

code/datums/outfits/outfit_admin.dm

@@ -371,7 +371,7 @@
 	)
 
 /datum/outfit/admin/vox/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	if(H.get_species() == "Vox Armalis")
+	if(isvoxarmalis(H))
 		. = ..()
 	else
 		H.equip_vox_raider()