Little change. More the same
This commit is contained in:
committed by
CitadelStationBot
parent
326d0bd29b
commit
178b41547d
@@ -119,10 +119,9 @@ Class Procs:
|
|||||||
var/critical_machine = FALSE //If this machine is critical to station operation and should have the area be excempted from power failures.
|
var/critical_machine = FALSE //If this machine is critical to station operation and should have the area be excempted from power failures.
|
||||||
var/list/occupant_typecache //if set, turned into typecache in Initialize, other wise, defaults to mob/living typecache
|
var/list/occupant_typecache //if set, turned into typecache in Initialize, other wise, defaults to mob/living typecache
|
||||||
var/atom/movable/occupant = null
|
var/atom/movable/occupant = null
|
||||||
var/unsecuring_tool = /obj/item/wrench
|
|
||||||
var/interact_open = FALSE // Can the machine be interacted with when in maint/when the panel is open.
|
var/interact_open = FALSE // Can the machine be interacted with when in maint/when the panel is open.
|
||||||
var/interact_offline = 0 // Can the machine be interacted with while de-powered.
|
var/interact_offline = 0 // Can the machine be interacted with while de-powered.
|
||||||
var/speed_process = 0 // Process as fast as possible?
|
var/speed_process = FALSE // Process as fast as possible?
|
||||||
var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
|
var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
|
||||||
|
|
||||||
/obj/machinery/Initialize()
|
/obj/machinery/Initialize()
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
anchored = TRUE
|
anchored = TRUE
|
||||||
var/obj/machinery/mineral/processing_unit/machine = null
|
var/obj/machinery/mineral/processing_unit/machine = null
|
||||||
var/machinedir = EAST
|
var/machinedir = EAST
|
||||||
speed_process = 1
|
speed_process = TRUE
|
||||||
|
|
||||||
/obj/machinery/mineral/processing_unit_console/Initialize()
|
/obj/machinery/mineral/processing_unit_console/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
input_dir = NORTH
|
input_dir = NORTH
|
||||||
output_dir = SOUTH
|
output_dir = SOUTH
|
||||||
req_access = list(ACCESS_MINERAL_STOREROOM)
|
req_access = list(ACCESS_MINERAL_STOREROOM)
|
||||||
speed_process = 1
|
speed_process = TRUE
|
||||||
circuit = /obj/item/circuitboard/machine/ore_redemption
|
circuit = /obj/item/circuitboard/machine/ore_redemption
|
||||||
var/req_access_reclaim = ACCESS_MINING_STATION
|
var/req_access_reclaim = ACCESS_MINING_STATION
|
||||||
var/obj/item/card/id/inserted_id
|
var/obj/item/card/id/inserted_id
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
anchored = TRUE
|
anchored = TRUE
|
||||||
var/obj/machinery/mineral/stacking_machine/machine = null
|
var/obj/machinery/mineral/stacking_machine/machine = null
|
||||||
var/machinedir = SOUTHEAST
|
var/machinedir = SOUTHEAST
|
||||||
speed_process = 1
|
speed_process = TRUE
|
||||||
|
|
||||||
/obj/machinery/mineral/stacking_unit_console/Initialize()
|
/obj/machinery/mineral/stacking_unit_console/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
icon_state = "unloader"
|
icon_state = "unloader"
|
||||||
density = TRUE
|
density = TRUE
|
||||||
anchored = TRUE
|
anchored = TRUE
|
||||||
|
<<<<<<< HEAD
|
||||||
input_dir = WEST
|
input_dir = WEST
|
||||||
output_dir = EAST
|
output_dir = EAST
|
||||||
speed_process = 1
|
speed_process = 1
|
||||||
@@ -29,4 +30,28 @@
|
|||||||
limit++
|
limit++
|
||||||
if (limit>=10)
|
if (limit>=10)
|
||||||
return
|
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
|
CHECK_TICK
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
var/processing = FALSE
|
var/processing = FALSE
|
||||||
var/chosen = MAT_METAL //which material will be used to make coins
|
var/chosen = MAT_METAL //which material will be used to make coins
|
||||||
var/coinsToProduce = 10
|
var/coinsToProduce = 10
|
||||||
speed_process = 1
|
speed_process = TRUE
|
||||||
|
|
||||||
|
|
||||||
/obj/machinery/mineral/mint/Initialize()
|
/obj/machinery/mineral/mint/Initialize()
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
var/turf/T = get_step(src, input_dir)
|
var/turf/T = get_step(src, input_dir)
|
||||||
if(!T)
|
if(!T)
|
||||||
return
|
return
|
||||||
|
|
||||||
GET_COMPONENT(materials, /datum/component/material_container)
|
GET_COMPONENT(materials, /datum/component/material_container)
|
||||||
for(var/obj/item/stack/sheet/O in T)
|
for(var/obj/item/stack/sheet/O in T)
|
||||||
materials.insert_stack(O, O.amount)
|
materials.insert_stack(O, O.amount)
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
var/list/affecting // the list of all items that will be moved this ptick
|
var/list/affecting // the list of all items that will be moved this ptick
|
||||||
var/id = "" // the control ID - must match controller ID
|
var/id = "" // the control ID - must match controller ID
|
||||||
var/verted = 1 // set to -1 to have the conveyour belt be inverted, so you can use the other corner icons
|
var/verted = 1 // set to -1 to have the conveyour belt be inverted, so you can use the other corner icons
|
||||||
speed_process = 1
|
speed_process = TRUE
|
||||||
|
|
||||||
/obj/machinery/conveyor/centcom_auto
|
/obj/machinery/conveyor/centcom_auto
|
||||||
id = "round_end_belt"
|
id = "round_end_belt"
|
||||||
@@ -208,7 +208,7 @@
|
|||||||
|
|
||||||
var/list/conveyors // the list of converyors that are controlled by this switch
|
var/list/conveyors // the list of converyors that are controlled by this switch
|
||||||
anchored = TRUE
|
anchored = TRUE
|
||||||
speed_process = 1
|
speed_process = TRUE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -126,7 +126,6 @@
|
|||||||
desc = "Long range bluespace artillery."
|
desc = "Long range bluespace artillery."
|
||||||
icon = 'icons/obj/lavaland/cannon.dmi'
|
icon = 'icons/obj/lavaland/cannon.dmi'
|
||||||
icon_state = "orbital_cannon1"
|
icon_state = "orbital_cannon1"
|
||||||
unsecuring_tool = null
|
|
||||||
var/static/mutable_appearance/top_layer
|
var/static/mutable_appearance/top_layer
|
||||||
var/ex_power = 3
|
var/ex_power = 3
|
||||||
var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it
|
var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it
|
||||||
|
|||||||
Reference in New Issue
Block a user