From 10e85b488f7d931de74e9287042ba854be4fdabf Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Jul 2017 09:09:43 -0500 Subject: [PATCH] Fixes holodeck not having the correct area --- code/modules/holodeck/computer.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 8248a8b9b4..a543bebf55 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -49,9 +49,9 @@ /obj/machinery/computer/holodeck/LateInitialize() if(ispath(holodeck_type, /area)) - linked = locate(holodeck_type) in GLOB.sortedAreas + linked = pop(get_areas(holodeck_type, FALSE)) if(ispath(offline_program,/area)) - offline_program = locate(offline_program) in GLOB.sortedAreas + offline_program = pop(get_areas(offline_program), FALSE) // the following is necessary for power reasons if(!linked || !offline_program) log_world("No matching holodeck area found") @@ -134,9 +134,7 @@ for(var/turf/T in linked) if(prob(30)) - var/datum/effect_system/spark_spread/s = new - s.set_up(2, 1, T) - s.start() + do_sparks(2, 1, T) T.ex_act(3) T.hotspot_expose(1000,500,1) @@ -241,7 +239,7 @@ HE.deactivate(src) for(var/item in spawned) - derez(item, force) + derez(item, !force) program = A // note nerfing does not yet work on guns, should