From 0c953f25d6b9c8385e643f78f7a2cae3b843cd04 Mon Sep 17 00:00:00 2001
From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com>
Date: Sat, 11 Jul 2020 21:02:37 -0300
Subject: [PATCH] fixes

---
 code/modules/mob/living/emote.dm  | 2 +-
 code/modules/mob/living/living.dm | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index c628ebb3fe..2cc66c1e09 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -385,7 +385,7 @@
 		L.Stun(20) //Skyrat Change
 		L.set_resting(TRUE) //Skyrat change
 
-		L.disable_combat_mode(FALSE)
+		//L.disable_combat_mode(FALSE) //doesn't work at all
 		//Skyrat change stop
 /datum/emote/living/sway
 	key = "sway"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c7ed6e743d..1a3927e35e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -474,6 +474,14 @@
 		if(alert(src, "You sure you want to sleep for a while?", "Sleep", "Yes", "No") == "Yes")
 			SetSleeping(400) //Short nap
 
+//Skyrat change start
+/mob/living/proc/surrender()
+	set name = "Surrender"
+	set category = "IC"
+
+	emote("surrender")
+//Skyrat change stop
+
 /mob/proc/get_contents()
 
 /*CIT CHANGE - comments out lay_down proc to be modified in modular_citadel