Merge pull request #4473 from Citadel-Station-13/upstream-merge-33672

[MIRROR] Fixes bullets making sounds in space and water
2017-12-21 04:55:16 -06:00
parent f8f04b1ce9 3a529ecc2b
commit 1a5006dc2f
8 changed files with 55 additions and 11 deletions
@@ -4,6 +4,7 @@
 /obj/item/ammo_casing/caseless
 	desc = "A caseless bullet casing."
 	firing_effect_type = null
+	heavy_metal = FALSE

 /obj/item/ammo_casing/caseless/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread)
 	if (..()) //successfully firing
@@ -7,6 +7,7 @@
 	var/select_name = "energy"
 	fire_sound = 'sound/weapons/laser.ogg'
 	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
+	heavy_metal = FALSE

 /obj/item/ammo_casing/energy/chameleon
 	projectile_type = /obj/item/projectile/energy/chameleon
@@ -3,6 +3,7 @@
 	desc = "I didn't even know magic needed ammo..."
 	projectile_type = /obj/item/projectile/magic
 	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/magic
+	heavy_metal = FALSE

 /obj/item/ammo_casing/magic/change
 	projectile_type = /obj/item/projectile/magic/change