Somehow managed to break this during merge resolution.

This commit is contained in:
Zuhayr
2013-12-03 22:42:22 +10:30
parent 0a0a71a66c
commit 74fe8cd76a
+4 -2
View File
@@ -10,10 +10,10 @@
icon_state = "dispenser"
use_power = 0
idle_power_usage = 40
var/ui_name = "Chem Dispenser 5000"
var/ui_name = "Chem Dispenser 5000"
var/energy = 100
var/max_energy = 100
var/amount = 30
var/amount = 30
var/accept_glass = 0
var/beaker = null
var/recharged = 0
@@ -448,6 +448,8 @@
var/amount_per_pill = reagents.total_volume/count
if (amount_per_pill > 50) amount_per_pill = 50
var/name = reject_bad_text(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)"))
if(reagents.total_volume/count < 1) //Sanity checking.
return
while (count--)