Infiltration game mode

code/__DEFINES/role_preferences.dm

@@ -42,8 +42,9 @@
 #define ROLE_SHADOWLING 		"Shadowling" // Yogs
 #define ROLE_VAMPIRE			"Vampire" // Yogs
 #define ROLE_GANG				"gangster" // Yogs
-#define ROLE_DARKSPAWN			"darkspawn" //Yogs
+#define ROLE_DARKSPAWN			"darkspawn" // Yogs
 #define ROLE_HOLOPARASITE		"Holoparasite" // Yogs
+#define ROLE_INFILTRATOR		"Infiltrator" // Yogs
 #define ROLE_ZOMBIE				"Zombie"
 
 
@@ -77,6 +78,7 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_GANG = /datum/game_mode/gang, // yogs
 	ROLE_HERETIC = /datum/game_mode/heretics,
 	ROLE_HIVE = /datum/game_mode/hivemind,
+	ROLE_INFILTRATOR = /datum/game_mode/infiltration, // Yogs
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
 	ROLE_DARKSPAWN = /datum/game_mode/darkspawn,
 	ROLE_SENTIENCE,

code/__DEFINES/{yogs_defines}/antagonists.dm

@@ -1,8 +1,10 @@
-#define ANTAG_DATUM_VAMPIRE		/datum/antagonist/vampire
-#define ANTAG_DATUM_THRALL		/datum/antagonist/thrall
-#define ANTAG_DATUM_SLING		/datum/antagonist/shadowling
-#define ANTAG_DATUM_DARKSPAWN	/datum/antagonist/darkspawn
-#define ANTAG_DATUM_VEIL		/datum/antagonist/veil
+#define ANTAG_DATUM_VAMPIRE			/datum/antagonist/vampire
+#define ANTAG_DATUM_THRALL			/datum/antagonist/thrall
+#define ANTAG_DATUM_SLING			/datum/antagonist/shadowling
+#define ANTAG_DATUM_DARKSPAWN		/datum/antagonist/darkspawn
+#define ANTAG_DATUM_VEIL			/datum/antagonist/veil
+#define ANTAG_DATUM_INFILTRATOR		/datum/antagonist/infiltrator
+#define ANTAG_DATUM_HIJACKEDAI		/datum/antagonist/hijacked_ai
 
 #define NOT_DOMINATING			-1
 #define MAX_LEADERS_GANG		3

code/__DEFINES/{yogs_defines}/atom_hud.dm

@@ -1,2 +1,3 @@
 #define ANTAG_HUD_VAMPIRE 23
-#define ANTAG_HUD_DARKSPAWN	24
+#define ANTAG_HUD_DARKSPAWN	24
+#define ANTAG_HUD_INFILTRATOR 32

code/__DEFINES/{yogs_defines}/is_helpers.dm

@@ -12,6 +12,7 @@
 #define is_traitor(M) (istype(M, /mob/living) && M.mind && M.mind.has_antag_datum(/datum/antagonist/traitor) || is_mindslaved(M))
 #define is_blood_brother(M) (istype(M, /mob/living) && M.mind && M.mind.has_antag_datum(/datum/antagonist/brother))
 #define is_nukeop(M) (M.mind && M.mind.has_antag_datum(/datum/antagonist/nukeop)) // also detects clownOP
-#define is_syndicate(M) (istype(M, /mob/living) && is_traitor(M) || is_blood_brother(M) || is_nukeop(M))
+#define is_infiltrator(M) (M.mind && M.mind.has_antag_datum(/datum/antagonist/infiltrator))
+#define is_syndicate(M) (istype(M, /mob/living) && is_traitor(M) || is_blood_brother(M) || is_nukeop(M) || is_infiltrator(M))
 
-#define isspacepod(A) (istype(A, /obj/spacepod))
+#define isspacepod(A) (istype(A, /obj/spacepod))

code/__DEFINES/{yogs_defines}/misc.dm

@@ -1,3 +1,7 @@
 //Endgame Results
 #define GANG_LOSS 6
-#define GANG_TAKEOVER 7
+#define GANG_TAKEOVER 7
+#define INFILTRATION_ALLCOMPLETE 25
+#define INFILTRATION_MOSTCOMPLETE 26
+#define INFILTRATION_SOMECOMPLETE 27
+#define INFILTRATION_NONECOMPLETE 28 

code/datums/components/uplink.dm

@@ -245,8 +245,9 @@ GLOBAL_LIST_EMPTY(uplinks)
 	interact(null, implant.imp_in)
 
 /datum/component/uplink/proc/implanting(datum/source, list/arguments)
-	var/mob/user = arguments[2]
-	owner = "[user.key]"
+	var/mob/target = arguments[1]
+	var/mob/user = arguments[2] // YOGS START -- Fix runtime when implanting infiltrators
+	owner = "[user ? user.key : target.key]" // YOGS END
 
 /datum/component/uplink/proc/old_implant(datum/source, list/arguments, obj/item/implant/new_implant)
 	// It kinda has to be weird like this until implants are components

code/datums/hud.dm

@@ -38,6 +38,7 @@ GLOBAL_LIST_INIT(huds, list(
 	ANTAG_HUD_HERETIC = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_MINDSLAVE = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_ZOMBIE = new/datum/atom_hud/antag(),
+	ANTAG_HUD_INFILTRATOR = new/datum/atom_hud/antag() // Yogs
 	))
 
 /datum/atom_hud

code/game/gamemodes/objective.dm

@@ -175,6 +175,13 @@ GLOBAL_LIST_EMPTY(objectives)
 		explanation_text = team_explanation_text
 
 /datum/objective/proc/give_special_equipment(special_equipment)
+	if(istype(team, /datum/team/infiltrator))
+		for(var/eq_path in special_equipment)
+			if(eq_path)
+				for(var/turf/T in GLOB.infiltrator_objective_items)
+					if(!(eq_path in T.contents))
+						new eq_path(T)
+		return
 	var/datum/mind/receiver = pick(get_owners())
 	if(receiver && receiver.current)
 		if(ishuman(receiver.current))
@@ -661,6 +668,21 @@ GLOBAL_LIST_EMPTY(possible_items)
 			if(targetinfo && (I.type in targetinfo.altitems)) //Ok, so you don't have the item. Do you have an alternative, at least?
 				if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first!
 					return TRUE
+	if (istype(team, /datum/team/infiltrator))
+		for (var/area/A in world)
+			if (is_type_in_typecache(A, GLOB.infiltrator_objective_areas))
+				for (var/obj/item/I in A.GetAllContents()) //Check for items
+					if (istype(I, steal_target))
+						if (!targetinfo)
+							return TRUE
+						else if (targetinfo.check_special_completion(I))
+							return TRUE
+					if (targetinfo && (I.type in targetinfo.altitems))
+						if (targetinfo.check_special_completion(I))
+							return TRUE
+					CHECK_TICK
+			CHECK_TICK
+		CHECK_TICK
 	return FALSE
 
 GLOBAL_LIST_EMPTY(possible_items_special)
@@ -741,6 +763,14 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 			var/list/otherwise = M.GetAllContents()
 			for(var/obj/item/disk/tech_disk/TD in otherwise)
 				TD.stored_research.copy_research_to(checking)
+	if (istype(team, /datum/team/infiltrator))
+		for (var/area/A in world)
+			if (is_type_in_typecache(A, GLOB.infiltrator_objective_areas))
+				for (var/obj/item/disk/tech_disk/TD in A.GetAllContents()) //Check for items
+					TD.stored_research.copy_research_to(checking)
+				CHECK_TICK
+			CHECK_TICK
+		CHECK_TICK
 	return checking.researched_nodes.len >= target_amount
 
 /datum/objective/download/admin_edit(mob/admin)

code/modules/admin/topic.dm

@@ -204,6 +204,21 @@
 				else
 					message_admins("[key_name_admin(usr)] tried to create a shadowling. Unfortunately, there were no candidates available.")
 					log_admin("[key_name(usr)] failed to create a shadowling.")
+			if("vampire")
+				if(makeVampire())
+					message_admins("[key_name(usr)] created a vampire.")
+					log_admin("[key_name(usr)] created a vampire.")
+				else
+					message_admins("[key_name_admin(usr)] tried to create a vampire. Unfortunately, there were no candidates available.")
+					log_admin("[key_name(usr)] failed to create a vampire.")
+			if("infiltrator")
+				message_admins("[key_name(usr)] is creating an infiltration team...")
+				if(makeInfiltratorTeam())
+					message_admins("[key_name(usr)] created an infiltration team.")
+					log_admin("[key_name(usr)] created an infiltration team.")
+				else
+					message_admins("[key_name_admin(usr)] tried to create an infiltration team. Unfortunately, there were not enough candidates available.")
+					log_admin("[key_name(usr)] failed to create an infiltration team.")
 	else if(href_list["forceevent"])
 		if(!check_rights(R_FUN))
 			return

code/modules/admin/verbs/one_click_antag.dm

@@ -24,6 +24,8 @@
 		<a href='?src=[REF(src)];[HrefToken()];makeAntag=abductors'>Make Abductor Team (Requires Ghosts)</a><br>
 		<a href='?src=[REF(src)];[HrefToken()];makeAntag=revenant'>Make Revenant (Requires Ghost)</a><br>
 		<a href='?src=[REF(src)];[HrefToken()];makeAntag=shadowling'>Make Shadowling</a><br>
+		<a href='?src=[REF(src)];[HrefToken()];makeAntag=vampire'>Make Vampire</a><br>
+		<a href='?src=[REF(src)];[HrefToken()];makeAntag=infiltrator'>Make Infiltration Team (Requires Ghosts)</a>
 		"}
 
 	var/datum/browser/popup = new(usr, "oneclickantag", "Quick-Create Antagonist", 400, 400)

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

@@ -134,6 +134,9 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
 	/// Sound played when an ability is unlocked
 	var/unlock_sound
 
+/datum/AI_Module/proc/can_use(mob/living/silicon/ai/AI)
+	return TRUE
+
  /// Applies upgrades
 /datum/AI_Module/proc/upgrade(mob/living/silicon/ai/AI)
 	return
@@ -159,6 +162,9 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
 	power_type = /datum/action/innate/ai/nuke_station
 	unlock_text = span_notice("You slowly, carefully, establish a connection with the on-station self-destruct. You can now activate it at any time.")
 
+/datum/AI_Module/destructive/nuke_station/can_use(mob/living/silicon/ai/AI)
+	return !AI.mind.has_antag_datum(/datum/antagonist/hijacked_ai)
+
 /datum/action/innate/ai/nuke_station
 	name = "Doomsday Device"
 	desc = "Activates the doomsday device. This is not reversible."
@@ -545,6 +551,9 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
 	unlock_text = span_notice("You make contact with Space Amazon and request a robotics factory for delivery.")
 	unlock_sound = 'sound/machines/ping.ogg'
 
+/datum/AI_Module/utility/place_cyborg_transformer/can_use(mob/living/silicon/ai/AI)
+	return !AI.mind.has_antag_datum(/datum/antagonist/hijacked_ai)
+
 /datum/action/innate/ai/place_transformer
 	name = "Place Robotics Factory"
 	desc = "Places a machine that converts humans into cyborgs. Conveyor belts included!"

code/modules/clothing/chameleon.dm

@@ -212,7 +212,7 @@
 		thing.update_slot_icon()
 	UpdateButtonIcon()
 
-/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
+/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item, obj/item/target = src.target) //yogs -- add support for cham hardsuits
 	target.name = initial(picked_item.name)
 	target.desc = initial(picked_item.desc)
 	target.icon_state = initial(picked_item.icon_state)
@@ -225,6 +225,15 @@
 			var/obj/item/clothing/CL = I
 			var/obj/item/clothing/PCL = picked_item
 			CL.flags_cover = initial(PCL.flags_cover)
+	if(istype(target, /obj/item/clothing/suit/space/hardsuit/infiltration)) //YOGS START
+		var/obj/item/clothing/suit/space/hardsuit/infiltration/I = target
+		var/obj/item/clothing/suit/space/hardsuit/HS = picked_item
+		var/obj/item/clothing/head/helmet/helmet = initial(HS.helmettype)
+		I.head_piece.initial_state = initial(helmet.icon_state)
+		update_item(helmet, I.head_piece)
+		I.head_piece.update_icon()
+		qdel(helmet)
+		//YOGS END
 	target.icon = initial(picked_item.icon)
 
 /datum/action/item_action/chameleon/change/Trigger()

code/modules/mob/living/silicon/ai/life.dm

@@ -12,6 +12,7 @@
 		update_gravity(mob_has_gravity())
 
 		handle_status_effects()
+		process_hijack() // yogs
 
 		if(malfhack && malfhack.aidisabled)
 			deltimer(malfhacking)

code/modules/power/gravitygenerator.dm

@@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	return main_part.attackby(I, user)
 
 /obj/machinery/gravity_generator/part/get_status()
-	return main_part.get_status()
+	return main_part?.get_status()
 
 /obj/machinery/gravity_generator/part/attack_hand(mob/user)
 	return main_part.attack_hand(user)

code/modules/surgery/implant_removal.dm

@@ -34,26 +34,30 @@
 
 /datum/surgery_step/extract_implant/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	if(I)
-		display_results(user, target, span_notice("You successfully remove [I] from [target]'s [target_zone]."),
-			"[user] successfully removes [I] from [target]'s [target_zone]!",
-			"[user] successfully removes something from [target]'s [target_zone]!")
 		I.removed(target)
-
-		var/obj/item/implantcase/case
-		for(var/obj/item/implantcase/ic in user.held_items)
-			case = ic
-			break
-		if(!case)
-			case = locate(/obj/item/implantcase) in get_turf(target)
-		if(case && !case.imp)
-			case.imp = I
-			I.forceMove(case)
-			case.update_icon()
-			display_results(user, target, span_notice("You place [I] into [case]."),
-				"[user] places [I] into [case]!",
-				"[user] places it into [case]!")
+		if (QDELETED(I)) // yogs: properly handle self-deleting implants
+			display_results(user, target, span_notice("You remove [I] from [target]'s [target_zone], destroying it in the process!"),
+				"[user] removes [I] from [target]'s [target_zone], destroying it in the process!",
+				"[user] removes something from [target]'s [target_zone], destroying it in the process!")
 		else
-			qdel(I)
+			display_results(user, target, span_notice("You successfully remove [I] from [target]'s [target_zone]."),
+				"[user] successfully removes [I] from [target]'s [target_zone]!",
+				"[user] successfully removes something from [target]'s [target_zone]!")
+			var/obj/item/implantcase/case
+			for(var/obj/item/implantcase/ic in user.held_items)
+				case = ic
+				break
+			if(!case)
+				case = locate(/obj/item/implantcase) in get_turf(target)
+			if(case && !case.imp)
+				case.imp = I
+				I.forceMove(case)
+				case.update_icon()
+				display_results(user, target, span_notice("You place [I] into [case]."),
+					"[user] places [I] into [case]!",
+					"[user] places it into [case]!")
+			else
+				qdel(I)
 
 	else
 		to_chat(user, span_warning("You can't find anything in [target]'s [target_zone]!"))
@@ -68,4 +72,4 @@
 		/datum/surgery_step/mechanic_unwrench,
 		/datum/surgery_step/extract_implant,
 		/datum/surgery_step/mechanic_wrench,
-		/datum/surgery_step/mechanic_close)
+		/datum/surgery_step/mechanic_close)