shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into wound-port

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-18 23:06:49 +01:00
committed by GitHub
parent 3b78ac58bd ee8162ea8b
commit 1a5008fee7
203 changed files with 364 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/spacetime_distortion.dm
+1 -1
View File
@@ -111,7 +111,7 @@
walk_link(user)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/effect/cross_action/spacetime_dist/attack_hand(mob/user)
/obj/effect/cross_action/spacetime_dist/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
walk_link(user)
/obj/effect/cross_action/spacetime_dist/attack_paw(mob/user)