This commit is contained in:
Fox-McCloud
2015-04-08 19:54:19 -04:00
parent 891af5bbff
commit 993529a2b1
2 changed files with 40 additions and 8 deletions
+31 -8
View File
@@ -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 << "<span class = 'danger'>The greenish acidic substance stings you, but isn't concentrated enough to harm you!</span>"
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)
+9
View File
@@ -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 << "<span class = 'danger'>The blueish acidic substance stings you, but isn't concentrated enough to harm you!</span>"
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)