Update humanform.dm

code/game/gamemodes/changeling/powers/humanform.dm

@@ -1,35 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/changeling/humanform
-	name = "Human Form"
-	desc = "We change into a human."
-	chemical_cost = 5
-	req_dna = 1
-
-//Transform into a human.
-/obj/effect/proc_holder/changeling/humanform/sting_action(mob/living/carbon/user)
-	var/datum/changeling/changeling = user.mind.changeling
-	var/list/names = list()
-	for(var/datum/changelingprofile/prof in changeling.stored_profiles)
-		names += "[prof.name]"
-
-	var/chosen_name = input("Select the target DNA: ", "Target DNA", null) as null|anything in names
-	if(!chosen_name)
-		return
-
-	var/datum/changelingprofile/chosen_prof = changeling.get_dna(chosen_name)
-	if(!chosen_prof)
-		return
-	if(!user || user.notransform)
-		return 0
-	to_chat(user, "<span class='notice'>We transform our appearance.</span>")
-
-	changeling.purchasedpowers -= src
-
-	var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS)
-
-	changeling_transform(newmob, chosen_prof)
-	return TRUE
-=======
 /obj/effect/proc_holder/changeling/humanform
 	name = "Human Form"
 	desc = "We change into a human."
@@ -60,4 +28,3 @@
 
 	changeling_transform(newmob, chosen_prof)
 	return TRUE
->>>>>>> 70d0357... Ling datum antag standarization. (#32183)