Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630

[MIRROR] Datum rev & related upgrades to base datum antag

code/modules/mob/living/carbon/human/species.dm

@@ -1479,7 +1479,9 @@
 						H.adjust_blurriness(10)
 
 					if(prob(I.force + ((100 - H.health)/2)) && H != user)
-						SSticker.mode.remove_revolutionary(H.mind, FALSE, user)
+						var/datum/antagonist/rev/rev = H.mind.has_antag_datum(/datum/antagonist/rev)
+						if(rev)
+							rev.remove_revolutionary(FALSE, user)
 
 				if(bloody)	//Apply blood
 					if(H.wear_mask)

code/modules/mob/living/silicon/login.dm

@@ -1,5 +1,7 @@
 /mob/living/silicon/Login()
 	if(mind && SSticker.mode)
 		SSticker.mode.remove_cultist(mind, 0, 0)
-		SSticker.mode.remove_revolutionary(mind, TRUE)
+		var/datum/antagonist/rev/rev = mind.has_antag_datum(/datum/antagonist/rev)
+		if(rev)
+			rev.remove_revolutionary(TRUE)
 	..()