From 3f7c657111739881c67c47ad604a4edeff2d6ffe Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 27 Sep 2019 12:01:03 +0100 Subject: [PATCH] Plate and pH (pHlate) --- code/modules/reagents/reagent_containers.dm | 8 ++++---- icons/obj/janitor.dmi | Bin 25234 -> 25593 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index a3eca2cd29..b3f9591f64 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -164,13 +164,13 @@ var/damage var/cause if(beaker_weakness_bitflag & PH_WEAK) - if(reagents.pH < 1.5) - damage = (1.5 - reagents.pH)/15 + if(reagents.pH < 2) + damage = (2 - reagents.pH)/20 cause = "from the extreme pH" playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1) - if(reagents.pH > 12.5) - damage = (reagents.pH - 12.5)/15 + if(reagents.pH > 12) + damage = (reagents.pH - 12)/20 cause = "from the extreme pH" playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1) diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 6aa4615dc1ae947f3b76f969998772a8f9f5c445..1e1033e38ec0120f128d615495198901cee3d65f 100644 GIT binary patch delta 5261 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 HY7_ZC+6Smg