Datum abductors refactor

code/datums/antagonists/datum_abductor.dm

@@ -0,0 +1,60 @@
+/datum/antagonist/abductor
+	name = "Abductor"
+	var/datum/objective_team/abductor_team/team
+	var/sub_role
+	var/outfit
+	var/landmark_type
+	var/greet_text
+
+/datum/antagonist/abductor/agent
+	sub_role = "Agent"
+	outfit = /datum/outfit/abductor/agent
+	landmark_type = /obj/effect/landmark/abductor/agent
+	greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve."
+
+/datum/antagonist/abductor/scientist
+	sub_role = "Scientist"
+	outfit = /datum/outfit/abductor/scientist
+	landmark_type = /obj/effect/landmark/abductor/scientist
+	greet_text = "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve."
+
+/datum/antagonist/abductor/New(datum/mind/new_owner, datum/objective_team/abductor_team/T)
+	team = T
+	return ..()
+
+/datum/antagonist/abductor/on_gain()
+	SSticker.mode.abductors += owner
+	owner.special_role = "[name] [sub_role]"
+	owner.objectives += team.objectives
+	finalize_abductor()
+	return ..()
+
+/datum/antagonist/abductor/on_removal()
+	SSticker.mode.abductors -= owner
+	team.members -= owner
+	owner.objectives -= team.objectives
+	if(owner.current)
+		to_chat(owner.current,"<span class='userdanger'>You are no longer the [owner.special_role]!</span>")
+	owner.special_role = null
+	return ..()
+
+/datum/antagonist/abductor/greet()
+	to_chat(owner.current, "<span class='notice'>You are the [owner.special_role]!</span>")
+	to_chat(owner.current, "<span class='notice'>With the help of your teammate, kidnap and experiment on station crew members!</span>")
+	to_chat(owner.current, "<span class='notice'>[greet_text]</span>")
+	owner.announce_objectives()
+
+/datum/antagonist/abductor/proc/finalize_abductor()
+	//Equip
+	var/mob/living/carbon/human/H = owner.current
+	H.set_species(/datum/species/abductor)
+	H.real_name = "[team.name] [sub_role]"
+	H.equipOutfit(outfit)
+
+	//Teleport to ship
+	for(var/obj/effect/landmark/abductor/LM in GLOB.landmarks_list)
+		if(istype(LM, landmark_type) && LM.team_number == team.team_number)
+			H.forceMove(LM.loc)
+			break
+
+	SSticker.mode.update_abductor_icons_added(owner)

code/datums/mind.dm

@@ -590,8 +590,6 @@
 		if(src in SSticker.mode.abductors)
 			text += "<b>Abductor</b> | <a href='?src=\ref[src];abductor=clear'>human</a>"
 			text += " | <a href='?src=\ref[src];common=undress'>undress</a> | <a href='?src=\ref[src];abductor=equip'>equip</a>"
-		else
-			text += "<a href='?src=\ref[src];abductor=abductor'>abductor</a> | <b>human</b>"
 
 		if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special))
 			text += " | Enabled in Prefs"
@@ -1244,13 +1242,6 @@
 			if("clear")
 				to_chat(usr, "Not implemented yet. Sorry!")
 				//SSticker.mode.update_abductor_icons_removed(src)
-			if("abductor")
-				if(!ishuman(current))
-					to_chat(usr, "<span class='warning'>This only works on humans!</span>")
-					return
-				make_Abductor()
-				log_admin("[key_name(usr)] turned [current] into abductor.")
-				SSticker.mode.update_abductor_icons_added(src)
 			if("equip")
 				if(!ishuman(current))
 					to_chat(usr, "<span class='warning'>This only works on humans!</span>")
@@ -1497,6 +1488,7 @@
 	var/fail = 0
 	fail |= !SSticker.mode.equip_revolutionary(current)
 
+<<<<<<< HEAD
 /datum/mind/proc/make_Abductor()
 	var/role = alert("Abductor Role ?","Role","Agent","Scientist")
 	var/team = input("Abductor Team ?","Team ?") in list(1,2,3,4)
@@ -1542,6 +1534,8 @@
 				L = scientist_landmarks[team]
 		H.forceMove(L.loc)
 
+=======
+>>>>>>> 18f329a... Datum abductors refactor (#30893)
 /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
 	spell_list += S
 	S.action.Grant(current)