Fixing more stuff

Mint machine compile fixes and the syndicate contractor program.
This commit is contained in:
Artur
2020-04-23 20:09:42 +03:00
parent 120615d472
commit f97f264fb7
16 changed files with 203 additions and 86 deletions
@@ -5,6 +5,7 @@
/obj/machinery/mineral
var/input_dir = NORTH
var/output_dir = SOUTH
var/needs_item_input
/obj/machinery/mineral/proc/unload_mineral(atom/movable/S)
S.forceMove(drop_location())
+28 -39
View File
@@ -9,7 +9,6 @@
input_dir = EAST
ui_x = 300
ui_y = 250
needs_item_input = TRUE
var/produced_coins = 0 // how many coins the machine has made in it's last cycle
var/processing = FALSE
@@ -35,19 +34,16 @@
chosen = SSmaterials.GetMaterialRef(chosen)
/obj/machinery/mineral/mint/pickup_item(datum/source, atom/movable/target, atom/oldLoc)
if(!istype(target, /obj/item/stack))
return
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
var/obj/item/stack/S = target
if(materials.insert_item(S))
qdel(S)
/obj/machinery/mineral/mint/process()
var/turf/T = get_step(src, input_dir)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
for(var/obj/item/stack/O in T)
var/inserted = materials.insert_item(O)
if(inserted)
qdel(O)
if(processing)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
var/datum/material/M = chosen
if(!M)
@@ -63,7 +59,7 @@
for(var/coin_to_make in 1 to 5)
create_coins()
produced_coins++
else
else
var/found_new = FALSE
for(var/datum/material/inserted_material in materials.materials)
var/amount = materials.get_material_amount(inserted_material)
@@ -71,34 +67,34 @@
if(amount)
chosen = inserted_material
found_new = TRUE
if(!found_new)
processing = FALSE
else
end_processing()
icon_state = "coinpress0"
/obj/machinery/mineral/mint/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Mint", name, ui_x, ui_y, master_ui, state)
ui = new(user, src, ui_key, "mint", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/machinery/mineral/mint/ui_data()
var/list/data = list()
data["inserted_materials"] = list()
data["chosen_material"] = null
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)
if(!amount)
continue
data["inserted_materials"] += list(list(
"material" = inserted_material.name,
"amount" = amount,
"amount" = amount
))
if(chosen == inserted_material)
data["chosen_material"] = inserted_material.name
@@ -108,25 +104,18 @@
return data;
/obj/machinery/mineral/mint/ui_act(action, params, datum/tgui/ui)
. = ..()
if(.)
return
if(action == "startpress")
if (!processing)
produced_coins = 0
processing = TRUE
begin_processing()
return TRUE
if (action == "stoppress")
processing = FALSE
end_processing()
return TRUE
if (action == "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)
chosen = mat
return TRUE
switch(action)
if ("startpress")
if (!processing)
produced_coins = 0
processing = TRUE
if ("stoppress")
processing = FALSE
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)
chosen = mat
/obj/machinery/mineral/mint/proc/create_coins()
var/turf/T = get_step(src,output_dir)