fixes

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"

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