part 3

code/modules/admin/admin.dm

@@ -749,6 +749,10 @@ var/global/nologevent = 0
 		if (ticker.mode.config_tag == "changeling")
 			return 2
 		return 1
+	if(M.mind in ticker.mode.abductors)
+		if (ticker.mode.config_tag == "abduction")
+			return 2
+		return 1
 	if(isrobot(M))
 		var/mob/living/silicon/robot/R = M
 		if(R.emagged)

code/modules/admin/player_panel.dm

@@ -515,6 +515,12 @@
 		if(ticker.mode.shadowling_thralls.len)
 			dat += check_role_table("Shadowling Thralls", ticker.mode.shadowling_thralls, src)
 
+		if(ticker.mode.abductors.len)
+			dat += check_role_table("Abductors", ticker.mode.abductors, src)
+
+		if(ticker.mode.abductees.len)
+			dat += check_role_table("Abductees", ticker.mode.abductees, src)
+
 		if(ticker.mode.vampires.len)
 			dat += check_role_table("Vampires", ticker.mode.vampires, src)
 

code/modules/admin/topic.dm

@@ -63,6 +63,10 @@
 				log_admin("[key_name(usr)] has spawned vox raiders.")
 				if(!src.makeVoxRaiders())
 					to_chat(usr, "\red Unfortunately there weren't enough candidates available.")
+			if("9")
+				log_admin("[key_name(usr)] has spawned an abductor team.")
+				if(!src.makeAbductorTeam())
+					to_chat(usr, "\red Unfortunately there weren't enough candidates available.")
 
 	else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"] || href_list["dbsearchip"] || href_list["dbsearchcid"] || href_list["dbsearchbantype"])
 		var/adminckey = href_list["dbsearchadmin"]

code/modules/admin/verbs/one_click_antag.dm

@@ -21,6 +21,7 @@ client/proc/one_click_antag()
 		<a href='?src=\ref[src];makeAntag=6'>Make Wizard (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=7'>Make Vampires</a><br>
 		<a href='?src=\ref[src];makeAntag=8'>Make Vox Raiders (Requires Ghosts)</a><br>
+		<a href='?src=\ref[src];makeAntag=9'>Make Abductor Team (Requires Ghosts)</a><br>
 		"}
 	usr << browse(dat, "window=oneclickantag;size=400x400")
 	return
@@ -308,8 +309,10 @@ client/proc/one_click_antag()
 	return 1
 
 
-
-
+//Abductors
+/datum/admins/proc/makeAbductorTeam()
+	new /datum/event/abductor
+	return 1
 
 /datum/admins/proc/makeAliens()
 	alien_infestation(3)

code/modules/client/preferences.dm

@@ -25,6 +25,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	ROLE_NINJA = 21,
 	ROLE_MUTINEER = 21,
 	ROLE_MALF = 30,
+	ROLE_ABDUCTOR = 30,
 )
 
 /proc/player_old_enough_antag(client/C, role)

code/modules/events/abductor.dm

@@ -0,0 +1,49 @@
+/datum/event/abductor
+
+/datum/event/abductor/start()
+	if(!makeAbductorTeam())
+		message_admins("Abductor event failed to find players. Retrying in 30s.")
+		spawn(300)
+			makeAbductorTeam()
+
+/datum/event/abductor/proc/makeAbductorTeam()
+	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an Abductor Team?", ROLE_ABDUCTOR, 1)
+
+	if(candidates.len >= 2)
+		//Oh god why we can't have static functions
+		var/number =  ticker.mode.abductor_teams + 1
+
+		var/datum/game_mode/abduction/temp
+		if(ticker.mode.config_tag == "abduction")
+			temp = ticker.mode
+		else
+			temp = new
+
+		var/agent_mind = pick(candidates)
+		candidates -= agent_mind
+		var/scientist_mind = pick(candidates)
+
+		var/mob/living/carbon/human/agent=makeBody(agent_mind)
+		var/mob/living/carbon/human/scientist=makeBody(scientist_mind)
+
+		agent_mind = agent.mind
+		scientist_mind = scientist.mind
+
+		temp.scientists.len = number
+		temp.agents.len = number
+		temp.abductors.len = 2*number
+		temp.team_objectives.len = number
+		temp.team_names.len = number
+		temp.scientists[number] = scientist_mind
+		temp.agents[number] = agent_mind
+		temp.abductors |= list(agent_mind,scientist_mind)
+		temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind)
+		temp.post_setup_team(number)
+
+		ticker.mode.abductor_teams++
+
+		if(ticker.mode.config_tag != "abduction")
+			ticker.mode.abductors |= temp.abductors
+		return 1
+	else
+		return 0

code/modules/events/event_container.dm

@@ -178,10 +178,11 @@ var/list/event_last_fired = list()
 	severity = EVENT_LEVEL_MAJOR
 	available_events = list(
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing",			/datum/event/nothing,			1320),
-		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration",	/datum/event/carp_migration,	0,	list(ASSIGNMENT_SECURITY =  3), 1),
-		//new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach",	/datum/event/prison_break/station,	0,	list(ASSIGNMENT_ANY = 5)),
-		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob",			/datum/event/blob, 				0,	list(ASSIGNMENT_ENGINEER = 30), 1),
-		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave",		/datum/event/meteor_wave,		0,	list(ASSIGNMENT_ENGINEER =  3),	1),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration",	/datum/event/carp_migration,	0,						list(ASSIGNMENT_SECURITY =  3), 1),
+		//new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach",	/datum/event/prison_break/station,	0,			list(ASSIGNMENT_ANY = 5)),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob",			/datum/event/blob, 				0,						list(ASSIGNMENT_ENGINEER = 30), 1),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave",		/datum/event/meteor_wave,		0,						list(ASSIGNMENT_ENGINEER =  3),	1),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Abductor Visit",	/datum/event/abductor, 		    80, is_one_shot = 1),
 		new /datum/event_meta/alien(EVENT_LEVEL_MAJOR, "Alien Infestation",	/datum/event/alien_infestation, 		0,		list(ASSIGNMENT_SECURITY = 30), 1),
 	)
 

code/modules/mob/living/carbon/human/species/abdcutor.dm

@@ -1,14 +1,14 @@
 /datum/species/abductor
 	name = "Abductor"
 	name_plural = "Abductors"
-	icobase = 'icons/mob/human_races/r_grey.dmi'
-	deform = 'icons/mob/human_races/r_def_grey.dmi'
+	icobase = 'icons/mob/human_races/r_abductor.dmi'
+	deform = 'icons/mob/human_races/r_abductor.dmi'
 	path = /mob/living/carbon/human/abductor
 	language = "Abductor Mindlink"
 	default_language = "Abductor Mindlink"
 	unarmed_type = /datum/unarmed_attack/punch
 	darksight = 3
-	eyes = "grey_eyes_s"
+	eyes = "blank_eyes"
 
 	flags = HAS_LIPS | NO_BLOOD | NO_BREATHE
 	virus_immune = 1