[MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544)
* Fixes emagged cleanbot acid attack doing no damage (#33848) * Fixes emagged cleanbot acid attack doing no damage
This commit is contained in:
committed by
kevinz000
parent
b45ae2078f
commit
8aed987bd9
@@ -160,13 +160,13 @@
|
||||
if(!bodyzone_hit || bodyzone_hit == "head")
|
||||
if(wear_mask)
|
||||
if(!(wear_mask.resistance_flags & UNACIDABLE))
|
||||
wear_mask.acid_act(acidpwr)
|
||||
wear_mask.acid_act(acidpwr, acid_volume)
|
||||
else
|
||||
to_chat(src, "<span class='warning'>Your mask protects you from the acid.</span>")
|
||||
return
|
||||
if(head)
|
||||
if(!(head.resistance_flags & UNACIDABLE))
|
||||
head.acid_act(acidpwr)
|
||||
head.acid_act(acidpwr, acid_volume)
|
||||
else
|
||||
to_chat(src, "<span class='warning'>Your hat protects you from the acid.</span>")
|
||||
return
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
if(!target) //Search for decals then.
|
||||
target = scan(/obj/effect/decal/cleanable)
|
||||
|
||||
|
||||
if(!target) //Checks for remains
|
||||
target = scan(/obj/effect/decal/remains)
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
say(phrase)
|
||||
victim.emote("scream")
|
||||
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
|
||||
victim.acid_act(5, 2, 100)
|
||||
victim.acid_act(5, 100)
|
||||
else if(A == src) // Wets floors and spawns foam randomly
|
||||
if(prob(75))
|
||||
var/turf/open/T = loc
|
||||
|
||||
Reference in New Issue
Block a user