Merge branch 'master' into development

This commit is contained in:
skull132
2016-07-10 14:25:54 -04:00
42 changed files with 335 additions and 253 deletions

View File

@@ -65,7 +65,7 @@
return
else
trans = reagents.splash(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
trans = reagents.trans_to_obj(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
user << "<span class='notice'>You transfer [trans] units of the solution.</span>"
else // Taking from something