More lighting fixes

code/modules/shuttle/on_move.dm

@@ -8,9 +8,6 @@
 	forceMove(T1)
 	return 1
 
-/atom/movable/lighting_overlay/onShuttleMove()
-    return 0
-
 /obj/effect/landmark/shuttle_import/onShuttleMove()
     // Used for marking where to preview/load shuttles
     return 0
@@ -60,4 +57,5 @@
 /obj/machinery/door/airlock/postDock(obj/docking_port/stationary/S1)
 	. = ..()
 	if(!S1.lock_shuttle_doors && id_tag == "s_docking_airlock")
-		INVOKE_ASYNC(src, .proc/unlock)
+		INVOKE_ASYNC(src, .proc/unlock)
+

code/modules/shuttle/shuttle.dm

@@ -382,8 +382,9 @@
 	var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance)
 
 	//remove area surrounding docking port
+	var/area/A0
 	if(areaInstance.contents.len)
-		var/area/A0 = locate("[area_type]")
+		A0 = locate("[area_type]")
 		if(!A0)
 			A0 = new area_type(null)
 		for(var/turf/T0 in L0)
@@ -393,6 +394,8 @@
 		var/turf/T0 = i
 		if(!T0)
 			continue
+		if(A0)
+			T0.change_area(T0.loc, A0)
 		T0.empty(turf_type)
 
 	qdel(src, force=TRUE)

code/modules/shuttle/supply.dm

@@ -58,7 +58,7 @@
 
 		var/contcount
 		for(var/atom/A in T.contents)
-			if(istype(A,/atom/movable/lighting_overlay))
+			if(istype(A,/atom/movable/lighting_object))
 				continue
 			if(istype(A,/obj/machinery/light))
 				continue //hacky but whatever, shuttles need three spots each for this shit
@@ -750,18 +750,6 @@
 
 	frequency.post_signal(src, status_signal)
 
-/**********
-    MISC
- **********/
-/area/supply/station
-	name = "Supply Shuttle"
-	icon_state = "shuttle3"
-	requires_power = 0
-
-/area/supply/dock
-	name = "Supply Shuttle"
-	icon_state = "shuttle3"
-	requires_power = 0
 
 #undef ORDER_SCREEN_WIDTH
 #undef ORDER_SCREEN_HEIGHT