Fixes areastring grabbing area subtypes

2017-08-06 03:21:24 -05:00
parent 521c149627
commit a209582b8a
3 changed files with 40 additions and 0 deletions
@@ -0,0 +1,14 @@
+diff a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm	(rejected hunks)
+@@ -669,11 +669,7 @@
+ 		return
+ 
+ 	if(control_area)
+-		control_area = text2path(control_area) //resolves the string to path, then filters out instances generated by subtypes of the path in sortedAreas
+-		for(var/V in GLOB.sortedAreas)
+-			var/area/B = V
+-			if(B.type == control_area)
+-				control_area = V
+		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]")