Merge branch 'master' into dynamic-transit

code/modules/shuttle/ripple.dm

@@ -8,6 +8,7 @@
 	anchored = TRUE
 	density = FALSE
 	layer = RIPPLE_LAYER
+	mouse_opacity = 1
 	alpha = 0
 
 	duration = 3 * SHUTTLE_RIPPLE_TIME

code/modules/shuttle/shuttle.dm

@@ -320,10 +320,8 @@
 /obj/docking_port/mobile/proc/cancel()
 	if(mode != SHUTTLE_CALL)
 		return
-	if(ripples.len)
-		for(var/i in ripples)
-			qdel(i)
-		ripples.Cut()
+
+	remove_ripples()
 
 	invertTimer()
 	mode = SHUTTLE_RECALL
@@ -380,6 +378,11 @@
 	for(var/t in turfs)
 		ripples += PoolOrNew(/obj/effect/overlay/temp/ripple, t)
 
+/obj/docking_port/mobile/proc/remove_ripples()
+	for(var/R in ripples)
+		qdel(R)
+	ripples.Cut()
+
 /obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/S1)
 	var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance)
 	var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir)
@@ -437,14 +440,12 @@
 		for(var/turf/T0 in L0)
 			A0.contents += T0
 
+
+	remove_ripples()
+
 	//move or squish anything in the way ship at destination
 	roadkill(L0, L1, S1.dir)
 
-	// Removes ripples
-	for(var/i in ripples)
-		qdel(i)
-	ripples.Cut()
-
 	for(var/i in 1 to L0.len)
 		var/turf/T0 = L0[i]
 		if(!T0)