Merge pull request #34229 from Robustin/deconversionfix

Fixed cultists deconverting via holy water not giving a message
This commit is contained in:
Leo
2018-01-10 19:46:01 -02:00
committed by GitHub
@@ -219,7 +219,7 @@
if(data >= 75) // 30 units, 135 seconds
if(iscultist(M) || is_servant_of_ratvar(M))
if(iscultist(M))
SSticker.mode.remove_cultist(M.mind, 1, 1)
SSticker.mode.remove_cultist(M.mind, FALSE, TRUE)
else if(is_servant_of_ratvar(M))
remove_servant_of_ratvar(M)
M.jitteriness = 0
@@ -1706,4 +1706,4 @@
if(isliving(M))
var/mob/living/L = M
L.remove_disability(DISABILITY_PACIFISM, CHEMICAL_DISABILITY)
..()
..()