From 91da4afcac5bfe4b4d52ba266624d9589dfcda07 Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 7 Jul 2015 18:43:59 -0400 Subject: [PATCH] Removes machinedir on in machine_processing.dm and machine_stacking.dm --- code/modules/mining/machine_processing.dm | 6 ++++-- code/modules/mining/machine_stacking.dm | 7 +++++-- polaris.dme | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 649dee1e1e..052c47987a 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -8,16 +8,18 @@ anchored = 1 var/obj/machinery/mineral/processing_unit/machine = null - var/machinedir = EAST + //var/machinedir = EAST //Dumb var/show_all_ores = 0 /obj/machinery/mineral/processing_unit_console/New() ..() spawn(7) - src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) + //src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) + src.machine = locate(/obj/machinery/mineral/processing_unit) in range(5,src) if (machine) machine.console = src else + world << "Warning: Ore processing machine console at [src.x], [src.y], [src.z] could not find its machine!" qdel(src) /obj/machinery/mineral/processing_unit_console/attack_hand(mob/user) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 6e548c6aa5..290ce829d9 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -7,17 +7,20 @@ density = 1 anchored = 1 var/obj/machinery/mineral/stacking_machine/machine = null - var/machinedir = SOUTHEAST + //var/machinedir = SOUTHEAST //This is really dumb, so lets burn it with fire. /obj/machinery/mineral/stacking_unit_console/New() ..() spawn(7) - src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) + //src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) //No. + src.machine = locate(/obj/machinery/mineral/stacking_machine) in range(5,src) if (machine) machine.console = src else + //Silently failing and causing mappers to scratch their heads while runtiming isn't ideal. + world << "Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!" qdel(src) /obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user) diff --git a/polaris.dme b/polaris.dme index c5e7444196..71c79786bc 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1761,4 +1761,5 @@ #include "maps\colony-1.dmm" #include "maps\colony-2.dmm" #include "maps\colony-4.dmm" +#include "maps\colony-7.dmm" // END_INCLUDE