cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10239 from Agameofscones/dangerwillrobinson

Browse Source 
Taser hotfix
This commit is contained in:
variableundefined
2018-11-16 11:26:28 +08:00
committed by GitHub
parent 16cd392cab f3eaed5606
commit d3afbc82e3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -69,7 +69,7 @@
stamina = max(0, stamina - tile_dropoff_s) // as above, but with stamina
if(range <= 0 && loc)
on_range()
if(!damage && !stamina)
if(!damage && !stamina && !nodamage)
on_range()
/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range