diff --git a/baystation12.dme b/baystation12.dme index 8b5b8639b2344..d50d6480cfc3f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1476,6 +1476,7 @@ #include "code\modules\halo\clothing\donor_innie.dm" #include "code\modules\halo\clothing\donor_unsc.dm" #include "code\modules\halo\clothing\earplugs.dm" +#include "code\modules\halo\clothing\human_covenant_gear.dm" #include "code\modules\halo\clothing\insurrectionists.dm" #include "code\modules\halo\clothing\jetpacks.dm" #include "code\modules\halo\clothing\jumpsuits.dm" @@ -2286,7 +2287,6 @@ #include "code\modules\halo\weapons\MA3.dm" #include "code\modules\halo\weapons\MA37.dm" #include "code\modules\halo\weapons\MA5B.dm" -#include "code\modules\halo\weapons\XM98.dm" #include "code\modules\halo\weapons\melee.dm" #include "code\modules\halo\weapons\plastic_explosives.dm" #include "code\modules\halo\weapons\railrifle.dm" @@ -2295,6 +2295,7 @@ #include "code\modules\halo\weapons\spartan_laser.dm" #include "code\modules\halo\weapons\SRS99.dm" #include "code\modules\halo\weapons\unsc_plasma.dm" +#include "code\modules\halo\weapons\XM98.dm" #include "code\modules\halo\weapons\attachments\barrel.dm" #include "code\modules\halo\weapons\attachments\general_attachments.dm" #include "code\modules\halo\weapons\attachments\lights.dm" diff --git a/code/modules/halo/sounds/lmg_fire.ogg b/code/modules/halo/sounds/lmg_fire.ogg new file mode 100644 index 0000000000000..fe3237e2c6efb Binary files /dev/null and b/code/modules/halo/sounds/lmg_fire.ogg differ diff --git a/code/modules/halo/sounds/pelican_fire.ogg b/code/modules/halo/sounds/pelican_fire.ogg new file mode 100644 index 0000000000000..f444b8443350e Binary files /dev/null and b/code/modules/halo/sounds/pelican_fire.ogg differ diff --git a/code/modules/halo/vehicles/types/pelican.dm b/code/modules/halo/vehicles/types/pelican.dm index 1afcc5d79a876..5ac3b252b0f27 100644 --- a/code/modules/halo/vehicles/types/pelican.dm +++ b/code/modules/halo/vehicles/types/pelican.dm @@ -64,6 +64,7 @@ icon_state = "chaingun_obj" item_state = "chaingun_obj" + fire_sound = 'code/modules/halo/sounds/pelican_fire.ogg' fire_delay = 8 burst = 10 @@ -173,6 +174,7 @@ magazine_type = /obj/item/ammo_magazine/pelican_chaingun + fire_sound = 'code/modules/halo/sounds/pelican_fire.ogg' fire_delay = 8 burst = 12 diff --git a/code/modules/halo/weapons/M739.dm b/code/modules/halo/weapons/M739.dm index 30027ac4dd0c4..ec53e597f267a 100644 --- a/code/modules/halo/weapons/M739.dm +++ b/code/modules/halo/weapons/M739.dm @@ -12,7 +12,7 @@ load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m739/m118 allowed_magazines = list(/obj/item/ammo_magazine/m739) - fire_sound = 'code/modules/halo/sounds/Assault_Rifle_Fire_New.wav' + fire_sound = 'code/modules/halo/sounds/lmg_fire.ogg' reload_sound = 'code/modules/halo/sounds/UNSC_Saw_Reload_Sound_Effect.ogg' one_hand_penalty = -1 dispersion = list(0.2, 0.2, 0.2, 0.2, 0.3, 0.3, 0.3, 0.3, 0.4, 0.4, 0.4, 0.5)