Merge pull request #11198 from Fox-McCloud/Ohhhhhhhhhhhhhh-sssssshiiittttt-antttttssssss

OHHHH SHITTTT ANTTTSSS
This commit is contained in:
variableundefined
2019-04-02 18:26:26 +08:00
committed by GitHub
11 changed files with 101 additions and 62 deletions
@@ -1049,6 +1049,11 @@
update_flags |= M.adjustToxLoss(1, FALSE)
return ..() | update_flags
/datum/reagent/pestkiller/reaction_obj(obj/O, volume)
if(istype(O, /obj/effect/decal/ants))
O.visible_message("<span class='warning'>The ants die.</span>")
qdel(O)
/datum/reagent/pestkiller/reaction_mob(mob/living/M, method=TOUCH, volume)
if(iscarbon(M))
var/mob/living/carbon/C = M
@@ -113,7 +113,7 @@
to_chat(user, "<span class='warning'>You cannot fill [target] while it is sealed.</span>")
return
else if(istype(target, /obj/effect/decal/cleanable)) //stops splashing while scooping up fluids
else if(istype(target, /obj/effect/decal)) //stops splashing while scooping up fluids
return
else if(reagents.total_volume)
@@ -11,6 +11,7 @@
volume = 100
consume_sound = null
taste = FALSE
antable = FALSE
/obj/item/reagent_containers/food/pill/New()
..()