cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1665 from VOREStation/aro-bshtweaks

Browse Source 
Couple more BSH Tweaks
This commit is contained in:
Arokha Sieyes
2017-06-09 20:06:11 -04:00
committed by GitHub
parent d10bb26cd6 f88ac10362
commit 4c3993df65
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_guns_vr.dm
+5 -1
View File
@@ -795,7 +795,7 @@
if(transforming)
to_chat(user,"<span class = 'warning'>You can't fire while \the [src] transforming!</span>")
return
if(!(current_fire - last_fire >= 20 SECONDS))
if(!(current_fire - last_fire >= 30 SECONDS))
to_chat(user,"<span class = 'warning'>\The [src] is recharging...</span>")
return
if(is_jammed(A) || is_jammed(user))
@@ -803,6 +803,10 @@
last_fire = current_fire
playsound(user, 'sound/weapons/wave.ogg', 60, 1)
return
var/turf/T = get_turf(A)
if(!T || T.check_density())
to_chat(user,"<span class = 'warning'>That's a little too solid to harpoon into!</span>")
return
last_fire = current_fire
playsound(user, 'sound/weapons/wave.ogg', 60, 1)