mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-22 04:36:53 +01:00
Guns sounds refactor and improvements (#5803)
* Gun sound updates Grenade Launcher sound source: https://freesound.org/people/LeMudCrab/sounds/163458/ * Actually, this is a better way to handle this. * Fixed accidental inconsistent indentation * Renames shotgun.ogg to Gunshot_shotgun.ogg Also actually changes the file names like I was supposed to last night. * *peers* Didn't I just fix this shit? * Actually fixes the missing files this time * Update audible_deception.dm * Changed tungsten core projectile sound by request * Actually no this line is stupid and makes me angry Simplifies dumb code that was badly copypasted. Also fixed missing D'eagle fire_sound * Smarter code Less copypasta, more runtimes prevented in case somebody decides to make a soundless gun whether done intentionally or not. * Update gun.dm
This commit is contained in:
@@ -82,13 +82,13 @@
|
||||
|
||||
/obj/effect/map_effect/interval/sound_emitter/ballistic_gunfight
|
||||
sounds_to_play = list(
|
||||
'sound/weapons/gunshot.ogg',
|
||||
'sound/weapons/deagle.ogg',
|
||||
'sound/weapons/rifleshot.ogg',
|
||||
'sound/weapons/sniper.ogg',
|
||||
'sound/weapons/shotgun.ogg',
|
||||
'sound/weapons/gunshot3.ogg',
|
||||
'sound/weapons/machinegun.ogg'
|
||||
'sound/weapons/Gunshot1.ogg',
|
||||
'sound/weapons/Gunshot_deagle.ogg',
|
||||
'sound/weapons/Gunshot_generic_rifle.ogg',
|
||||
'sound/weapons/Gunshot_sniper.ogg',
|
||||
'sound/weapons/Gunshot_shotgun.ogg',
|
||||
'sound/weapons/Gunshot3.ogg',
|
||||
'sound/weapons/Gunshot_machinegun.ogg'
|
||||
)
|
||||
interval_lower_bound = 5
|
||||
interval_upper_bound = 2 SECONDS
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
/obj/item/latexballon/proc/burst()
|
||||
if (!air_contents)
|
||||
return
|
||||
playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
|
||||
playsound(src, 'sound/weapons/Gunshot_old.ogg', 100, 1)
|
||||
icon_state = "latexballon_bursted"
|
||||
item_state = "lgloves"
|
||||
loc.assume_air(air_contents)
|
||||
|
||||
@@ -65,7 +65,7 @@ var/list/global/tank_gauge_cache = list()
|
||||
src.air_contents = new /datum/gas_mixture()
|
||||
src.air_contents.volume = volume //liters
|
||||
src.air_contents.temperature = T20C
|
||||
START_PROCESSING(SSobj, src)
|
||||
START_PROCESSING(SSobj, src)
|
||||
update_gauge()
|
||||
return
|
||||
|
||||
@@ -464,7 +464,7 @@ var/list/global/tank_gauge_cache = list()
|
||||
if(!T)
|
||||
return
|
||||
T.assume_air(air_contents)
|
||||
playsound(get_turf(src), 'sound/weapons/shotgun.ogg', 20, 1)
|
||||
playsound(get_turf(src), 'sound/weapons/Gunshot_shotgun.ogg', 20, 1)
|
||||
visible_message("\icon[src] <span class='danger'>\The [src] flies apart!</span>", "<span class='warning'>You hear a bang!</span>")
|
||||
T.hotspot_expose(air_contents.temperature, 70, 1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user