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

@@ -279,8 +279,9 @@
current_code = numeric_input
while(length(current_code) < 5)
current_code = "[current_code]-"
var/first_status = null
var/second_status = null
var/first_status
var/second_status
switch(ui_mode)
if(NUKEUI_AWAIT_DISK)
first_status = "DEVICE LOCKED"
@@ -304,6 +305,10 @@
first_status = "DEVICE DEPLOYED"
second_status = "THANK YOU"
data["status1"] = first_status
data["status2"] = second_status
data["anchored"] = anchored
return data
/obj/machinery/nuclearbomb/ui_act(action, params)

View File

@@ -38,14 +38,14 @@
var/coin_mat = MINERAL_MATERIAL_AMOUNT
for(var/sheets in 1 to 2)
if(materials.use_amount_mat(coin_mat, chosen))
if(materials.use_amount_type(coin_mat, chosen))
for(var/coin_to_make in 1 to 5)
create_coins()
produced_coins++
else
var/found_new = FALSE
for(var/datum/material/inserted_material in materials.materials)
var/amount = materials.get_material_amount(inserted_material)
var/amount = materials.get_item_material_amount(inserted_material)
if(amount)
chosen = inserted_material
@@ -68,7 +68,7 @@
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
for(var/datum/material/inserted_material in materials.materials)
var/amount = materials.get_material_amount(inserted_material)
var/amount = materials.get_item_material_amount(inserted_material)
if(!amount)
continue
@@ -88,26 +88,23 @@
/obj/machinery/mineral/mint/ui_act(action, params, datum/tgui/ui)
switch(action)
if ("startpress")
if (!processing)
if("startpress")
if(!processing)
produced_coins = 0
processing = TRUE
if ("stoppress")
if("stoppress")
processing = FALSE
if ("changematerial")
if("changematerial")
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
for(var/datum/material/mat in materials.materials)
if (params["material_name"] == mat.name)
if(params["material_name"] == mat.name)
chosen = mat
/obj/machinery/mineral/mint/proc/create_coins()
var/turf/T = get_step(src,output_dir)
var/temp_list = list()
temp_list[chosen] = 400
var/turf/T = get_step(src, output_dir)
if(T)
var/obj/item/O = new /obj/item/coin(src)
var/obj/item/storage/bag/money/B = locate(/obj/item/storage/bag/money, T)
O.set_custom_materials(temp_list)
if(!B)
B = new /obj/item/storage/bag/money(src)
unload_mineral(B)

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())

View File

@@ -443,8 +443,6 @@
do_flush()
flush_count = 0
ui.soft_update_fields()
if(flush && air_contents.return_pressure() >= SEND_PRESSURE) // flush can happen even without power
do_flush()