diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index e0ecb66f910..39e933b373d 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -96158,9 +96158,7 @@
},
/area/security/execution)
"vSO" = (
-/obj/machinery/mineral/stacking_unit_console{
- machinedir = 5
- },
+/obj/machinery/mineral/stacking_unit_console,
/turf/simulated/wall,
/area/maintenance/disposal)
"vSU" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index aa47c63e308..d2a7b234ca1 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -2905,7 +2905,6 @@
/area/maintenance/port)
"arO" = (
/obj/machinery/mineral/stacking_unit_console{
- machinedir = 8;
pixel_x = 32
},
/obj/structure/cable/yellow{
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index a803f17fb07..93c20a8ab23 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -33019,9 +33019,7 @@
/turf/simulated/floor/beach/sand,
/area/hallway/secondary/exit)
"bGQ" = (
-/obj/machinery/mineral/stacking_unit_console{
- machinedir = 8
- },
+/obj/machinery/mineral/stacking_unit_console,
/turf/simulated/wall,
/area/maintenance/disposal)
"bGR" = (
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index f7f9565d8cb..cc1eead3e15 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -33,7 +33,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = FALSE
- var/machinedir = SOUTH
var/inserted_id_uid
var/obj/item/radio/intercom/announcer
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index b63234eafdf..40736a57b2e 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -19,16 +19,16 @@
density = TRUE
anchored = TRUE
var/obj/machinery/mineral/processing_unit/machine = null
- var/machinedir = EAST
speed_process = TRUE
/obj/machinery/mineral/processing_unit_console/Initialize(mapload)
. = ..()
- machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir))
- if(machine)
- machine.CONSOLE = src
- else
- return INITIALIZE_HINT_QDEL
+ for(var/obj/machinery/mineral/processing_unit/found_machine in range(1, src))
+ machine = found_machine
+ machine.console = src
+ return //needed to break for loop
+
+ CRASH("[src] failed to link to a mineral processing unit!")
/obj/machinery/mineral/processing_unit_console/attack_ghost(mob/user)
return open_ui(user)
@@ -82,7 +82,7 @@
icon_state = "furnace"
density = TRUE
anchored = TRUE
- var/obj/machinery/mineral/CONSOLE = null
+ var/obj/machinery/mineral/console = null
var/on = FALSE
var/selected_material = MAT_METAL
var/selected_alloy = null
@@ -95,7 +95,7 @@
files = new /datum/research/smelter(src)
/obj/machinery/mineral/processing_unit/Destroy()
- CONSOLE = null
+ console = null
QDEL_NULL(files)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
materials.retrieve_all()
@@ -115,8 +115,8 @@
else if(selected_alloy)
smelt_alloy()
- if(CONSOLE)
- CONSOLE.updateUsrDialog()
+ if(console)
+ console.updateUsrDialog()
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
@@ -126,8 +126,8 @@
else
materials.insert_item(O)
qdel(O)
- if(CONSOLE)
- CONSOLE.updateUsrDialog()
+ if(console)
+ console.updateUsrDialog()
/obj/machinery/mineral/processing_unit/proc/get_machine_data()
var/dat = "Smelter control console
"
@@ -138,7 +138,7 @@
if(selected_material == mat_id)
dat += " Smelting"
else
- dat += " Not Smelting "
+ dat += " Not Smelting "
dat += "
"
dat += "
"
@@ -150,16 +150,16 @@
if(selected_alloy == D.id)
dat += " Smelting"
else
- dat += " Not Smelting "
+ dat += " Not Smelting "
dat += "
"
dat += "
"
//On or off
dat += "Machine is currently "
if(on)
- dat += "On "
+ dat += "On "
else
- dat += "Off "
+ dat += "Off "
return dat
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index d1399879490..6e591cce413 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -8,15 +8,15 @@
density = FALSE
anchored = TRUE
var/obj/machinery/mineral/stacking_machine/machine
- var/machinedir = SOUTHEAST
/obj/machinery/mineral/stacking_unit_console/Initialize(mapload)
. = ..()
- machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
- if(machine)
+ for(var/obj/machinery/mineral/stacking_machine/found_machine in range(1, src))
+ machine = found_machine
machine.console = src
- else
- return INITIALIZE_HINT_QDEL
+ return
+
+ CRASH("[src] failed to link to a stacking machine!")
/obj/machinery/mineral/stacking_unit_console/Destroy()
if(machine)