Little change. More the same

This commit is contained in:
Jordan Brown
2017-11-06 09:45:42 -05:00
committed by CitadelStationBot
parent 326d0bd29b
commit 178b41547d
8 changed files with 33 additions and 10 deletions

View File

@@ -10,7 +10,7 @@
anchored = TRUE
var/obj/machinery/mineral/processing_unit/machine = null
var/machinedir = EAST
speed_process = 1
speed_process = TRUE
/obj/machinery/mineral/processing_unit_console/Initialize()
. = ..()

View File

@@ -11,7 +11,7 @@
input_dir = NORTH
output_dir = SOUTH
req_access = list(ACCESS_MINERAL_STOREROOM)
speed_process = 1
speed_process = TRUE
circuit = /obj/item/circuitboard/machine/ore_redemption
var/req_access_reclaim = ACCESS_MINING_STATION
var/obj/item/card/id/inserted_id

View File

@@ -9,7 +9,7 @@
anchored = TRUE
var/obj/machinery/mineral/stacking_machine/machine = null
var/machinedir = SOUTHEAST
speed_process = 1
speed_process = TRUE
/obj/machinery/mineral/stacking_unit_console/Initialize()
. = ..()

View File

@@ -7,6 +7,7 @@
icon_state = "unloader"
density = TRUE
anchored = TRUE
<<<<<<< HEAD
input_dir = WEST
output_dir = EAST
speed_process = 1
@@ -29,4 +30,28 @@
limit++
if (limit>=10)
return
=======
input_dir = WEST
output_dir = EAST
speed_process = TRUE
/obj/machinery/mineral/unloading_machine/process()
var/turf/T = get_step(src,input_dir)
if(T)
var/limit
for(var/obj/structure/ore_box/B in T)
for (var/obj/item/ore/O in B)
B.contents -= O
unload_mineral(O)
limit++
if (limit>=10)
return
CHECK_TICK
CHECK_TICK
for(var/obj/item/I in T)
unload_mineral(I)
limit++
if (limit>=10)
return
>>>>>>> 8ccaba1... Merge pull request #32453 from Jalleo/machinery_refactor
CHECK_TICK

View File

@@ -11,7 +11,7 @@
var/processing = FALSE
var/chosen = MAT_METAL //which material will be used to make coins
var/coinsToProduce = 10
speed_process = 1
speed_process = TRUE
/obj/machinery/mineral/mint/Initialize()
@@ -22,7 +22,7 @@
var/turf/T = get_step(src, input_dir)
if(!T)
return
GET_COMPONENT(materials, /datum/component/material_container)
for(var/obj/item/stack/sheet/O in T)
materials.insert_stack(O, O.amount)