From 6c7ff25568ca570be7cecbdc4ebe905632755dec Mon Sep 17 00:00:00 2001 From: Menshin Date: Wed, 3 Sep 2014 09:47:47 +0200 Subject: [PATCH] *fixes reagents consuming extra units each ticks (#4608) *removed the inexistent reagent/plasma subtype of hellwater *hitting someone with unholy water in body with the bible now turns the unholy water in holy water instead of space cleaner --- code/game/objects/items/weapons/storage/book.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm index 3becca92514..b5b488c90e0 100644 --- a/code/game/objects/items/weapons/storage/book.dm +++ b/code/game/objects/items/weapons/storage/book.dm @@ -127,7 +127,7 @@ user << " You purify [A]." var/unholy2clean = A.reagents.get_reagent_amount("unholywater") A.reagents.del_reagent("unholywater") - A.reagents.add_reagent("cleaner",unholy2clean) //it cleans their soul, get it? I'll get my coat... + A.reagents.add_reagent("holywater",unholy2clean) /obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W as obj, mob/user as mob) playsound(src.loc, "rustle", 50, 1, -5) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index cce34d2f244..dc02c25ce4b 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -307,12 +307,12 @@ datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob) M.adjustBruteLoss(2) holder.remove_reagent(src.id, 1) -datum/reagent/plasma/hellwater //if someone has this in their system they've really pissed off an eldrich god +datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god name = "Hell Water" id = "hell_water" description = "YOUR FLESH! IT BURNS!" -datum/reagent/plasma/hellwater/on_mob_life(var/mob/living/M as mob) +datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob) M.fire_stacks = min(5,M.fire_stacks + 3) M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire M.adjustToxLoss(1) @@ -1199,7 +1199,7 @@ datum/reagent/spaceacillin reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 -datum/reagent/on_mob_life(var/mob/living/M as mob)//no more mr. panacea +datum/reagent/spaceacillin/on_mob_life(var/mob/living/M as mob)//no more mr. panacea holder.remove_reagent(src.id, 0.2) ..() return