Merge remote-tracking branch 'origin/master' into semi-sync

code/modules/antagonists/traitor/classes/ai.dm

@@ -9,7 +9,7 @@
 		objective_count += forge_single_objective()
 
 	for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++)
-		var/datum/objective/assassinate/kill_objective = new
+		var/datum/objective/assassinate/once/kill_objective = new
 		kill_objective.owner = T.owner
 		kill_objective.find_target()
 		T.add_objective(kill_objective)

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

@@ -261,6 +261,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		return //prevent the AI from activating an already active doomsday
 	if (owner_AI.shunted)
 		return //prevent AI from activating doomsday while shunted.
+	if (istype(owner.loc, /obj/item/aicard))
+		return //prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then.
 	active = TRUE
 	set_us_up_the_bomb(owner)
 
@@ -327,6 +329,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	sleep(30)
 	if(QDELETED(owner) || owner.stat == DEAD)
 		return
+	if(istype(owner.loc, /obj/item/aicard))
+		to_chat(owner, "<span class='boldnotice'>Error: Signal transmission failed. Reason: Lost connection to network.</span>")
+		to_chat(owner, "<span class='warning'>You can't activate the doomsday device while inside an intelliCard!</span>")
+		return
 	priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", "aimalf")
 	set_security_level("delta")
 	var/obj/machinery/doomsday_device/DOOM = new(owner_AI)

code/modules/antagonists/xeno/xeno.dm

@@ -17,16 +17,16 @@
 	threat = 3
 
 /datum/antagonist/xeno/threat()
-	. = 1
+	. = 3
 	if(isalienhunter(owner))
-		. = 2
+		. = 6
 	else if(isaliensentinel(owner))
-		. = 4
+		. = 12
 	else if(isalienroyal(owner))
 		if(isalienqueen(owner))
-			. = 8
+			. = 24
 		else
-			. = 6
+			. = 18
 
 /datum/antagonist/xeno/create_team(datum/team/xeno/new_team)
 	if(!new_team)