cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4644 from VOREStation/upstream-merge-5803

Browse Source 
[MIRROR] Guns sounds refactor and improvements
This commit is contained in:
Novacat
2019-03-27 12:35:26 -04:00
committed by GitHub
parent dbd85f3243 1e45296d31
commit 42df71908b
57 changed files with 109 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/map_effects/sound_emitter.dm
+7 -7
View File
@@ -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
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/tanks/tanks.dm
+5 -5
View File
@@ -42,14 +42,14 @@ var/list/global/tank_gauge_cache = list()
description_info = "These tanks are utilised to store any of the various types of gaseous substances. \
They can be attached to various portable atmospheric devices to be filled or emptied. <br>\
<br>\
Each tank is fitted with an emergency relief valve. This relief valve will open if the tank is pressurised to over ~3000kPa or heated to over 173ºC. \
Each tank is fitted with an emergency relief valve. This relief valve will open if the tank is pressurised to over ~3000kPa or heated to over 173�C. \
The valve itself will close after expending most or all of the contents into the air.<br>\
<br>\
Filling a tank such that experiences ~4000kPa of pressure will cause the tank to rupture, spilling out its contents and destroying the tank. \
Tanks filled over ~5000kPa will rupture rather violently, exploding with significant force."
description_antag = "Each tank may be incited to burn by attaching wires and an igniter assembly, though the igniter can only be used once and the mixture only burn if the igniter pushes a flammable gas mixture above the minimum burn temperature (126ºC). \
Wired and assembled tanks may be disarmed with a set of wirecutters. Any exploding or rupturing tank will generate shrapnel, assuming their relief valves have been welded beforehand. Even if not, they can be incited to expel hot gas on ignition if pushed above 173ºC. \
description_antag = "Each tank may be incited to burn by attaching wires and an igniter assembly, though the igniter can only be used once and the mixture only burn if the igniter pushes a flammable gas mixture above the minimum burn temperature (126�C). \
Wired and assembled tanks may be disarmed with a set of wirecutters. Any exploding or rupturing tank will generate shrapnel, assuming their relief valves have been welded beforehand. Even if not, they can be incited to expel hot gas on ignition if pushed above 173�C. \
Relatively easy to make, the single tank bomb requries no tank transfer valve, and is still a fairly formidable weapon that can be manufactured from any tank."
/obj/item/weapon/tank/proc/init_proxy()
@@ -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)