July 5th TG sync (#1883)

July 5th TG sync

code/modules/mob/living/emote.dm

@@ -62,8 +62,9 @@
 
 /datum/emote/living/collapse/run_emote(mob/user, params)
 	. = ..()
-	if(.)
-		user.Paralyse(2)
+	if(. && isliving(user))
+		var/mob/living/L = user
+		L.Unconscious(40)
 
 /datum/emote/living/cough
 	key = "cough"
@@ -110,8 +111,9 @@
 
 /datum/emote/living/faint/run_emote(mob/user, params)
 	. = ..()
-	if(.)
-		user.SetSleeping(10)
+	if(. && isliving(user))
+		var/mob/living/L = user
+		L.SetSleeping(200)
 
 /datum/emote/living/flap
 	key = "flap"
@@ -329,8 +331,9 @@
 
 /datum/emote/living/surrender/run_emote(mob/user, params)
 	. = ..()
-	if(.)
-		user.Weaken(20)
+	if(. && isliving(user))
+		var/mob/living/L = user
+		L.Knockdown(200)
 
 /datum/emote/living/sway
 	key = "sway"
@@ -377,7 +380,6 @@
 	key = "me"
 	key_third_person = "custom"
 	message = null
-	mob_type_blacklist_typecache = list(/mob/living/brain)
 
 /datum/emote/living/custom/proc/check_invalid(mob/user, input)
 	. = TRUE
@@ -467,7 +469,7 @@
 
 /datum/emote/living/spin/run_emote(mob/user)
 	user.spin(20, 1)
-	if(istype(user, /mob/living/silicon/robot))
+	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		if(R.buckled_mobs)
 			for(var/mob/M in R.buckled_mobs)
@@ -476,3 +478,17 @@
 				else
 					R.unbuckle_all_mobs()
 	..()
+
+/datum/emote/living/circle
+	key = "circle"
+	key_third_person = "circles"
+	restraint_check = TRUE
+
+/datum/emote/living/circle/run_emote(mob/user, params)
+	. = ..()
+	var/obj/item/weapon/circlegame/N = new(user)
+	if(user.put_in_hands(N))
+		to_chat(user, "<span class='notice'>You make a circle with your hand.</span>")
+	else
+		qdel(N)
+		to_chat(user, "<span class='warning'>You don't have any free hands to make a circle with.</span>")