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

Ports move force and move resist, movement/pushing/pulling tweaks & co.

Browse Source
This commit is contained in:
Ghommie
2019-10-24 18:01:46 +02:00
parent 432a7dba5d
commit 2c578ca683
121 changed files with 553 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/cqc.dm
+1 -1
View File
@@ -127,7 +127,7 @@
if(A.grab_state >= GRAB_AGGRESSIVE)
D.grabbedby(A, 1)
else
A.start_pulling(D, 1)
A.start_pulling(D, supress_message = TRUE)
if(A.pulling)
D.stop_pulling()
log_combat(A, D, "grabbed", addition="aggressively")
code/datums/martial/psychotic_brawl.dm
+1 -1
View File
@@ -25,7 +25,7 @@
if(A.grab_state >= GRAB_AGGRESSIVE)
D.grabbedby(A, 1)
else
A.start_pulling(D, 1)
A.start_pulling(D, supress_message = TRUE)
if(A.pulling)
D.drop_all_held_items()
D.stop_pulling()
code/datums/martial/sleeping_carp.dm
+1 -1
View File
@@ -108,7 +108,7 @@
if(A.grab_state >= GRAB_AGGRESSIVE)
D.grabbedby(A, 1)
else
A.start_pulling(D, 1)
A.start_pulling(D, supress_message = TRUE)
if(A.pulling)
D.drop_all_held_items()
D.stop_pulling()