cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

basic mobs use their disarm response when shoved by humans (#79441)

Browse Source 
## 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
🆑
spellcheck: basic mobs getting shoved by humans now display the mob's
disarm response
/🆑
This commit is contained in:
kawoppi
2023-11-01 17:08:28 -06:00
committed by GitHub
parent b7efd9e9e1
commit dc9376a85e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/basic_defense.dm
+4 -4
View File
@@ -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