cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync2

Browse Source
This commit is contained in:
Arokha Sieyes
2017-04-11 21:29:07 -04:00
parent b7618caae9 fcc33c7816
commit ebb2bf9675
7 changed files with 108 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -136,7 +136,7 @@
/obj/effect/energy_net/user_unbuckle_mob(mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
visible_message("<span class='danger'>[user] begins to tear at \the [src]!</span>")
if(do_after(usr, escape_time, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
if(!buckled_mob)
return
visible_message("<span class='danger'>[user] manages to tear \the [src] apart!</span>")