From f45515eaee26b416ce29067e95926021707e7f22 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 7 Nov 2017 03:28:38 -0600
Subject: [PATCH] Update transform.dm

---
 .../gamemodes/changeling/powers/transform.dm  | 138 ++----------------
 1 file changed, 10 insertions(+), 128 deletions(-)

diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm
index ae7581eea8..a977bab3e0 100644
--- a/code/game/gamemodes/changeling/powers/transform.dm
+++ b/code/game/gamemodes/changeling/powers/transform.dm
@@ -1,131 +1,14 @@
-/obj/effect/proc_holder/changeling/transform
-	name = "Transform"
-	desc = "We take on the appearance and voice of one we have absorbed."
-	chemical_cost = 5
-	dna_cost = 0
-	req_dna = 1
-	req_human = 1
-
-/obj/item/clothing/glasses/changeling
-	name = "flesh"
+/obj/effect/proc_holder/changeling/transform
+	name = "Transform"
+	desc = "We take on the appearance and voice of one we have absorbed."
+	chemical_cost = 5
+	dna_cost = 0
+	req_dna = 1
+	req_human = 1
+
+/obj/item/clothing/glasses/changeling
+	name = "flesh"
 	flags_1 = NODROP_1
-<<<<<<< HEAD
-
-/obj/item/clothing/glasses/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/clothing/under/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-
-/obj/item/clothing/under/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/clothing/suit/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-	allowed = list(/obj/item/changeling)
-
-/obj/item/clothing/suit/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/clothing/head/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-
-/obj/item/clothing/head/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/clothing/shoes/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-
-/obj/item/clothing/shoes/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/clothing/gloves/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-
-/obj/item/clothing/gloves/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/clothing/mask/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-
-/obj/item/clothing/mask/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-/obj/item/changeling
-	name = "flesh"
-	flags_1 = NODROP_1
-	slot_flags = ALL
-	allowed = list(/obj/item/changeling)
-
-/obj/item/changeling/attack_hand(mob/user)
-	if(loc == user && user.mind && user.mind.changeling)
-		to_chat(user, "<span class='notice'>You reabsorb [src] into your body.</span>")
-		qdel(src)
-		return
-	..()
-
-//Change our DNA to that of somebody we've absorbed.
-/obj/effect/proc_holder/changeling/transform/sting_action(mob/living/carbon/human/user)
-	var/datum/changeling/changeling = user.mind.changeling
-	var/datum/changelingprofile/chosen_prof = changeling.select_dna("Select the target DNA: ", "Target DNA", user)
-
-	if(!chosen_prof)
-		return
-
-	changeling_transform(user, chosen_prof)
-	return TRUE
-
-/datum/changeling/proc/select_dna(var/prompt, var/title, var/mob/living/carbon/user)
-	var/list/names = list("Drop Flesh Disguise")
-	for(var/datum/changelingprofile/prof in stored_profiles)
-		names += "[prof.name]"
-
-	var/chosen_name = input(prompt, title, null) as null|anything in names
-	if(!chosen_name)
-		return
-
-	if(chosen_name == "Drop Flesh Disguise")
-		for(var/slot in GLOB.slots)
-			if(istype(user.vars[slot], GLOB.slot2type[slot]))
-				qdel(user.vars[slot])
-
-	var/datum/changelingprofile/prof = get_dna(chosen_name)
-	return prof
-=======
 
 /obj/item/clothing/glasses/changeling/attack_hand(mob/user)
 	if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling))
@@ -244,4 +127,3 @@
 
 	var/datum/changelingprofile/prof = get_dna(chosen_name)
 	return prof
->>>>>>> 70d0357... Ling datum antag standarization. (#32183)