cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Z-Level Grab Fixes (#7498)

Browse Source
This commit is contained in:
Geeves
2019-11-24 21:56:15 +02:00
committed by Werner
parent 0dba96832b
commit d8ac1239fd
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/mob_grab.dm
View File

@@ -372,6 +372,7 @@
animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1, LINEAR_EASING)
affecting.layer = 4
if(affecting)
ADD_FALLING_ATOM(affecting) // Makes the grabbee check if they can fall.
affecting.grabbed_by -= src
affecting = null
if(assailant)

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

@@ -83,9 +83,10 @@
. = ..()
if(.)
for(var/obj/item/grab/G in list(l_hand, r_hand))
if(G.state >= GRAB_NECK && G.affecting && !(G.affecting.buckled)) //strong grip and not buckled
G.affecting.Move(get_turf(src))
visible_message(span("warning", "[src] pulls [G.affecting] [direction & UP ? "upwards" : "downwards"]!"))
if(G.state >= GRAB_NECK) //strong grip
if(G.affecting && !(G.affecting.buckled))
G.affecting.Move(get_turf(src))
visible_message(span("warning", "[src] pulls [G.affecting] [direction & UP ? "upwards" : "downwards"]!"))
/mob/living/zMove(direction)
if (is_ventcrawling)