From 6dff5cabd45f5dfa3b77bcbc05de1bc916fa86f2 Mon Sep 17 00:00:00 2001
From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com>
Date: Sat, 11 Jul 2020 20:39:27 -0300
Subject: [PATCH] merges skyrat#2036

---
 code/modules/mob/living/carbon/human/human.dm | 1 +
 code/modules/mob/living/emote.dm              | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a2d53f6f0a..33e0574e2b 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -8,6 +8,7 @@
 /mob/living/carbon/human/Initialize()
 	verbs += /mob/living/proc/mob_sleep
 	verbs += /mob/living/proc/lay_down
+	verbs += /mob/living/proc/surrender //Skyrat change
 	verbs += /mob/living/carbon/human/proc/underwear_toggle //fwee
 
 	//initialize limbs first
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 9295b4d6ff..c628ebb3fe 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -377,10 +377,16 @@
 	. = ..()
 	if(. && isliving(user))
 		var/mob/living/L = user
+		//Skyrat change start
+		if(L.client?.prefs?.autostand)
+			if(!(L.combat_flags & COMBAT_FLAG_INTENTIONALLY_RESTING))
+				TOGGLE_BITFIELD(L.combat_flags, COMBAT_FLAG_INTENTIONALLY_RESTING)
 		L.DefaultCombatKnockdown(200)
 		L.Stun(20) //Skyrat Change
 		L.set_resting(TRUE) //Skyrat change
 
+		L.disable_combat_mode(FALSE)
+		//Skyrat change stop
 /datum/emote/living/sway
 	key = "sway"
 	key_third_person = "sways"