TG Sync 12/15/17

s

s

code/modules/shuttle/arrivals.dm

@@ -200,5 +200,5 @@
 /obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value)
 	switch(var_name)
 		if("perma_docked")
-			SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "ShA[var_value ? "s" : "g"]")
+			SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("arrivals shuttle", "[var_value ? "stopped" : "started"]"))
 	return ..()

code/modules/shuttle/emergency.dm

@@ -301,6 +301,7 @@
 					var/datum/DBQuery/query_round_shuttle_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET shuttle_name = '[name]' WHERE id = [GLOB.round_id]")
 					query_round_shuttle_name.Execute()
 
+
 		if(SHUTTLE_DOCKED)
 			if(time_left <= ENGINES_START_TIME)
 				mode = SHUTTLE_IGNITING

code/modules/shuttle/navigation_computer.dm

@@ -119,7 +119,7 @@
 		return
 
 	if(!my_port)
-		my_port = new /obj/docking_port/stationary()
+		my_port = new(locate(eyeobj.x - x_offset, eyeobj.y - y_offset, eyeobj.z))
 		my_port.name = shuttlePortName
 		my_port.id = shuttlePortId
 		my_port.height = shuttle_port.height
@@ -128,7 +128,6 @@
 		my_port.dwidth = shuttle_port.dwidth
 		my_port.hidden = shuttle_port.hidden
 	my_port.dir = the_eye.dir
-	my_port.loc = locate(eyeobj.x - x_offset, eyeobj.y - y_offset, eyeobj.z)
 	if(current_user.client)
 		current_user.client.images -= the_eye.placed_images
 

code/modules/shuttle/on_move.dm

@@ -15,6 +15,10 @@ All ShuttleMove procs go here
 // Only gets called if fromShuttleMove returns true first
 // returns the new move_mode (based on the old)
 /turf/proc/toShuttleMove(turf/oldT, move_mode, obj/docking_port/mobile/shuttle)
+	. = move_mode
+	if(!(. & MOVE_TURF))
+		return
+
 	var/shuttle_dir = shuttle.dir
 	for(var/i in contents)
 		var/atom/movable/thing = i
@@ -38,8 +42,6 @@ All ShuttleMove procs go here
 			else
 				qdel(thing)
 
-	return move_mode
-
 // Called on the old turf to move the turf data
 /turf/proc/onShuttleMove(turf/newT, list/movement_force, move_dir)
 	if(newT == src) // In case of in place shuttle rotation shenanigans.

code/modules/shuttle/shuttle.dm

@@ -568,7 +568,7 @@
 				continue
 			move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode)							//atoms
 
-		move_mode = oldT.fromShuttleMove(newT, underlying_turf_type, baseturf_cache, move_mode)	//turfs
+		move_mode = oldT.fromShuttleMove(newT, underlying_turf_type, baseturf_cache, move_mode)				//turfs
 		move_mode = newT.toShuttleMove(oldT, move_mode , src)												//turfs
 
 		if(move_mode & MOVE_AREA)

code/modules/shuttle/white_ship.dm

@@ -17,3 +17,4 @@
 	x_offset = -6
 	y_offset = -10
 	designate_time = 100
+