CRS Alarm

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

@@ -22,8 +22,9 @@
 /obj/machinery/button/toggle/alarm_button/crs_alarm
 	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_color_string = "#53897"
+	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.