Fixes missing objectives and antag status. (#2244)

code/datums/antagonists/datum_traitor.dm

@@ -23,6 +23,7 @@
 /datum/antagonist/traitor/human
 	should_specialise = FALSE
 	var/should_equip = TRUE
+
 /datum/antagonist/traitor/human/custom
 	silent = TRUE
 	should_give_codewords = FALSE
@@ -31,6 +32,7 @@
 
 /datum/antagonist/traitor/AI
 	should_specialise = FALSE
+
 /datum/antagonist/traitor/AI/custom
 	silent = TRUE
 	should_give_codewords = FALSE
@@ -38,9 +40,8 @@
 
 
 /datum/antagonist/traitor/on_body_transfer(mob/living/old_body, mob/living/new_body)
-	if(issilicon(new_body) && issilicon(old_body))
-		..()
-	else
+	// human <-> silicon only
+	if(old_body && issilicon(new_body) ^ issilicon(old_body))
 		silent = TRUE
 		owner.add_antag_datum(base_datum_custom)
 		for(var/datum/antagonist/traitor/new_datum in owner.antag_datums)
@@ -49,13 +50,14 @@
 			transfer_important_variables(new_datum)
 			break
 		on_removal()
-
-
+	else
+		..()
 
 /datum/antagonist/traitor/human/custom //used to give custom objectives
 	silent = TRUE
 	give_objectives = FALSE
 	should_give_codewords = FALSE
+
 /datum/antagonist/traitor/AI/custom //used to give custom objectives
 	silent = TRUE
 	give_objectives = FALSE
@@ -83,7 +85,8 @@
 	if(owner.assigned_role == "Clown")
 		var/mob/living/carbon/human/traitor_mob = owner.current
 		if(traitor_mob&&istype(traitor_mob))
-			if(!silent) to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
+			if(!silent) 
+				to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
 			traitor_mob.dna.remove_mutation(CLOWNMUT)
 
 /datum/antagonist/traitor/remove_innate_effects()