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 bullets making sounds in space and water (#33672)

Browse Source 
* Bullet sounds

* explicit lists
This commit is contained in:
ShizCalev
2017-12-21 01:08:39 -05:00
committed by Emmett Gaines
parent 987c810260
commit b539341768
8 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/guns/ballistic.dm
View File

@@ -31,8 +31,7 @@
if(istype(AC)) //there's a chambered round
if(casing_ejector)
AC.forceMove(drop_location()) //Eject casing onto ground.
AC.SpinAnimation(10, 1) //next gen special effects
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, AC, 'sound/weapons/bulletremove.ogg', 60, 1), 3)
AC.bounce_away(TRUE)
chambered = null
else if(empty_chamber)
chambered = null
@@ -125,8 +124,7 @@
to_chat(user, "<span class='notice'>You pull the magazine out of \the [src].</span>")
else if(chambered)
AC.forceMove(drop_location())
AC.SpinAnimation(10, 1)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, AC, 'sound/weapons/bulletremove.ogg', 60, 1), 3)
AC.bounce_away()
chambered = null
to_chat(user, "<span class='notice'>You unload the round from \the [src]'s chamber.</span>")
playsound(src, "gun_slide_lock", 70, 1)