From dc9376a85ef776d8f9abf29f58d67d1e7104fb8c Mon Sep 17 00:00:00 2001
From: kawoppi <94711066+kawoppi@users.noreply.github.com>
Date: Thu, 2 Nov 2023 00:08:28 +0100
Subject: [PATCH] basic mobs use their disarm response when shoved by humans
 (#79441)

## About The Pull Request
So basic mobs have variables which can change what message is displayed
when they are shoved. But right now these are only used if they are
shoved by aliens. This PR changes it so that they're also used when
they're shoved by humans.

![shove2](https://github.com/tgstation/tgstation/assets/94711066/80bc08e9-7ab2-4eb6-a01f-ed5a2e1cd63b)
## Why It's Good For The Game
It seems a bit weird for these to only show up when aliens are involved.
It seems more appropriate to shoo a tiny creature away compared to
shoving it.
## Changelog
:cl:
spellcheck: basic mobs getting shoved by humans now display the mob's
disarm response
/:cl:
---
 code/modules/mob/living/basic/basic_defense.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm
index 3fe35bcd266..a1093f914d8 100644
--- a/code/modules/mob/living/basic/basic_defense.dm
+++ b/code/modules/mob/living/basic/basic_defense.dm
@@ -11,13 +11,13 @@
 		var/shove_dir = get_dir(user, src)
 		if(!Move(get_step(src, shove_dir), shove_dir))
 			log_combat(user, src, "shoved", "failing to move it")
-			user.visible_message(span_danger("[user.name] shoves [src]!"),
-				span_danger("You shove [src]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src))
+			user.visible_message(span_danger("[user.name] [response_disarm_continuous] [src]!"),
+				span_danger("You [response_disarm_simple] [src]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src))
 			to_chat(src, span_userdanger("You're shoved by [user.name]!"))
 			return TRUE
 		log_combat(user, src, "shoved", "pushing it")
-		user.visible_message(span_danger("[user.name] shoves [src], pushing [p_them()]!"),
-			span_danger("You shove [src], pushing [p_them()]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src))
+		user.visible_message(span_danger("[user.name] [response_disarm_continuous] [src], pushing [p_them()]!"),
+			span_danger("You [response_disarm_simple] [src], pushing [p_them()]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src))
 		to_chat(src, span_userdanger("You're pushed by [user.name]!"))
 		return TRUE