manual merge

code/modules/station_goals/bsa.dm

@@ -161,8 +161,8 @@
 			return locate(world.maxx,y,z)
 	return get_turf(src)
 
-/obj/machinery/bsa/full/New(loc,cannon_direction = WEST)
-	..()
+/obj/machinery/bsa/full/Initialize(mapload, cannon_direction = WEST)
+	. = ..()
 	top_layer = top_layer || mutable_appearance(icon, layer = ABOVE_MOB_LAYER)
 	switch(cannon_direction)
 		if(WEST)

code/modules/vehicles/atv.dm

@@ -9,8 +9,8 @@
 	. = ..()
 	riding_datum = new/datum/riding/atv
 
-/obj/vehicle/atv/New()
-	..()
+/obj/vehicle/atv/Initialize()
+	.=..()
 	atvcover = atvcover || mutable_appearance(icon, "atvcover", ABOVE_MOB_LAYER)
 
 

code/modules/vehicles/speedbike.dm

@@ -15,20 +15,11 @@
 	overlay = overlay ||  mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
 	add_overlay(overlay)
 
-/obj/effect/overlay/temp/speedbike_trail
-	name = "speedbike trails"
-	icon_state = "ion_fade"
-	layer = BELOW_MOB_LAYER
-	duration = 10
-	randomdir = 0
 
-/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir)
-	..()
-	setDir(move_dir)
 
 /obj/vehicle/space/speedbike/Move(newloc,move_dir)
 	if(has_buckled_mobs())
-		new /obj/effect/overlay/temp/speedbike_trail(loc,move_dir)
+		new /obj/effect/overlay/temp/dir_setting/speedbike_trail(loc,move_dir)
 	. = ..()
 
 /obj/vehicle/space/speedbike/red