Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283

[MIRROR] Fixes shaking people up while buckled into a bed/resin nest

code/modules/mob/living/carbon/carbon_defense.dm

@@ -250,6 +250,9 @@
 	if(health >= 0 && !(status_flags & FAKEDEATH))
 
 		if(lying)
+			if(buckled)
+				to_chat(M, "<span class='warning'>You need to unbuckle [src] first to do that!")
+				return
 			M.visible_message("<span class='notice'>[M] shakes [src] trying to get [p_them()] up!</span>", \
 							"<span class='notice'>You shake [src] trying to get [p_them()] up!</span>")
 		else if(check_zone(M.zone_selected) == "head")