Resolved Conflicts:

_maps/map_files/tgstation.2.1.3.dmm

code/controllers/supply_shuttle.dm

@@ -171,24 +171,18 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
 	proc/send()
 		var/area/from
 		var/area/dest
-		var/area/the_shuttles_way
 		switch(at_station)
 			if(1)
 				from = locate(SUPPLY_STATION_AREATYPE)
 				dest = locate(SUPPLY_DOCK_AREATYPE)
-				the_shuttles_way = from
 				at_station = 0
 			if(0)
 				from = locate(SUPPLY_DOCK_AREATYPE)
 				dest = locate(SUPPLY_STATION_AREATYPE)
-				the_shuttles_way = dest
 				at_station = 1
+		dest.clear_docking_area()
 		moving = 0
 
-		//Do I really need to explain this loop?
-		for(var/mob/living/unlucky_person in the_shuttles_way)
-			unlucky_person.gib()
-
 		from.move_contents_to(dest)
 
 	//Check whether the shuttle is allowed to move