Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/datums/components/fullauto.dm

@@ -117,7 +117,7 @@
 		return
 	if(LAZYACCESS(modifiers, ALT_CLICK))
 		return
-	if(source.mob.in_throw_mode)
+	if(source.mob.throw_mode)
 		return
 	if(!isturf(source.mob.loc)) //No firing inside lockers and stuff.
 		return

code/datums/components/riding.dm

@@ -392,3 +392,12 @@
 		if(rider in AM.buckled_mobs)
 			AM.unbuckle_mob(rider)
 	. = ..()
+
+/obj/item/riding_offhand/on_thrown(mob/living/carbon/user, atom/target)
+	if(rider == user)
+		return //Piggyback user.
+	user.unbuckle_mob(rider)
+	if(HAS_TRAIT(user, TRAIT_PACIFISM))
+		to_chat(user, span_notice("You gently let go of [rider]."))
+		return
+	return rider

code/datums/components/tackle.dm

@@ -66,7 +66,7 @@
 
 ///See if we can tackle or not. If we can, leap!
 /datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, params)
-	if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckling)
+	if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckling)
 		return
 
 	if(HAS_TRAIT(user, TRAIT_HULK))