Merge remote-tracking branch 'upstream/master'

code/datums/components/bouncy.dm

@@ -32,7 +32,7 @@
 	var/atom/movable/A = parent
 	switch(rand(1, 3))
 		if(1)
-			A.do_jiggle(45 + rand(-10, 10) * bouncy_mod, 14)
+			A.do_jiggle(25 + rand(-5, 5) * bouncy_mod, 14)
 		if(2)
 			var/min_b = 0.6/bouncy_mod
 			var/max_b = 1.2 * bouncy_mod

code/datums/components/storage/storage.dm

@@ -432,25 +432,26 @@
 	if(M.incapacitated() || !M.canUseStorage())
 		return
 	var/atom/A = parent
-	A.add_fingerprint(M)
 	// this must come before the screen objects only block, dunno why it wasn't before
 	if(over_object == M)
 		user_show_to_mob(M, trigger_on_found = TRUE)
 	if(isrevenant(M))
 		INVOKE_ASYNC(GLOBAL_PROC, .proc/RevenantThrow, over_object, M, source)
 		return
+	if(check_locked(null, M) || !M.CanReach(A) || (!M.CanReach(over_object) && !istype(over_object, /atom/movable/screen)))
+		return
+	playsound(A, "rustle", 50, TRUE, -5)
+	A.do_jiggle()
+	A.add_fingerprint(M)
 	if(!istype(over_object, /atom/movable/screen))
 		INVOKE_ASYNC(src, .proc/dump_content_at, over_object, M)
 		return
 	if(A.loc != M)
 		return
-	playsound(A, "rustle", 50, TRUE, -5)
-	A.do_jiggle()
 	if(istype(over_object, /atom/movable/screen/inventory/hand))
 		var/atom/movable/screen/inventory/hand/H = over_object
 		M.putItemFromInventoryInHandIfPossible(A, H.held_index)
 		return
-	A.add_fingerprint(M)
 
 /datum/component/storage/proc/user_show_to_mob(mob/M, force = FALSE, trigger_on_found = FALSE)
 	var/atom/A = parent

code/datums/components/virtual_reality.dm

@@ -84,9 +84,9 @@
 	if(VR)
 		VR.level_below = src
 		level_above = VR
-	M.transfer_ckey(vr_M, FALSE)
 	mastermind = M.mind
 	mastermind.current.audiovisual_redirect = parent
+	M.transfer_ckey(vr_M, FALSE)
 	RegisterSignal(mastermind, COMSIG_PRE_MIND_TRANSFER, .proc/switch_player)
 	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/game_over)
 	RegisterSignal(M, COMSIG_MOB_PRE_PLAYER_CHANGE, .proc/player_hijacked)