From 0372a042adec0bea6beae502e76664d018f5fa6e Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 9 Apr 2018 13:23:04 +0300 Subject: [PATCH 1/2] Merge pull request #37042 from ninjanomnom/just-the-area-I-needed Fixes underlying area grabbing subtypes --- code/modules/shuttle/docking.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm index 1d9b0f769b..df41f1f9e6 100644 --- a/code/modules/shuttle/docking.dm +++ b/code/modules/shuttle/docking.dm @@ -46,7 +46,12 @@ // The underlying old area is the area assumed to be under the shuttle's starting location // If it no longer/has never existed it will be created - var/area/underlying_old_area = locate(underlying_area_type) in GLOB.sortedAreas + var/area/underlying_old_area + for(var/i in GLOB.sortedAreas) // Locate grabs subtypes and we want a particular type + var/area/place = i + if(place.type == underlying_area_type) + underlying_old_area = place + break if(!underlying_old_area) underlying_old_area = new underlying_area_type(null)