Merge branch 'master' into development

This commit is contained in:
skull132
2018-04-06 21:53:02 +03:00
18 changed files with 74 additions and 34 deletions
@@ -54,7 +54,7 @@
if(safe_thing)
trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this)
user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='warning'>You try to squirt something into [target]'s eyes, but fail!</span>")
return
trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD)