Compiles, just need to fix goonchat

This commit is contained in:
Artur
2019-12-31 23:20:36 +02:00
parent 8b8a112d2c
commit d04c09aba0
5 changed files with 32 additions and 23 deletions

View File

@@ -32,7 +32,7 @@
for(var/x in 1 to PILL_STYLE_COUNT)
var/list/SL = list()
SL["id"] = x
SL["className"] = assets.icon_class_name("pill[x]")
SL["className"] = assets.icon_tag("pill[x]")
pillStyles += list(SL)
. = ..()
@@ -503,19 +503,19 @@
var/amount = text2num(params["amount"])
var/to_container = params["to"]
// Custom amount
if (amount == -1)
if(amount == -1)
amount = text2num(input(
"Enter the amount you want to transfer:",
name, ""))
if (amount == null || amount <= 0)
if(amount == null || amount <= 0)
return FALSE
if (to_container == "buffer")
if(to_container == "buffer")
beaker.reagents.trans_id_to(src, reagent, amount)
return TRUE
if (to_container == "beaker" && mode)
if(to_container == "beaker" && mode)
reagents.trans_id_to(beaker, reagent, amount)
return TRUE
if (to_container == "beaker" && !mode)
if(to_container == "beaker" && !mode)
reagents.remove_reagent(reagent, amount)
return TRUE
return FALSE
@@ -624,7 +624,7 @@
"Maximum [vol_each_max] units per item.",
"How many units to fill?",
vol_each_max))
vol_each = CLAMP(round(vol_each), 0, vol_each_max)
vol_each = CLAMP(vol_each, 0, vol_each_max)
if(vol_each <= 0)
return FALSE
// Get item name

View File

@@ -1,4 +1,13 @@
#define REM REAGENTS_EFFECT_MULTIPLIER
GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
/proc/build_name2reagent()
. = list()
for (var/t in subtypesof(/datum/reagent))
var/datum/reagent/R = t
if (length(initial(R.name)))
.[ckey(initial(R.name))] = t
GLOBAL_LIST_INIT(name2reagent, build_name2reagent())