diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index e9aa5afe92..e11eca2975 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -37,7 +37,7 @@
 		qdel(src)
 
 /datum/component/riding/proc/vehicle_mob_buckle(datum/source, mob/living/M, force)
-	handle_vehicle_offsets()
+	handle_vehicle_offsets(M.buckled?.dir)
 
 /datum/component/riding/proc/handle_vehicle_layer(dir)
 	var/atom/movable/AM = parent
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index df7ed66169..95efd90042 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1010,6 +1010,9 @@
 		riding_datum.ride_check_rider_restrained = TRUE
 	if(buckled_mobs && ((target in buckled_mobs) || (buckled_mobs.len >= max_buckled_mobs)) || buckled)
 		return
+	if(istype(target, /mob/living/silicon/pai))
+		hands_needed = 0
+		target_hands_needed = 0
 	var/equipped_hands_self
 	var/equipped_hands_target
 	if(hands_needed)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index a82151cc1d..eedc59d9d5 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -71,7 +71,7 @@
 	var/list/datum/bioware = list()
 
 	var/creamed = FALSE //to use with creampie overlays
-	var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
+	var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot, /mob/living/silicon/pai))
 	var/lastpuke = 0
 	var/account_id
 	var/last_fire_update
diff --git a/tgstation.dme b/tgstation.dme
index a0f5d54c03..88ea0be260 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -80,6 +80,7 @@
 #include "code\__DEFINES\monkeys.dm"
 #include "code\__DEFINES\move_force.dm"
 #include "code\__DEFINES\movement.dm"
+#include "code\__DEFINES\movement.dm"
 #include "code\__DEFINES\movespeed_modification.dm"
 #include "code\__DEFINES\nanites.dm"
 #include "code\__DEFINES\networks.dm"
@@ -203,6 +204,7 @@
 #include "code\__HELPERS\sorts\MergeSort.dm"
 #include "code\__HELPERS\sorts\TimSort.dm"
 #include "code\_globalvars\admin.dm"
+#include "code\_globalvars\admin.dm"
 #include "code\_globalvars\bitfields.dm"
 #include "code\_globalvars\configuration.dm"
 #include "code\_globalvars\game_modes.dm"
@@ -3516,8 +3518,26 @@
 #include "code\modules\tgui_panel\audio.dm"
 #include "code\modules\tgui_panel\external.dm"
 #include "code\modules\tgui_panel\telemetry.dm"
+#include "code\modules\unit_tests\merge_type.dm"
 #include "code\modules\tgui_panel\tgui_panel.dm"
+#include "code\modules\unit_tests\reagent_mod_procs.dm"
+#include "code\modules\unit_tests\teleporters.dm"
+#include "code\modules\unit_tests\stomach.dm"
+#include "code\modules\unit_tests\species_whitelists.dm"
+#include "code\modules\unit_tests\siunit.dm"
+#include "code\modules\unit_tests\serving_tray.dm"
+#include "code\modules\unit_tests\reagent_mod_expose.dm"
+#include "code\modules\unit_tests\projectiles.dm"
+#include "code\modules\unit_tests\pills.dm"
+#include "code\modules\unit_tests\keybinding_init.dm"
+#include "code\modules\unit_tests\initialize_sanity.dm"
+#include "code\modules\unit_tests\holidays.dm"
+#include "code\modules\unit_tests\emoting.dm"
+#include "code\modules\unit_tests\heretic_knowledge.dm"
+#include "code\modules\unit_tests\confusion.dm"
+#include "code\modules\unit_tests\combat.dm"
 #include "code\modules\tooltip\tooltip.dm"
+#include "code\modules\unit_tests\card_mismatch.dm"
 #include "code\modules\unit_tests\_unit_tests.dm"
 #include "code\modules\uplink\uplink_devices.dm"
 #include "code\modules\uplink\uplink_items.dm"