remove antags for borging...

code/datums/mind.dm

@@ -293,7 +293,15 @@
 	remove_antag_datum(/datum/antagonist/cult)
 
 	var/datum/antagonist/rev/revolutionary = has_antag_datum(/datum/antagonist/rev)
-	revolutionary?.remove_revolutionary()
+	revolutionary?.remove_revolutionary(TRUE)
+
+	if(!isbrain(current))
+		return
+	if(!istype(loc, /obj/item/organ/brain))
+		return
+	var/obj/item/organ/brain/B = 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()

code/game/gamemodes/game_mode.dm

@@ -551,12 +551,6 @@
 
 	return max(0, enemy_minimum_age - C.player_age)
 
-/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie)
-	SSticker.mode.remove_cultist(newborgie, 0, 0)
-	var/datum/antagonist/rev/rev = newborgie.has_antag_datum(/datum/antagonist/rev)
-	if(rev)
-		rev.remove_revolutionary(TRUE)
-
 /datum/game_mode/proc/generate_station_goals()
 	if(flipseclevel && !(config_tag == "extended")) //CIT CHANGE - allows the sec level to be flipped roundstart
 		for(var/T in subtypesof(/datum/station_goal))

code/game/objects/items/robot/robot_parts.dm

@@ -292,9 +292,7 @@
 				if(M.laws.id == DEFAULT_AI_LAWID)
 					O.make_laws()
 
-			SSticker.mode.remove_antag_for_borging(BM.mind)
-			if(!istype(M.laws, /datum/ai_laws/ratvar))
-				remove_servant_of_ratvar(BM, TRUE)
+			BM.mind.remove_antags_for_borging()
 			BM.mind.transfer_to(O)
 
 			if(O.mind && O.mind.special_role)