From 929c737dfe8880f90cc27e906c90700075b826f2 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Wed, 4 Oct 2017 18:00:27 -0400
Subject: [PATCH 1/2] Fixes shaking people up while buckled into a bed/resin
 nest (#31283)

* Fixes shaking people up when buckled into bed

* CB
---
 code/modules/mob/living/carbon/carbon_defense.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 6068ef2d66..d90db23679 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/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")