Merge pull request #19687 from lzimann/patch-12

Holy water no longer adds confusion
This commit is contained in:
oranges
2016-08-05 12:08:50 +12:00
committed by GitHub
@@ -188,9 +188,6 @@
if("emote")
M.visible_message("<span class='warning'>[M] [pick("whimpers quietly", "shivers as though cold", "glances around in paranoia")].</span>")
if(data >= 75) // 30 units, 135 seconds
if (!M.confused)
M.confused = 1
M.confused += 3
if(iscultist(M) || is_handofgod_cultist(M) || is_handofgod_prophet(M) || is_servant_of_ratvar(M))
if(iscultist(M))
ticker.mode.remove_cultist(M.mind, 1, 1)
@@ -198,12 +195,11 @@
ticker.mode.remove_hog_follower(M.mind)
else if(is_servant_of_ratvar(M))
remove_servant_of_ratvar(M)
holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
M.jitteriness = 0
M.stuttering = 0
M.confused = 0
return
holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack
holder.remove_reagent(id, 0.4) //fixed consumption to prevent balancing going out of whack
/datum/reagent/water/holywater/reaction_turf(turf/T, reac_volume)
..()