shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Holy water will now properly make you jittery

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-05 18:33:34 -05:00
parent 39876074ca
commit b993d9ad23
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/other_reagents.dm
+2 -2
View File
@@ -189,7 +189,7 @@
/datum/reagent/water/holywater/on_mob_life(mob/living/M) /datum/reagent/water/holywater/on_mob_life(mob/living/M)
if(!data) data = 1 if(!data) data = 1
data++ data++
M.jitteriness = max(M.jitteriness-5,0) M.jitteriness = min(M.jitteriness+4,10)
if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
if(!M.stuttering) if(!M.stuttering)
M.stuttering = 1 M.stuttering = 1
@@ -212,9 +212,9 @@
SSticker.mode.remove_cultist(M.mind, 1, 1) SSticker.mode.remove_cultist(M.mind, 1, 1)
else if(is_servant_of_ratvar(M)) else if(is_servant_of_ratvar(M))
remove_servant_of_ratvar(M) remove_servant_of_ratvar(M)
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.jitteriness = 0
M.stuttering = 0 M.stuttering = 0
holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
return return
holder.remove_reagent(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