conflicts + undo loc changes

attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs

code/modules/vehicles/atv.dm

@@ -19,7 +19,7 @@
 
 obj/vehicle/atv/post_buckle_mob(mob/living/M)
 	if(has_buckled_mobs())
-		overlays += atvcover
+		add_overlay(atvcover)
 	else
 		overlays -= atvcover
 

code/modules/vehicles/pimpin_ride.dm

@@ -75,11 +75,11 @@
 
 
 /obj/vehicle/janicart/update_icon()
-	overlays.Cut()
+	cut_overlays()
 	if(mybag)
-		overlays += "cart_garbage"
+		add_overlay("cart_garbage")
 	if(floorbuffer)
-		overlays += "cart_buffer"
+		add_overlay("cart_buffer")
 
 
 /obj/vehicle/janicart/attack_hand(mob/user)

code/modules/vehicles/scooter.dm

@@ -54,7 +54,6 @@
 	icon_state = "skateboard"
 	vehicle_move_delay = 0//fast
 	density = 0
-	var/obj/item/weapon/melee/skateboard/linked_board
 
 /obj/vehicle/scooter/skateboard/post_buckle_mob(mob/living/M)//allows skateboards to be non-dense but still allows 2 skateboarders to collide with each other
 	if(has_buckled_mobs())
@@ -83,16 +82,9 @@
 		M << "<span class='warning'>You can't lift this up when somebody's on it.</span>"
 		return
 	if(over_object == M)
-		if(!linked_board)
-			linked_board = new /obj/item/weapon/melee/skateboard(src)
-			linked_board.linked_board = src
-		forceMove(linked_board)
-		M.put_in_hands(linked_board)
-
-/obj/vehicle/scooter/skateboard/Destroy()
-	if(linked_board)
-		qdel(linked_board)
-	..()
+		var/obj/item/weapon/melee/skateboard/board = new /obj/item/weapon/melee/skateboard()
+		M.put_in_hands(board)
+		qdel(src)
 
 //CONSTRUCTION
 /obj/item/scooter_frame

code/modules/vehicles/speedbike.dm

@@ -12,7 +12,7 @@
 	..()
 	overlay = image("icons/obj/bike.dmi", overlay_state)
 	overlay.layer = ABOVE_MOB_LAYER
-	overlays += overlay
+	add_overlay(overlay)
 
 /obj/effect/overlay/temp/speedbike_trail
 	name = "speedbike trails"