cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-31 09:01:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3561 from SpadesNeil/38-soundfix

Browse Source 
Fixes sounds for .38 guns
This commit is contained in:
Anewbe
2017-07-06 13:48:03 -05:00
committed by GitHub
parent 04dffa15e6 9a43b88d90
commit 60d73dfa63
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/revolver.dm
+5 -2
View File
@@ -45,7 +45,7 @@
icon_state = "detective"
caliber = ".38"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/Gunshot_light.ogg'
fire_sound = 'sound/weapons/semiauto.ogg'
ammo_type = /obj/item/ammo_casing/a38
/obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun()
@@ -73,7 +73,7 @@
icon_state = "deckard-empty"
caliber = ".38"
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/Gunshot_light.ogg'
fire_sound = 'sound/weapons/semiauto.ogg'
ammo_type = /obj/item/ammo_casing/a38
/obj/item/weapon/gun/projectile/revolver/deckard/emp
@@ -124,6 +124,7 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
handle_casings = CYCLE_CASINGS
max_shells = 9
fire_sound = 'sound/weapons/semiauto.ogg'
caliber = ".38"
ammo_type = /obj/item/ammo_casing/a38
var/secondary_max_shells = 1
@@ -155,6 +156,7 @@
if(caliber && secondary_caliber)
caliber = secondary_caliber
fire_sound = 'sound/weapons/shotgun.ogg'
if(ammo_type && secondary_ammo_type)
ammo_type = secondary_ammo_type
@@ -171,6 +173,7 @@
if(caliber && secondary_caliber)
caliber = initial(caliber)
fire_sound = initial(fire_sound)
if(ammo_type && secondary_ammo_type)
ammo_type = initial(ammo_type)