cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 03:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simple Animal Improvements (#9135)

Browse Source 
Tweaked various simple animal messages to make it look better in the chat log.
    Aggressive grabs no longer refer to 'by the hands'.
    Getting a neck grab or higher on an aggressive animal restrains them from attacking.
    Strangling an animal now properly does damage to them.
This commit is contained in:
Geeves
2020-07-25 22:25:25 +02:00
committed by GitHub
parent 574211c700
commit bce64cd998
14 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/multiz/movement.dm
View File

@@ -376,10 +376,10 @@
!lying && thrust.allow_thrust(0.01, src))
return FALSE
for(var/mob/living/carbon/human/H in range(1, src)) // can't fall if someone's holding you
for(var/obj/item/grab/G in list(H.l_hand, H.r_hand))
if(G.state >= GRAB_AGGRESSIVE && G.affecting == src)
return FALSE
for(var/grab in grabbed_by)
var/obj/item/grab/G = grab
if(G.state >= GRAB_AGGRESSIVE)
return FALSE
return ..()
/mob/living/carbon/human/bst/can_fall()