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

[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
parent 799e52c5b0 f4faabc87c
commit 250f55e072
27 changed files with 491 additions and 380 deletions
@@ -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)
 	..()