cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 04:26:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from Neerti/7/7/2015_machinedir_is_so_goddamn_dumb_why_does_it_exist

Browse Source 
Fixes #36
This commit is contained in:
Neerti
2015-07-07 18:53:15 -04:00
parent c3589638e6 91da4afcac
commit 37fb0de4a5
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+4 -2
View File
@@ -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 << "<span class='danger'>Warning: Ore processing machine console at [src.x], [src.y], [src.z] could not find its machine!</span>"
qdel(src)
/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
code/modules/mining/machine_stacking.dm
+5 -2
View File
@@ -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 << "<span class='danger'>Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!</span>"
qdel(src)
/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
polaris.dme
+1
View File
@@ -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