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

[MIRROR] Fixes tackling issues with stun immune tacklers [MDB IGNORE] (#23911)

Browse Source 
* Fixes tackling issues with stun immune tacklers (#78494)

## About The Pull Request

When a human uses gripper gloves and such to perform a tackle, it does
some stuff with knockdowns. First, at the start of the tackle, the
tackler is given 1 or 2 seconds of knockdown. This knockdown bypasses
stun immunity. If the tackle and its rolled to be an expert or monster
tackle, then this initial knockdown is cleared. However, the knockdown
clearing does NOT bypass stun immunity. This ironically meant that stun
immune tacklers would remain knocked down when landing a monster tackle,
and it would cause a runtime because knocked down people can't grab.
This PR just makes the knockdown clear bypass stun immunity as well.
Closes #78441.

* Fixes tackling issues with stun immune tacklers

---------

Co-authored-by: GPeckman <21979502+GPeckman@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-09-25 12:32:37 -07:00
committed by GitHub
co-authored by GPeckman
parent ad85321dfa
commit 61053a2bc3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/tackle.dm
+4 -2
View File
@@ -205,7 +205,8 @@
user.visible_message(span_warning("[user] lands an expert [tackle_word] on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!"), span_userdanger("You land an expert [tackle_word] on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!"), ignored_mobs = target)
to_chat(target, span_userdanger("[user] lands an expert [tackle_word] on you, knocking you down hard and maintaining a passive grab!"))
user.SetKnockdown(0)
// Ignore_canstun has to be true, or else a stunimmune user would stay knocked down.
user.SetKnockdown(0, ignore_canstun = TRUE)
user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
@@ -228,7 +229,8 @@
user.visible_message(span_warning("[user] lands a monster [tackle_word] on [target], knocking [target.p_them()] senseless and applying an aggressive pin!"), span_userdanger("You land a monster [tackle_word] on [target], knocking [target.p_them()] senseless and applying an aggressive pin!"), ignored_mobs = target)
to_chat(target, span_userdanger("[user] lands a monster [tackle_word] on you, knocking you senseless and aggressively pinning you!"))
user.SetKnockdown(0)
// Ignore_canstun has to be true, or else a stunimmune user would stay knocked down.
user.SetKnockdown(0, ignore_canstun = TRUE)
user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)