Merge remote-tracking branch 'upstream/master' into snaxi2

code/modules/vehicles/bicycle.dm

@@ -24,10 +24,12 @@
 		buckled_mob.stop_sound_channel(CHANNEL_BICYCLE)
 	. =..()
 
-/obj/vehicle/ridden/bicycle/tesla_act() // :::^^^)))
+/obj/vehicle/ridden/bicycle/zap_act(zap_str, zap_flags, shocked_targets) // :::^^^)))
+	//This didn't work for 3 years because none ever tested it I hate life
 	name = "fried bicycle"
 	desc = "Well spent."
 	color = rgb(63, 23, 4)
 	can_buckle = FALSE
+	. = ..()
 	for(var/m in buckled_mobs)
 		unbuckle_mob(m,1)

code/modules/vehicles/ridden.dm

@@ -77,3 +77,7 @@
 	if(!force && occupant_amount() >= max_occupants)
 		return FALSE
 	return ..()
+
+/obj/vehicle/ridden/zap_act(zap_str, zap_flags, shocked_targets)
+	zap_buckle_check(zap_str)
+	. = ..()

code/modules/vehicles/sealed.dm

@@ -1,5 +1,6 @@
 /obj/vehicle/sealed
 	var/enter_delay = 20
+	flags_1 = BLOCK_FACE_ATOM_1
 
 /obj/vehicle/sealed/generate_actions()
 	. = ..()
@@ -51,7 +52,7 @@
 	if(randomstep)
 		var/turf/target_turf = get_step(exit_location(M), pick(GLOB.cardinals))
 		M.throw_at(target_turf, 5, 10)
-		
+
 	if(!silent)
 		M.visible_message("<span class='notice'>[M] drops out of \the [src]!</span>")
 	return TRUE
@@ -102,7 +103,13 @@
 			if(iscarbon(i))
 				var/mob/living/carbon/C = i
 				C.DefaultCombatKnockdown(40)
-			
-			
+
+
 /obj/vehicle/sealed/AllowDrop()
 	return FALSE
+
+/obj/vehicle/sealed/setDir(newdir)
+	. = ..()
+	for(var/k in occupants)
+		var/mob/M = k
+		M.setDir(newdir)