Combining Changeling's Transform and Change Species (#32584)

* fixes

* Update vgstation13.dme

code/datums/gamemode/powers/changeling.dm

@@ -37,13 +37,6 @@
 	spellpath = /spell/changeling/transform
 	allowduringhorrorform = 0
 
-/datum/power/changeling/change_species
-	name = "Change Species"
-	desc = "We take on the appearance of a species that we have absorbed."
-	cost = 0
-	spellpath = /spell/changeling/changespecies
-	allowduringhorrorform = 0
-
 /datum/power/changeling/fakedeath
 	name = "Regenerative Stasis"
 	desc = "We become weakened to a death-like state, where we will rise again from death."
@@ -68,7 +61,6 @@
 	allowduringhorrorform = 0
 
 // Hivemind
-
 /datum/power/changeling/hive_upload
 	name = "Hive Channel"
 	desc = "We can channel a DNA into the airwaves, allowing our fellow changelings to absorb it and transform into it as if they acquired the DNA themselves."

code/modules/spells/changeling/changespecies.dm

@@ -1,39 +0,0 @@
-/spell/changeling/changespecies
-	name = "Change Species (5)"
-	desc = "We take on the apperance of a species that we have absorbed."
-	abbreviation = "CS"
-	hud_state = "changespecies"
-
-	spell_flags = NEEDSHUMAN
-
-	chemcost = 5
-	required_dna = 1
-	max_genedamage = 0
-	horrorallowed = 0
-
-/spell/changeling/changespecies/cast(var/list/targets, var/mob/living/carbon/human/user)
-	var/datum/role/changeling/changeling = user.mind.GetRole(CHANGELING)
-
-	if(changeling.absorbed_species.len < 2)
-		to_chat(user, "<span class='warning'>We do not know of any other species genomes to use.</span>")
-		return
-
-	var/S = input("Select the target species: ", "Target Species", null) as null|anything in changeling.absorbed_species
-	if(!S)
-		return
-
-	domutcheck(user, null)
-
-	changeling.geneticdamage = 30
-
-	user.visible_message("<span class='danger'>[user] transforms!</span>")
-
-	user.set_species(S,1) //Until someone moves body colour into DNA, they're going to have to use the default.
-
-	user.regenerate_icons()
-	user.updateChangelingHUD()
-	user.changeling_update_languages(changeling.absorbed_languages)
-	feedback_add_details("changeling_powers","TR")
-
-	..()
-

code/modules/spells/changeling/transform.dm

@@ -36,13 +36,12 @@
 	user.visible_message("<span class='danger'>[user] transforms!</span>")
 	playsound(user, 'sound/effects/flesh_squelch.ogg', 30, 1)
 	changeling.geneticdamage = 30
-	var/oldspecies = user.dna.species
 	user.dna = chosen_dna.Clone()
 	user.real_name = chosen_dna.real_name
 	user.flavor_text = chosen_dna.flavor_text
+	user.set_species(user.dna.species, 1)
 	user.UpdateAppearance()
-	if(oldspecies != user.dna.species)
-		user.set_species(user.dna.species, 0)
+
 	domutcheck(user, null)
 	feedback_add_details("changeling_powers","TR")
 

vgstation13.dme

@@ -2650,7 +2650,6 @@
 #include "code\modules\spells\changeling\absorb_dna.dm"
 #include "code\modules\spells\changeling\armblade.dm"
 #include "code\modules\spells\changeling\changeling_spell.dm"
-#include "code\modules\spells\changeling\changespecies.dm"
 #include "code\modules\spells\changeling\evolutionmenu.dm"
 #include "code\modules\spells\changeling\hivedownload.dm"
 #include "code\modules\spells\changeling\hiveupload.dm"