From b5c322e00a2449b441ffb573f4c50135d0842e60 Mon Sep 17 00:00:00 2001
From: Mark van Alphen <markvanalphen2@gmail.com>
Date: Sat, 4 May 2019 04:30:13 +0200
Subject: [PATCH] Starlight/shuttle lighting fix

---
 _maps/map_files/MetaStation/z3.dmm | 2 +-
 _maps/map_files/MetaStation/z4.dmm | 2 +-
 code/modules/shuttle/shuttle.dm    | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/_maps/map_files/MetaStation/z3.dmm b/_maps/map_files/MetaStation/z3.dmm
index 3773dcf937e..6784ca8ceca 100644
--- a/_maps/map_files/MetaStation/z3.dmm
+++ b/_maps/map_files/MetaStation/z3.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
 /turf/space,
-/area/space/nearstation)
+/area/space)
 "ab" = (
 /obj/docking_port/stationary{
 	dheight = 9;
diff --git a/_maps/map_files/MetaStation/z4.dmm b/_maps/map_files/MetaStation/z4.dmm
index 65848fd6092..526fd945efd 100644
--- a/_maps/map_files/MetaStation/z4.dmm
+++ b/_maps/map_files/MetaStation/z4.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
 /turf/space,
-/area/space/nearstation)
+/area/space)
 "ab" = (
 /obj/structure/grille,
 /turf/simulated/floor/plating/airless,
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index f38c724ae41..9a4f948307d 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -382,9 +382,8 @@
 	var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance)
 
 	//remove area surrounding docking port
-	var/area/A0
 	if(areaInstance.contents.len)
-		A0 = locate("[area_type]")
+		var/area/A0 = locate("[area_type]")
 		if(!A0)
 			A0 = new area_type(null)
 		for(var/turf/T0 in L0)
@@ -394,8 +393,6 @@
 		var/turf/T0 = i
 		if(!T0)
 			continue
-		if(A0)
-			T0.change_area(T0.loc, A0)
 		T0.empty(turf_type)
 
 	qdel(src, force=TRUE)