cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some grabs

Browse Source
This commit is contained in:
nicetoolbox
2018-09-16 12:28:39 -07:00
parent ea8cebfd5e
commit 385f290bc3
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ninja/martial_art.dm
+2 -4
View File
@@ -87,8 +87,7 @@
"<span class='userdanger'>[A]\ puts you in a [hold_name]! You are unable to speak!</span>")
step_to(D,get_step(D,D.dir),1)
D.grabbedby(A, 1)
var/obj/item/grab/G = A.get_active_hand()
var/obj/item/grab/G = D.grabbedby(A, 1)
if(G)
G.state = GRAB_NECK
@@ -136,8 +135,7 @@
return A.pointed(D)
/datum/martial_art/ninja_martial_art/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) //Instant aggressive grab
D.grabbedby(A)
var/obj/item/grab/G = A.get_active_hand()
var/obj/item/grab/G = D.grabbedby(A)
if(G)
G.state = GRAB_AGGRESSIVE