Merge pull request #3570 from YourPalHolidays/alpha

Sound Update & Empty Magazine Sprite Fixes

code/modules/halo/vehicles/types/prophet_chair.dm

@@ -68,7 +68,7 @@
 	icon_state = "plasmaturret_obj"
 	item_state = ""
 
-	fire_sound = 'code/modules/halo/sounds/Fuelrodfire.ogg'
+	fire_sound = 'code/modules/halo/sounds/fuel_rod_fire_2.ogg'
 	fire_delay = 25
 
 	burst = 4

code/modules/halo/weapons/M392.dm

@@ -47,7 +47,7 @@
 /obj/item/ammo_magazine/m392
 	name = "M392 magazine"
 	icon = 'code/modules/halo/weapons/icons/Weapon Sprites.dmi'
-	icon_state = "M395mag"
+	icon_state = "M395_mag"
 	mag_type = MAGAZINE
 	caliber = "7.62mmdmr"
 	max_ammo = 20

code/modules/halo/weapons/M41.dm

@@ -6,6 +6,7 @@
 	icon_state = "M41closed"
 	item_state = "m41"
 	fire_sound = 'code/modules/halo/sounds/Rocket_Launcher_Fire_New.wav'
+	reload_sound = 'code/modules/halo/sounds/m41_reload.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/spnkr
 	fire_delay = 20

code/modules/halo/weapons/M545.dm

@@ -10,8 +10,8 @@
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/m545/m118
 	allowed_magazines = list(/obj/item/ammo_magazine/m545)
-	//fire_sound = 'code/modules/halo/sounds/MagnumShotSoundEffect.ogg'
-	reload_sound = 'code/modules/halo/sounds/UNSC_Saw_Reload_Sound_Effect.ogg'
+	fire_sound = 'code/modules/halo/sounds/m545_fire.ogg'
+	reload_sound = 'code/modules/halo/sounds/m545_reload.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)
 	w_class = ITEM_SIZE_HUGE
@@ -25,6 +25,8 @@
 	burst_delay = 1.5
 	slowdown_general = 0.5
 
+	burst = 12
+
 	firemodes = list(\
 	list(mode_name="short bursts",  burst=12,accuracy=0, 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)),
 	list(mode_name="extended bursts", burst=24, accuracy=-1,dispersion=list(0.3, 0.3, 0.3, 0.3, 0.4, 0.4, 0.4, 0.4, 0.5, 0.5, 0.5, 0.6))
@@ -51,7 +53,7 @@
 /obj/item/ammo_magazine/m545
 	name = "M545 box magazine"
 	icon = 'code/modules/halo/weapons/icons/Weapon Sprites.dmi'
-	icon_state = "Innie 30cal box - Full"
+	icon_state = "Innie_30cal_Box"
 	mag_type = MAGAZINE
 	caliber = "7.62mm"
 	max_ammo = 150

code/modules/halo/weapons/covenant/launchers.dm

@@ -5,7 +5,8 @@
 	icon = 'code/modules/halo/weapons/icons/fuel_rod_cannon.dmi'
 	icon_state = "fuel_rod"
 	item_state = "fuelrod"
-	fire_sound = 'code/modules/halo/sounds/Fuelrodfire.ogg'
+	fire_sound = 'code/modules/halo/sounds/fuel_rod_fire_2.ogg'
+	reload_sound = 'code/modules/halo/sounds/fuel_rod_reload.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/fuel_rod
 	fire_delay = 24 //disencourage spamming even though we have a higher mag size

code/modules/halo/weapons/covenant/lmg.dm

@@ -6,7 +6,7 @@
 	icon_state = "plasmarepeater"
 	item_state = "repeater"
 	w_class = ITEM_SIZE_HUGE
-	fire_sound = 'code/modules/halo/sounds/plasrifle3burst.ogg'
+	fire_sound = 'code/modules/halo/sounds/plasma_repeater_fire.ogg'
 	projectile_type = /obj/item/projectile/bullet/covenant/plasmarepeater
 	slot_flags = SLOT_BACK
 	one_hand_penalty = -1

code/modules/halo/weapons/covenant/pistols.dm

@@ -137,6 +137,7 @@
 	item_state = "needler"
 	slot_flags = SLOT_BELT||SLOT_HOLSTER
 	fire_sound = 'code/modules/halo/sounds/needlerfire.ogg'
+	reload_sound = 'code/modules/halo/sounds/needler_reload.ogg'
 	magazine_type = /obj/item/ammo_magazine/needles
 	handle_casings = CASELESS
 	caliber = "needler"

code/modules/halo/weapons/covenant/rifles.dm

@@ -59,6 +59,7 @@
 	name = "Type-25 Directed Energy Rifle (overcharged)"
 	icon_state = "Brute Plasma Rifle"
 	desc = "Also known as the \"Plasma Rifle\", this weapon fires bursts of superheated plasma at an accelerated rate. This one appears to be overcharged for fire speed at the cost of damage and accuracy."
+	fire_sound = 'code/modules/halo/sounds/brute_plasma_rifle_fire.ogg'
 	projectile_type = /obj/item/projectile/bullet/covenant/plasmarifle/brute
 	fire_delay = 5
 	burst_delay = 1.6

code/modules/halo/weapons/heavysniper.dm

@@ -13,6 +13,7 @@
 	load_method = SINGLE_CASING
 	max_shells = 2
 	ammo_type = /obj/item/ammo_casing/m233
+	fire_sound = 'code/modules/halo/sounds/anti_material_rifle_fire.ogg'
 	one_hand_penalty = -1
 	scoped_accuracy = 7
 	screen_shake = 0

code/modules/halo/weapons/shotguns.dm

@@ -7,8 +7,8 @@
 	icon = 'code/modules/halo/weapons/icons/Weapon Sprites.dmi'
 	icon_state = "m90"
 	item_state = "m90"
-	fire_sound = 'code/modules/halo/sounds/Shotgun_Fire_New.wav'
-	reload_sound = 'code/modules/halo/sounds/Shotgun_Reload_New.wav'
+	fire_sound = 'code/modules/halo/sounds/m90_fire.ogg'
+	reload_sound = 'code/modules/halo/sounds/m90_reload.ogg'
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet/high_power
 	caliber = "shotgunhighpower"
 	max_shells = 8
@@ -29,6 +29,17 @@
 		slot_s_store_str = 'code/modules/halo/weapons/icons/Armor_Weapons.dmi',
 		)
 
+/obj/item/weapon/gun/projectile/shotgun/pump/m90_ts/pump(mob/M as mob)
+	playsound(M, 'code/modules/halo/sounds/m90_pump.ogg', 60, 1)
+
+	if(chambered)//We have a shell in the chamber
+		chambered.eject(get_turf(src), angle2dir(dir2angle(loc.dir)+ejection_angle))//Eject casing
+		chambered = null
+
+	if(loaded.len)
+		var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
+		loaded -= AC //Remove casing from loaded list.
+		chambered = AC
 
 /obj/item/weapon/gun/projectile/shotgun/pump/m90_ts/verb/toggle_light()
 	set category = "Object"

maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm

@@ -53,7 +53,7 @@
 "ba" = (/obj/effect/hull_segment,/turf/simulated/wall/covenant,/area/covenant_light_cruiser/sangheiliquarters)
 "bb" = (/obj/structure/closet/crate/covenant{name = "Covenant Food Crate"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/obj/item/weapon/reagent_containers/food/snacks/slice/bread{desc = "A golden loaf made out of some sort of wheat."; icon_state = "gappletart"; name = "Irkun Loaf"},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
 "bc" = (/obj/machinery/light/covenant/north,/obj/machinery/overmap_comms/receiver/battlenet,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
-"bd" = (/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/structure/window/reinforced/projresist/covenant{dir = 1},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
+"bd" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 8},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "be" = (/obj/structure/window/reinforced/treated{basestate = "invis"; dir = 4; icon_state = "invis"},/obj/machinery/light/covenant/west,/obj/machinery/camera/autoname/invis/crs_transgression,/obj/structure/window/reinforced/projresist/covenant{tag = "icon-window (EAST)"; icon_state = "window"; dir = 4},/obj/structure/window/reinforced/projresist/covenant{dir = 1},/obj/structure/window/reinforced/projresist/covenant{dir = 8},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/starboardengine)
 "bf" = (/obj/structure/table/marble,/obj/machinery/light/covenant/north,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
 "bg" = (/obj/structure/bed/covenant,/obj/effect/landmark/start{name = "Jiralhanae Captain"},/obj/effect/landmark/start{mouse_over_pointer = 0; name = "Jiralhanae Major"},/obj/effect/landmark/start{name = "Jiralhanae Minor"},/obj/effect/landmark/start{name = "Jiralhanae Chieftain"},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
@@ -69,7 +69,7 @@
 "bq" = (/turf/simulated/wall/covenant/reinforced,/area/covenant_light_cruiser/droppods_sb)
 "br" = (/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
 "bs" = (/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/machinery/computer/helm/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
-"bt" = (/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/structure/window/reinforced/projresist/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
+"bt" = (/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/structure/window/reinforced/projresist/covenant{dir = 1},/obj/machinery/overmap_weapon_console/mac/orbital_bombard/energy_projector,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "bu" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 4},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
 "bv" = (/obj/structure/table/marble,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
 "bw" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 8},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
@@ -369,7 +369,7 @@
 "he" = (/obj/structure/window/reinforced/projresist/covenant{dir = 1},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "hf" = (/obj/machinery/light/invis,/obj/structure/closet/walllocker/emerglocker/covvie/west,/obj/machinery/portable_atmospherics/powered/scrubber/huge{description_info = "Provides power, runs on Tritium"; icon = 'code/modules/halo/icons/machinery/reactor2.dmi'; icon_state = "reactoron"; name = "Pinch fusion reactor"},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
 "hg" = (/obj/structure/stairs_decorative{icon_state = "stairs"; dir = 8},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
-"hh" = (/obj/structure/window/reinforced/projresist/covenant{dir = 1},/obj/machinery/overmap_weapon_console/mac/orbital_bombard/energy_projector,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
+"hh" = (/obj/structure/window/reinforced/projresist/covenant{dir = 1},/obj/structure/table/glass/purple,/obj/machinery/button/toggle/alarm_button/crs_alarm,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "hi" = (/obj/machinery/light/invis,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
 "hj" = (/obj/machinery/computer/cryopod/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/Rearhallway)
 "hk" = (/obj/machinery/light/covenant/east,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/starboardarmory)
@@ -395,7 +395,7 @@
 "hE" = (/obj/structure/window/reinforced/projresist/covenant{tag = "icon-window (EAST)"; icon_state = "window"; dir = 4},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "hF" = (/obj/machinery/light/covenant/east,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/boardcraft)
 "hG" = (/obj/effect/landmark/ghost_spawn,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
-"hH" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 8},/obj/machinery/button/toggle/alarm_button/crs_alarm{dir = 8; icon_state = "launcherbtt"; pixel_x = 20},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
+"hH" = (/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/structure/window/reinforced/projresist/covenant,/obj/machinery/overmap_weapon_console/npc_comms_console/cov,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "hI" = (/obj/structure/ai_routing_node/cov,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/starboardholdingcell)
 "hJ" = (/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/cargo)
 "hK" = (/obj/structure/table/marble,/obj/item/weapon/pinpointer/scanpoint_locator,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/plasmaprojector)
@@ -428,7 +428,7 @@
 "il" = (/obj/structure/ai_routing_node/cov,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/boardcraft)
 "im" = (/obj/machinery/light/covenant/north,/obj/structure/ai_routing_node/cov,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/porthangar)
 "in" = (/obj/structure/window/reinforced/projresist/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
-"io" = (/obj/machinery/overmap_weapon_console/npc_comms_console/cov{icon_state = "covie_nav_off"},/obj/structure/window/reinforced/projresist/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
+"io" = (/obj/structure/window/reinforced/projresist/covenant,/obj/structure/table/glass/purple,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "ip" = (/obj/machinery/light/covenant/north,/obj/machinery/camera/autoname/invis/crs_transgression,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "iq" = (/obj/structure/drop_pod_launchbay/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/porthangar)
 "ir" = (/obj/structure/window/reinforced/projresist/covenant{dir = 1},/obj/machinery/mac_cannon/ammo_loader/energy_projector,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
@@ -941,10 +941,10 @@ aaaaaaaaaaaaWHWHWHWHWHWHWHmNhJhJhJhJhJeZhJmOWHfwdLhkWHqmbJdubJbJdubJdubJbJdubJdO
 aaaaaaaaaaWHWHWHWHWHWHWHcWhJhJhJhJhJhJhJhJhJWHWHWHeeWHqmbJcscUcUcsbJcsgDgDcsbJfycscscscscscsfiaEfBbYbYbYaEehbYbYgFexflgzeOexdqdqejejejejejejejtZejejtZejejejmUpYcTopqaoqpnpnpnpnpnpnpnpNkKdqdqdqdSjqjIjJkbdSftftgpgpfegpftftftnAfffMepeXepepepepepepepepepepepepepepepepepepepeHeGaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaWHWHWHWHpmfNhJhJeZhJfNhJhJhJhJhJhJfvfRfvfvdibJbJdOcUcUdwbJdOgDgDdwbJcscscscscscscscsaEfBbYbYbYaEfAbYbYiGexgzeOeOexdqdqejejejejejgeejfDejejfDejeRejejejpZmPpRoqeQcTeQcTeQcTeQpQdtmVdqdqdSezdUdUiNdSftgphKfLgnkZgpfsftnAgmepephipupupupzpBpCephieYfOepeYepepepepepepeYfneGaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaWHWHWHpraGaGaGeBeBaGaGgohJpphJhJhJfafPfvfvdibJbJfyhPcUcsbJcsgDgDfibJgNcDcscscscsfhhdaEgcbYgbgfaEhOgdfFomexeNeOpOexghdqejejejejejfDfGfGgigjfGgifDfWeyejpWodpXpSeQcTeQpTeQpUeQqcdtdqdqdqdSdUkAkAkAdSgpgBfLfzjKfLpPgpgpgsgqgrgrgsgsgsgsgsgsgsgsgsnzgsgsnAepepepepepepnBfKeGaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaBXBXBXBXgGpwkJkJkJkJpwgOgPosfNfNmOdidifUfvdibJbJbJbJbJbJbJbJbJbJbJfQbJbJfScscscsbJbJaEaEaEaEaEaEaEaEaEaEexgwgxexexdQgvejejejgtfDfGfGfGfGfGfGfGfGfGhHejejejejejejejejejejejejejejdQdqdqdSdSdSdSdSgQhsfLfLfLhmgEgRgSgpgHgrgrgrgIgJnzgsgKhphrixgsgsgsgsnAhfepfOepeFhinAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaBXBXBXBXgGeAeAeAeAeAeAiUhJotfNhJhJgVgXgVgVgXgYgXgVgVgXgVgVgZgVhagXgVgWgXgVgVgVgVgXgWgVgXgVgVgXhagVgXgVgVgXgVgVdqdqdqdqejejeyejhcfGfGbdhhirhehehgfGfGfGfGfGipfGfGfGfGfGfGgjfGfGfGdqdqdqdpdqdrdqdqfLfLfLfLfLfLfLgnfLfLgrhohqhqhQiygsiAhththyhyowgLgMgsnAnAnAnYnAnAnAnAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaBXBXBXBXgGpwkJkJkJkJpwgOgPosfNfNmOdidifUfvdibJbJbJbJbJbJbJbJbJbJbJfQbJbJfScscscsbJbJaEaEaEaEaEaEaEaEaEaEexgwgxexexdQgvejejejgtfDfGfGfGfGfGfGfGfGfGbdejejejejejejejejejejejejejejdQdqdqdSdSdSdSdSgQhsfLfLfLhmgEgRgSgpgHgrgrgrgIgJnzgsgKhphrixgsgsgsgsnAhfepfOepeFhinAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaBXBXBXBXgGeAeAeAeAeAeAiUhJotfNhJhJgVgXgVgVgXgYgXgVgVgXgVgVgZgVhagXgVgWgXgVgVgVgVgXgWgVgXgVgVgXhagVgXgVgVgXgVgVdqdqdqdqejejeyejhcfGfGbthhirhehehgfGfGfGfGfGipfGfGfGfGfGfGgjfGfGfGdqdqdqdpdqdrdqdqfLfLfLfLfLfLfLgnfLfLgrhohqhqhQiygsiAhththyhyowgLgMgsnAnAnAnYnAnAnAnAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaBXBXBXBXgGeAeAeAeAeAeAkofNotgThJhJgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgViThAgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVdqdqdTekejejhBfDfGfGeSbshDfGfGhEBahGfGfGfGfGfGfGfGfGfGfGfGfGfGfGfGdqdTdqdqdqdqdqdqfLpagEgEhugEgEhwgEgEhSivhShTiwhUhVhWhXTZoSjtphhziBgsnAnAnAnZnAnAnAnAiQaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaBXBXBXBXgGpxeAeAeAeApxemhJotfNhJhJhNihgVgVihgVihgVhlihgVgVihgVgVihhlgVihgVgVgVgVihgVijihgVgVikgVgVhRgViiihgVgVnldqdqdqejejeyejhcfGfGbtioklininhgfGfGkpfGfGiefGfGfGfGfGfGjufGfGkpdqdqdqdqdqdqeidqkvfLfLfLfLfLfLfLfLitgriOnFnFnGiRgsjxizizpipipjiChvgsnAnAnAnYnAnAnAnAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaBXBXBXBXgGpxeAeAeAeApxemhJotfNhJhJhNihgVgVihgVihgVhlihgVgVihgVgVihhlgVihgVgVgVgVihgVijihgVgVikgVgVhRgViiihgVgVnldqdqdqejejeyejhcfGfGhHioklininhgfGfGkpfGfGiefGfGfGfGfGfGjufGfGkpdqdqdqdqdqdqeidqkvfLfLfLfLfLfLfLfLitgriOnFnFnGiRgsjxizizpipipjiChvgsnAnAnAnYnAnAnAnAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaBXBXBXBXiaaGaGeBeBaGaGfrfNoUfNfNmOiDiDkCiXiDiHiHiHiHiHiHiHiHiHiHiHiuiHiHiEiJiJiJiHiHiKiKiKiKiKiKiKiKiKiKeueIeJeueudQgvejejejkufDfGfGfGfGfGfGfGfGhMfocYcYibcYcYejejejejejejejejejdQdqgvdtdtdtdtdtgphCfLfLfLfLfLidifgpjWgrgrgrjylRnzgsnIoxoToWgsgsgsgsnAeoeperepepeonAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaDbDbDbpsfNfNfNfNfNfNfNfNhJothJhJhJiXiYiXiXiDiHiHjziqiqiJiHiJjAjAjBiHimcFiJiJiJiJfHfJiKjhjijjiFiKjljmiIiseufgfIdReughdqejejejejejfDfGfGiMhMfGiMgkejgAcYiZfGjrcYejejdtdtdtdtdtdtdtdqdqdqdtdtdtdtdtftgppgfLfLfLfLfVgpgpgsjLgrgrgsgsgsgsgsgsgsgsgsgsgsgsnBeFepepepeFepnBeveGaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaDbDbDbDbpmfNhJhJjPhJjQhJjQotjQhJhJhnkGiXiXiDiHiHjUiqiqfXiHjUjAjAfXiHjziJiJiJiJiJiJjBjCjDjijijEiKjVjijijFeufIfIfIeudEdqejfGgjfGejjeejfDejejfDejjfejjwcXcYjpcYcXejejdqdqdrdqdqdqdtdqdqdqdtdtdtdtdtfsftgpkLfLfLkLgpfsftnAgmepephxhZepfMeqepepeqepepepeoepepepepepepepepeHeGaaaaaaaaaaaaaaaaaaaaaaaaaa

maps/CRS_Unyielding_Transgression/overmap.dm

@@ -23,7 +23,8 @@
 	alert_message = "Alert! Warriors of the Great Journey and crew of this holy vessel, prepare for combat action!"
 	un_alert_message = "Red Alert lifted."
 	alarm_color_string = "#31005c"
-	alarm_sound = 'code/modules/halo/sounds/r_alert_alarm_loop_j2.ogg'
+	alarm_sound = 'code/modules/halo/sounds/crs_alarm.ogg'
+	alarm_loop_time = 60
 	area_base =/area/covenant_light_cruiser
 
 //Placeholders for the mapfile. If they have no desc they'll self-delete.