Merge remote-tracking branch 'upstream/master'

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/storage/concrete/stack.dm

@@ -63,7 +63,7 @@
 		if(!istype(I) || QDELETED(I))				//We're specialized stack storage, just ignore non stacks.
 			continue
 		if(!.[I.merge_type])
-			.[I.merge_type] = new /datum/numbered_display(I, I.amount)
+			.[I.merge_type] = new /datum/numbered_display(I, I.amount, src)
 		else
 			var/datum/numbered_display/ND = .[I.merge_type]
 			ND.number += I.amount

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))