cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make grab upgrade faster. Passive -> Aggressive is instantaneous (unless you count the 1 second click cooldown, same as between two melee attacks). Upgrading to neck grab or kill grab now takes 3 seconds instead of 4.

Browse Source
This commit is contained in:
phil235
2016-05-29 17:14:05 +02:00
parent 442c8bb1fa
commit aab577aae7
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial.dm
+2 -1
View File
@@ -323,7 +323,7 @@
add_to_streak("G",D)
if(check_streak(A,D))
return 1
if(A.grab_state > GRAB_AGGRESSIVE)
if(A.grab_state >= GRAB_AGGRESSIVE)
D.grabbedby(A, 1)
else
A.start_pulling(D, 1)
@@ -331,6 +331,7 @@
D.drop_r_hand()
D.drop_l_hand()
D.stop_pulling()
add_logs(A, D, "grabbed", addition="aggressively")
A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
return 1