Fixes revolutionary deconversion messages and logging

2017-09-23 12:05:53 -04:00
parent f8eef1755f
commit 894673ef97
5 changed files with 17 additions and 10 deletions
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1441,7 +1441,7 @@
 						H.adjust_blurriness(10)

 					if(prob(I.force + ((100 - H.health)/2)) && H != user)
-						SSticker.mode.remove_revolutionary(H.mind)
+						SSticker.mode.remove_revolutionary(H.mind, FALSE, user)

 				if(bloody)	//Apply blood
 					if(H.wear_mask)
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -1,5 +1,5 @@
 /mob/living/silicon/Login()
 	if(mind && SSticker.mode)
 		SSticker.mode.remove_cultist(mind, 0, 0)
-		SSticker.mode.remove_revolutionary(mind, 0)
+		SSticker.mode.remove_revolutionary(mind, TRUE)
 	..()
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -1,3 +1,4 @@
+<<<<<<< HEAD

 /mob/living/silicon/robot/Login()
 	..()
@@ -5,3 +6,10 @@
 	show_laws(0)
 	if(mind)
 		SSticker.mode.remove_revolutionary(mind)
+=======
+
+/mob/living/silicon/robot/Login()
+	..()
+	regenerate_icons()
+	show_laws(0)
+>>>>>>> 0407dcf... Fixes revolutionary deconversion messages and logging (#30956)