Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/datums/mind.dm

@@ -67,6 +67,8 @@
 	var/datum/language_holder/language_holder
 	var/unconvertable = FALSE
 	var/late_joiner = FALSE
+	///has this mind ever been an AI
+	var/has_ever_been_ai = FALSE
 
 	var/force_escaped = FALSE  // Set by Into The Sunset command of the shuttle manipulator
 	var/list/learned_recipes //List of learned recipe TYPES.
@@ -286,6 +288,21 @@
 		if(O)
 			O.unlock_code = null
 
+/// Remove the antagonists that should not persist when being borged
+/datum/mind/proc/remove_antags_for_borging()
+	remove_antag_datum(/datum/antagonist/cult)
+
+	var/datum/antagonist/rev/revolutionary = has_antag_datum(/datum/antagonist/rev)
+	revolutionary?.remove_revolutionary(TRUE)
+
+	if(!isbrain(current))
+		return
+	if(!istype(current.loc, /obj/item/mmi))
+		return
+	var/obj/item/mmi/B = current.loc.loc
+	if(!istype(B.laws, /datum/ai_laws/ratvar))
+		remove_servant_of_ratvar(current, TRUE)
+
 /datum/mind/proc/remove_all_antag() //For the Lazy amongst us.
 	remove_changeling()
 	remove_traitor()
@@ -1644,7 +1661,7 @@ GLOBAL_LIST(objective_choices)
 			if(istype(S, type))
 				continue
 		S.charge_counter = delay
-		S.updateButtonIcon()
+		S.UpdateButton()
 		INVOKE_ASYNC(S, /obj/effect/proc_holder/spell.proc/start_recharge)
 
 /datum/mind/proc/get_ghost(even_if_they_cant_reenter)