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

[MIRROR] Fixes being able to shove while in the process of standing up (#1259)

Browse Source 
* Fixes being able to shove while standing up (#54296)

* Fixes being able to shove while in the process of standing up

Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
SkyratBot
2020-10-12 06:45:21 +02:00
committed by GitHub
co-authored by Rohesie
parent 70ad10bd84
commit 585cba4ea1
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/carbon/human/species.dm
+4 -4
View File
@@ -1403,16 +1403,16 @@ GLOBAL_LIST_EMPTY(roundstart_races)
"<span class='danger'>You block [user]'s shove!</span>", "<span class='hear'>You hear a swoosh!</span>", COMBAT_MESSAGE_RANGE, user)
to_chat(user, "<span class='warning'>Your shove at [target] was blocked!</span>")
return FALSE
if(attacker_style && attacker_style.disarm_act(user,target))
if(attacker_style?.disarm_act(user,target))
return TRUE
if(user.resting || user.IsKnockdown())
if(user.body_position != STANDING_UP)
return FALSE
if(user == target)
return FALSE
if(user.loc == target.loc)
return FALSE
else
user.disarm(target)
user.disarm(target)
/datum/species/proc/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
return