diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index d2f49a6cc70..86dbb2760f3 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -716,20 +716,19 @@ datum reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) if(!istype(M, /mob/living)) return - if(method == TOUCH || method == INGEST) + if(method == TOUCH) if(ishuman(M)) var/mob/living/carbon/human/H = M if(volume > 25) - if(method == TOUCH) - if(H.wear_mask) - H << "\red Your mask protects you from the acid!" - return + if(H.wear_mask) + H << "\red Your mask protects you from the acid!" + return - if(H.head) - H << "\red Your helmet protects you from the acid!" - return + if(H.head) + H << "\red Your helmet protects you from the acid!" + return if(!M.unacidable) if(prob(75)) @@ -743,6 +742,30 @@ datum else M.take_organ_damage(15,0) + if(method == INGEST) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + + if(volume < 10) + M << "The greenish acidic substance stings you, but isn't concentrated enough to harm you!" + + if(volume >=10 && volume <=25) + if(!H.unacidable) + M.take_organ_damage(min(max(volume-10,2)*2,20),0) + M.emote("scream") + + + if(volume > 25) + if(!M.unacidable) + if(prob(75)) + var/obj/item/organ/external/affecting = H.get_organ("head") + if(affecting) + affecting.take_damage(20, 0) + H.UpdateDamageIcon() + H.emote("scream") + else + M.take_organ_damage(15,0) + reaction_obj(var/obj/O, var/volume) if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40)) if(!O.unacidable) diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index 62c637c5abd..c173c5adbea 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -231,6 +231,15 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) if(ishuman(M)) var/mob/living/carbon/human/H = M + if(volume < 5) + M << "The blueish acidic substance stings you, but isn't concentrated enough to harm you!" + + if(volume >=5 && volume <=10) + if(!H.unacidable) + M.take_organ_damage(max(volume-5,2)*4,0) + M.emote("scream") + + if(volume > 10) if(method == TOUCH)