cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4958 from Heroman3003/bsh-fixes

Browse Source 
Fixes some issues with bluespace harpoon
This commit is contained in:
Novacat
2019-04-08 02:59:07 -04:00
committed by GitHub
parent f1eb438b89 148511e6b0
commit 336db60803
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/guns/bsharpoon.dm
+4 -1
View File
@@ -33,13 +33,16 @@
playsound(user, 'sound/weapons/wave.ogg', 60, 1)
return
var/turf/T = get_turf(A)
if(!T || T.check_density())
if(!T || (T.check_density() && mode == 1))
to_chat(user,"<span class = 'warning'>That's a little too solid to harpoon into!</span>")
return
var/turf/ownturf = get_turf(src)
if(ownturf.z != T.z || get_dist(T,ownturf) > world.view)
to_chat(user, "<span class='warning'>The target is out of range!</span>")
return
if(get_area(A).flags & BLUE_SHIELDED)
to_chat(user, "<span class='warning'>The target area protected by bluespace shielding!</span>")
return
last_fire = current_fire
playsound(user, 'sound/weapons/wave.ogg', 60, 1)