Merge pull request #2917 from Citadel-Station-13/upstream-merge-30956

[MIRROR] Fixes revolutionary deconversion messages and logging
This commit is contained in:
LetterJay
2017-09-23 16:45:53 -04:00
committed by GitHub
5 changed files with 13 additions and 17 deletions
@@ -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)
+1 -1
View File
@@ -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)
..()
@@ -1,7 +1,4 @@
/mob/living/silicon/robot/Login()
..()
regenerate_icons()
show_laws(0)
if(mind)
SSticker.mode.remove_revolutionary(mind)
/mob/living/silicon/robot/Login()
..()
regenerate_icons()
show_laws(0)