cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes tentacles (#39992)

Browse Source 
* Fixes tentacles, also moves throw callback to fire after the throw is fully completed.

* I knew i forgot something here.

* Undoes the callback change since it's fixed in another PR.

* Bluh
This commit is contained in:
AnturK
2018-09-02 05:55:55 +02:00
committed by yogstation13-bot
parent 9060b5a7e9
commit 8d9cb58450
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/living_defense.dm
View File

@@ -144,14 +144,14 @@
grippedby(user)
//proc to upgrade a simple pull into a more aggressive grab.
/mob/living/proc/grippedby(mob/living/carbon/user)
/mob/living/proc/grippedby(mob/living/carbon/user, instant = FALSE)
if(user.grab_state < GRAB_KILL)
user.changeNext_move(CLICK_CD_GRABBING)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(user.grab_state) //only the first upgrade is instantaneous
var/old_grab_state = user.grab_state
var/grab_upgrade_time = 30
var/grab_upgrade_time = instant ? 0 : 30
visible_message("<span class='danger'>[user] starts to tighten [user.p_their()] grip on [src]!</span>", \
"<span class='userdanger'>[user] starts to tighten [user.p_their()] grip on you!</span>")
switch(user.grab_state)