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

Merge pull request #9543 from nicetoolbox/changeling-grab-fix

Browse Source 
Fix changeling tentacle grab
This commit is contained in:
Crazy Lemon
2018-09-26 16:25:25 -07:00
committed by GitHub
parent 5c5a0b357c 385f290bc3
commit d3505ea9b9
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/adminfu.dm
+1 -2
View File
@@ -37,8 +37,7 @@
add_to_streak("G",D)
if(check_streak(A,D))
return 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
code/modules/martial_arts/brawling.dm
+1 -2
View File
@@ -53,8 +53,7 @@
A.visible_message("<span class='warning'>[A] tries to grab ahold of [D], but fails!</span>", \
"<span class='warning'>You fail to grab ahold of [D]!</span>")
return 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)
D.visible_message("<span class='danger'>[A] grabs ahold of [D] drunkenly!</span>", \
"<span class='userdanger'>[A] grabs ahold of [D] drunkenly!</span>")
code/modules/martial_arts/sleeping_carp.dm
+1 -2
View File
@@ -108,8 +108,7 @@
add_to_streak("G",D)
if(check_streak(A,D))
return 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_AGGRESSIVE //Instant aggressive grab
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -178,7 +178,7 @@ emp_act
/mob/living/carbon/human/grabbedby(mob/living/user)
if(w_uniform)
w_uniform.add_fingerprint(user)
..()
return ..()
//Returns 1 if the attack hit, 0 if it missed.
/mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user, def_zone)
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