From 29b867ad0ebf4b650994132dbf7dba0bbf2ee92b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 14 Aug 2017 18:42:52 -0500 Subject: [PATCH] Update portable_turret.dm --- code/game/machinery/porta_turret/portable_turret.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 038f0e0eba..f88578bbf9 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -667,14 +667,13 @@ ..() if(!mapload) return - if(control_area && istext(control_area)) - for(var/V in GLOB.sortedAreas) - var/area/A = V - if(A.name == control_area) - control_area = A - break - if(!control_area) + if(control_area) + control_area = get_area_instance_from_text(control_area) + if(control_area == null) + control_area = get_area(src) + stack_trace("Bad control_area path for [src], [src.control_area]") + else if(!control_area) control_area = get_area(src) for(var/obj/machinery/porta_turret/T in control_area)