Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Runtimes #770

Merged
merged 2 commits into from
Apr 20, 2017
Merged

Runtimes #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c41ab0
Update the way mining consoles liked with machines.
LethalGhost Apr 20, 2017
ae858c9
Fix OpenSpace drawing runtimes.
LethalGhost Apr 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions code/modules/mining/machine_processing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@
anchored = 1

var/obj/machinery/mineral/processing_unit/machine = null
var/machinedir = EAST
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) in range(3, src)
if (machine)
machine.console = src
else
qdel(src)
log_debug("[src] ([x],[y],[z]) can't find coresponding processing unit.")

/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
add_fingerprint(user)
Expand Down
5 changes: 2 additions & 3 deletions code/modules/mining/machine_stacking.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
density = 1
anchored = 1
var/obj/machinery/mineral/stacking_machine/machine = null
var/machinedir = SOUTHEAST

/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) in range(3, src)
if (machine)
machine.console = src
else
qdel(src)
log_debug("[src] ([x],[y],[z]) can't find coresponding staking unit.")

/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
add_fingerprint(user)
Expand Down
11 changes: 4 additions & 7 deletions code/modules/multiz/controller.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ var/datum/controller/process/open_space/OS_controller = null
#ifdef DEBUG_OPENSPACE
world << "Calc fast OS"
#endif
var/datum/ospace_data/current = null
for(var/i in levels)
current = i
for(var/datum/ospace_data/current in levels)
current.calc_fast()
SCHECK

Expand All @@ -62,13 +60,12 @@ var/datum/controller/process/open_space/OS_controller = null
world << "Calc normal OS"
#endif
normal_time = world.time + 30
for(var/i in levels)
current = i
current.calc(current.normal)
for(var/datum/ospace_data/current in levels)
current.calc_normal()
SCHECK

/datum/controller/process/open_space/proc/add_turf(var/turf/T)
var/datum/ospace_data/OD = levels[T.z]
var/datum/ospace_data/OD = (levels.len >= T.z) ? levels[T.z] : null
if(OD)
OD.add(list(T), LIST_FAST, 1)

Expand Down