From ad03ca6e3390ae0f4215368670a7cde7224c8de6 Mon Sep 17 00:00:00 2001 From: Darkstick Date: Wed, 8 Apr 2020 15:11:17 -0400 Subject: [PATCH 1/4] I have fallen and I can't get up --- code/modules/mob/living/emote.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index b1731f9d4199..decda1423a5c 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -111,6 +111,17 @@ var/mob/living/L = user L.SetSleeping(200) +/datum/emote/living/trip + key = "trip" + key_third_person = "trip" + message = "trips and fall!" + +/datum/emote/living/trip/run_emote(mob/user, params, type_override, intentional) + . = ..() + if(. && isliving(user)) + var/mob/living/L = user + L.Knockdown(60) + /datum/emote/living/flap key = "flap" key_third_person = "flaps" From 925143a71f1d8555df19c30e11e8727df8ca23ad Mon Sep 17 00:00:00 2001 From: Darkstick Date: Wed, 8 Apr 2020 17:01:30 -0400 Subject: [PATCH 2/4] s is required --- code/modules/mob/living/emote.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index decda1423a5c..b27675f68c6d 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -114,13 +114,16 @@ /datum/emote/living/trip key = "trip" key_third_person = "trip" - message = "trips and fall!" + message = "trips and falls!" /datum/emote/living/trip/run_emote(mob/user, params, type_override, intentional) . = ..() if(. && isliving(user)) - var/mob/living/L = user - L.Knockdown(60) + if(FLYING) + return + else + var/mob/living/L = user + L.Knockdown(60) /datum/emote/living/flap key = "flap" From fbfd1435b22eae4226e96aa07730e459d55cb12e Mon Sep 17 00:00:00 2001 From: Darkstick Date: Wed, 8 Apr 2020 17:06:45 -0400 Subject: [PATCH 3/4] no no this change wasn't supposed to be here shoo go away --- code/modules/mob/living/emote.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index b27675f68c6d..4efaf083583d 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -119,11 +119,8 @@ /datum/emote/living/trip/run_emote(mob/user, params, type_override, intentional) . = ..() if(. && isliving(user)) - if(FLYING) - return - else - var/mob/living/L = user - L.Knockdown(60) + var/mob/living/L = user + L.Knockdown(60) /datum/emote/living/flap key = "flap" From 890e36f4ea6f32818e9844e8d097ca0a3c26fdd0 Mon Sep 17 00:00:00 2001 From: Darkstick <55104120+Darkstick@users.noreply.github.com> Date: Fri, 10 Apr 2020 22:27:51 -0400 Subject: [PATCH 4/4] heck, thanks alex Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- code/modules/mob/living/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 4efaf083583d..af664a4ed66b 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -113,7 +113,7 @@ /datum/emote/living/trip key = "trip" - key_third_person = "trip" + key_third_person = "trips" message = "trips and falls!" /datum/emote/living/trip/run_emote(mob/user, params, type_override, intentional)