diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm index 211f7e1601c..af945cdeacd 100644 --- a/code/unit_tests/map_tests.dm +++ b/code/unit_tests/map_tests.dm @@ -13,11 +13,16 @@ name = "MAP TEST template" /datum/unit_test/map_test/apc_area_test - name = "MAP: Area Test APC / Scrubbers / Vents (Station)" + name = "MAP: Area Test APC / Scrubbers / Vents / Alarms (Station)" /datum/unit_test/map_test/apc_area_test/start_test() - var/list/bad_areas = list() var/area_test_count = 0 + var/bad_apc = 0 + var/bad_airs = 0 + var/bad_airv = 0 + var/bad_fire = 0 + + var/fail_message = "" if (!current_map) return @@ -27,35 +32,44 @@ var/list/exempt_areas = typecacheof(current_map.ut_environ_exempt_areas) var/list/exempt_from_atmos = typecacheof(current_map.ut_atmos_exempt_areas) var/list/exempt_from_apc = typecacheof(current_map.ut_apc_exempt_areas) + var/list/exempt_from_fire = typecacheof(current_map.ut_fire_exempt_areas) for(var/area/A in typecache_filter_list_reverse(all_areas, exempt_areas)) if(isStationLevel(A.z)) area_test_count++ - var/area_good = 1 - var/bad_msg = "[ascii_red]--------------- [A.name]([A.type])" - + var/bad_msg = "[ascii_red]--------------- [A.name] ([A.type])" if(!A.apc && !is_type_in_typecache(A, exempt_from_apc)) log_unit_test("[bad_msg] lacks an APC.[ascii_reset]") - area_good = 0 + bad_apc++ if(!A.air_scrub_info.len && !is_type_in_typecache(A, exempt_from_atmos)) - log_unit_test("[bad_msg] lacks an Air scrubber.[ascii_reset]") - area_good = 0 + log_unit_test("[bad_msg] lacks an air scrubber.[ascii_reset]") + bad_airs++ if(!A.air_vent_info.len && !is_type_in_typecache(A, exempt_from_atmos)) - log_unit_test("[bad_msg] lacks an Air vent.[ascii_reset]") - area_good = 0 + log_unit_test("[bad_msg] lacks an air vent.[ascii_reset]") + bad_airv++ - if(!area_good) - bad_areas += A + if(!(locate(/obj/machinery/firealarm) in A) && !is_type_in_typecache(A, exempt_from_fire)) + log_unit_test("[bad_msg] lacks a fire alarm.[ascii_reset]") + bad_fire++ - if(bad_areas.len) - fail("\[[bad_areas.len]/[area_test_count]\]Some areas lacked APCs, Air Scrubbers, or Air vents.") + if(bad_apc) + fail_message += "\[[bad_apc]/[area_test_count]\] areas lacked an APC.\n" + if(bad_airs) + fail_message += "\[[bad_airs]/[area_test_count]\] areas lacked an air scrubber.\n" + if(bad_airv) + fail_message += "\[[bad_airv]/[area_test_count]\] areas lacked an air vent.\n" + if(bad_fire) + fail_message += "\[[bad_fire]/[area_test_count]\] areas lacked a fire alarm.\n" + + if(length(fail_message)) + fail(fail_message) else - pass("All \[[area_test_count]\] areas contained APCs, Air scrubbers, and Air vents.") + pass("All \[[area_test_count]\] areas contained APCs, air scrubbers, air vents, and fire alarms.") - return 1 + return TRUE //======================================================================================= diff --git a/html/changelogs/johnwildkins-firealarms.yml b/html/changelogs/johnwildkins-firealarms.yml new file mode 100644 index 00000000000..57e7b5a9f05 --- /dev/null +++ b/html/changelogs/johnwildkins-firealarms.yml @@ -0,0 +1,7 @@ +author: JohnWildkins + +delete-after: True + +changes: + - bugfix: "Adds missing fire alarms and emergency shutters to several rooms on the Horizon, Aurora, and Runtime." + - backend: "Adds a unit test to check that all rooms that should have a fire alarm, do." diff --git a/maps/_common/areas/derelict.dm b/maps/_common/areas/derelict.dm index 6695be26ae6..aebad2da6e3 100644 --- a/maps/_common/areas/derelict.dm +++ b/maps/_common/areas/derelict.dm @@ -191,6 +191,6 @@ name = "Solar Panel Control" icon_state = "yellow" -/area/construction/Storage +/area/construction/storage name = "Construction Site Storage" icon_state = "yellow" diff --git a/maps/_common/mapsystem/map_unit.dm b/maps/_common/mapsystem/map_unit.dm index d89bda15ab9..fe48da6e589 100644 --- a/maps/_common/mapsystem/map_unit.dm +++ b/maps/_common/mapsystem/map_unit.dm @@ -2,4 +2,5 @@ var/list/ut_environ_exempt_areas = list() var/list/ut_apc_exempt_areas = list() var/list/ut_atmos_exempt_areas = list() + var/list/ut_fire_exempt_areas = list() var/list/excluded_test_types = list() diff --git a/maps/aurora/aurora-2_under-station.dmm b/maps/aurora/aurora-2_under-station.dmm index d783430ffb4..8f4a6b6f10b 100644 --- a/maps/aurora/aurora-2_under-station.dmm +++ b/maps/aurora/aurora-2_under-station.dmm @@ -124,6 +124,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating{ roof_type = null }, @@ -169,6 +170,7 @@ /obj/structure/sign/flag/scc{ pixel_y = 32 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/carpet/rubber, /area/engineering/cooling) "pp" = ( diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 1ced196ed73..47bb22f365e 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -1212,6 +1212,7 @@ /obj/effect/floor_decal/corner/green{ dir = 9 }, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled/dark, /area/outpost/research/analysis) "ade" = ( @@ -2423,6 +2424,7 @@ dir = 1 }, /obj/machinery/washing_machine, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/rnd/xenoarch_storage) "afV" = ( @@ -6821,6 +6823,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -9619,6 +9622,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/firealarm/west, /turf/simulated/floor/bluegrid{ name = "cooled mainframe floor"; temperature = 278 @@ -29598,6 +29602,10 @@ "iOl" = ( /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora_hazard) +"iOt" = ( +/obj/machinery/firealarm/east, +/turf/simulated/floor/beach/water/pool, +/area/medical/patient_wing_gym) "iOJ" = ( /obj/structure/lattice, /turf/unsimulated/floor/asteroid/ash/rocky, @@ -29870,6 +29878,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/engineering/storage_sublevel) "jkR" = ( @@ -30848,6 +30857,15 @@ }, /turf/simulated/floor/plating, /area/medical/medbay4) +"lXb" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled, +/area/turret_protected/ai_upload_foyer) "lXe" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -32670,6 +32688,7 @@ /area/outpost/engineering/hallway) "poo" = ( /obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/engineering/backup_SMES) "prR" = ( @@ -83855,7 +83874,7 @@ gll aJk mWx lZJ -bfE +iOt eCm krN jVc @@ -84586,7 +84605,7 @@ amO apf apE aqi -apE +lXb arq amO amO diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 9e0396451e7..b8b52b704ac 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -4107,6 +4107,7 @@ /obj/machinery/computer/cryopod/robot{ pixel_y = 30 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "ahZ" = ( @@ -6663,6 +6664,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled/dark, /area/rnd/strongroom) "ank" = ( @@ -6833,6 +6835,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/plating, /area/engineering/storage_hard) "anE" = ( @@ -16451,6 +16454,7 @@ "aDi" = ( /obj/effect/decal/cleanable/cobweb2, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/teleporter) "aDj" = ( @@ -16730,6 +16734,7 @@ /obj/machinery/shower{ pixel_y = 15 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "aDI" = ( @@ -27228,6 +27233,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/bridge/ailobby) "aUO" = ( @@ -30983,6 +30989,7 @@ /obj/structure/bed/stool/chair{ dir = 8 }, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/assembly/robotics_cyborgification) "bbC" = ( @@ -56196,7 +56203,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/cargo) +/area/quartermaster/storage) "cdC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -59361,6 +59368,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) +"dez" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/firealarm/north, +/turf/simulated/floor/plating, +/area/storage/tech) "dfb" = ( /obj/machinery/light{ dir = 8 @@ -60836,6 +60850,7 @@ dir = 9 }, /obj/item/wrench, +/obj/machinery/firealarm/east, /turf/simulated/floor/plating, /area/medical/cryo) "fNM" = ( @@ -62345,6 +62360,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/assembly/robotics_cyborgification) +"ijX" = ( +/obj/structure/flora/pottedplant/random, +/obj/machinery/firealarm/east, +/turf/simulated/floor/wood, +/area/journalistoffice) "ikm" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, @@ -63250,6 +63270,15 @@ /area/security/forensics_office{ name = "Security - Investigations Office" }) +"kzA" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/landmark/engine_setup/coolant_canister, +/obj/machinery/firealarm/east, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "kzE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -63308,6 +63337,10 @@ }, /turf/simulated/floor/grass/alt, /area/hydroponics) +"kFz" = ( +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "kGv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool, @@ -68954,6 +68987,9 @@ spawn_cartridges = list(/obj/item/reagent_containers/chem_disp_cartridge/coffee,/obj/item/reagent_containers/chem_disp_cartridge/milk,/obj/item/reagent_containers/chem_disp_cartridge/cream,/obj/item/reagent_containers/chem_disp_cartridge/sugar) }, /obj/structure/table/wood, +/obj/machinery/firealarm/east{ + pixel_y = 6 + }, /turf/simulated/floor/carpet, /area/lawoffice) "ulG" = ( @@ -70005,6 +70041,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -70692,6 +70729,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) +"xin" = ( +/obj/machinery/firealarm/west, +/turf/simulated/floor/reinforced, +/area/security/nuke_storage) "xjD" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -70888,6 +70929,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) +"xwD" = ( +/obj/machinery/firealarm/west, +/turf/simulated/floor/plating, +/area/engineering/engine_waste) "xxd" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/structure/table/glass, @@ -83315,7 +83360,7 @@ aaa ahi ahU aiP -ajC +xwD akk ajC ahi @@ -84361,7 +84406,7 @@ aBK aDF anu anu -aDF +kzA azQ aMB alk @@ -90799,7 +90844,7 @@ aYc aZd aVq bbq -bcU +dez ohL beA bfO @@ -93951,7 +93996,7 @@ caU cbn caU cct -caU +kFz cbo bZx cdT @@ -110583,7 +110628,7 @@ aCb aSJ aUr aVD -aRa +ijX aPu aZS baU @@ -111595,7 +111640,7 @@ aiO aiO aiO asf -aoo +xin ayx aoo avg diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 1e8774af2f8..283a644b705 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -2842,6 +2842,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 12 }, +/obj/machinery/firealarm/north, /turf/simulated/floor/grass/alt, /area/hydroponics/garden) "ckT" = ( @@ -5645,6 +5646,10 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry/stairs) +"eTa" = ( +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/toilet) "eTH" = ( /obj/machinery/door/airlock/external{ frequency = 1337; @@ -10204,6 +10209,13 @@ }, /turf/simulated/floor/plating, /area/tcommsat/entrance) +"iQw" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled, +/area/tcommsat/lounge) "iQS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -20166,6 +20178,10 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/research) +"rpG" = ( +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, +/area/turret_protected/tcomfoyer) "rqf" = ( /obj/machinery/smartfridge/drying_rack, /obj/machinery/light{ @@ -23466,6 +23482,11 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/bridge/levela/research_dock) +"tZL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/west, +/turf/simulated/floor/plating, +/area/store) "uaq" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -25948,6 +25969,15 @@ }, /turf/simulated/floor/grass/alt, /area/hydroponics/garden) +"wiv" = ( +/obj/machinery/firealarm/north, +/turf/simulated/floor/bluegrid{ + name = "Mainframe Base"; + nitrogen = 100; + oxygen = 0; + temperature = 80 + }, +/area/tcommsat/chamber) "wkD" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -26222,8 +26252,7 @@ }, /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/closet/secure_closet/freezer{ - icon_state = "freezer" - name = "cafe fridge" + icon_state = "freezer"name = "cafe fridge" }, /obj/machinery/button/remote/blast_door{ id = "poolcafe"; @@ -39051,7 +39080,7 @@ hlb qRF rjc qys -xBr +wiv mRI uso mRI @@ -40346,7 +40375,7 @@ mRI mRI xBr qys -czc +rpG fEH scq exe @@ -41095,7 +41124,7 @@ gfY bPW moB odh -odh +iQw fSf pcH kii @@ -52404,7 +52433,7 @@ nZj wHS mox aEx -tSy +tZL ePX tSy nvR @@ -58570,7 +58599,7 @@ pTq gqB meV lOa -kjO +eTa kjO vnh alj diff --git a/maps/aurora/code/aurora_unittest.dm b/maps/aurora/code/aurora_unittest.dm index 114cd683551..398c2c2f7aa 100644 --- a/maps/aurora/code/aurora_unittest.dm +++ b/maps/aurora/code/aurora_unittest.dm @@ -36,6 +36,16 @@ ,/area/medical/patient_c ,/area/security/penal_colony ) + ut_fire_exempt_areas = list( + /area/maintenance, + /area/rnd/isolation_a, + /area/rnd/isolation_b, + /area/rnd/isolation_c, + /area/rnd/test_area, + /area/rnd/xenobiology/cells, + /area/security/penal_colony, + /area/turret_protected/tcomsat + ) /datum/unit_test/zas_area_test/aurora map_path = "aurora" diff --git a/maps/runtime/code/runtime_unittest.dm b/maps/runtime/code/runtime_unittest.dm index 00d9cfaf359..7db9cb7af89 100644 --- a/maps/runtime/code/runtime_unittest.dm +++ b/maps/runtime/code/runtime_unittest.dm @@ -5,6 +5,18 @@ ) ut_apc_exempt_areas = list(/area/maintenance/maintcentral) ut_atmos_exempt_areas = list(/area) + ut_fire_exempt_areas = list( + /area/maintenance/maintcentral, + /area/shuttle/runtime, + /area/space, + /area/turbolift, + /area/construction/storage, + /area/turret_protected/ai_upload_foyer, + /area/turret_protected/ai, + /area/tcommsat/chamber, + /area/tcommsat/computer, + /area/construction/hallway + ) excluded_test_types = list( /datum/unit_test/zas_area_test, /datum/unit_test/foundation/step_shall_return_true_on_success diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm index b2f3a533f48..7ab866c48e3 100644 --- a/maps/runtime/runtime-1.dmm +++ b/maps/runtime/runtime-1.dmm @@ -361,6 +361,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "aR" = ( @@ -387,6 +388,7 @@ /obj/machinery/door/airlock/glass_engineering{ name = "Gravity Generator" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) "aU" = ( @@ -450,6 +452,7 @@ c_tag = "Engineering - Engine Airlock"; dir = 4 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "be" = ( @@ -492,6 +495,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/engineering/atmos) "bj" = ( @@ -519,6 +523,7 @@ c_tag = "Engineering - Technical Storage"; dir = 1 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/engineering) "bm" = ( @@ -555,6 +560,7 @@ "bq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/engineering, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/engineering/atmos) "br" = ( @@ -575,6 +581,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/engineering) "bv" = ( @@ -675,6 +682,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/bridge) "bJ" = ( @@ -918,6 +926,7 @@ /area/hallway/secondary/entry) "cj" = ( /obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hallway/secondary/entry) "ck" = ( @@ -984,10 +993,12 @@ /obj/machinery/door/airlock/glass_command{ name = "Bridge" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/bridge) "ct" = ( /obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/secondary/entry) "cu" = ( @@ -1165,6 +1176,7 @@ /area/construction) "cN" = ( /obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/construction) "cO" = ( @@ -1188,6 +1200,7 @@ /area/storage/primary) "cS" = ( /obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/storage/primary) "cT" = ( @@ -1354,6 +1367,7 @@ /area/construction) "dr" = ( /obj/machinery/door/airlock, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/storage/primary) "ds" = ( @@ -1654,6 +1668,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) +"zQ" = ( +/obj/machinery/firealarm/south, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) "Bd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1662,6 +1680,7 @@ /area/construction) "Ct" = ( /obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/storage/primary) "EN" = ( @@ -1757,6 +1776,10 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) +"KE" = ( +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, +/area/storage/primary) "Ly" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1843,10 +1866,25 @@ "Vm" = ( /turf/simulated/floor/shuttle, /area/shuttle/runtime) +"WH" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, +/area/construction) "WS" = ( /obj/turbolift_map_holder/runtime, /turf/simulated/floor/plating, /area/turbolift/main_station) +"XQ" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 1 + }, +/obj/effect/floor_decal/corner/white{ + dir = 8 + }, +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry) "Yc" = ( /obj/effect/landmark{ name = "carpspawn" @@ -3321,9 +3359,9 @@ mn br cA bB -bB +zQ cK -cV +WH de de de @@ -3859,7 +3897,7 @@ cx bB bB cP -da +KE da dl dc @@ -4255,7 +4293,7 @@ at bv bQ ch -uI +XQ uI cE cF diff --git a/maps/runtime/runtime-2.dmm b/maps/runtime/runtime-2.dmm index bfcd907d41e..c9f41c7f08b 100644 --- a/maps/runtime/runtime-2.dmm +++ b/maps/runtime/runtime-2.dmm @@ -12,10 +12,10 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/airless, -/area/construction/Storage) +/area/construction/storage) "aO" = ( /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "aQ" = ( /obj/machinery/power/apc{ dir = 4; @@ -35,7 +35,7 @@ }, /obj/effect/decal/warning_stripes, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "cB" = ( /obj/machinery/light{ brightness_range = 16; @@ -46,7 +46,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "dr" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -55,7 +55,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "dB" = ( /obj/machinery/computer/telecomms/monitor{ network = "tcommsat" @@ -223,7 +223,7 @@ dir = 6 }, /turf/simulated/wall/r_wall, -/area/construction/Storage) +/area/construction/storage) "hD" = ( /turf/simulated/floor/airless, /area/template_noop) @@ -232,10 +232,10 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "hJ" = ( /turf/simulated/open, -/area/construction/Storage) +/area/construction/storage) "iE" = ( /obj/structure/cable{ d1 = 16; @@ -245,7 +245,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /turf/simulated/floor/airless, -/area/construction/Storage) +/area/construction/storage) "iR" = ( /turf/template_noop, /area/template_noop) @@ -264,7 +264,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "lK" = ( /obj/machinery/telecomms/broadcaster/preset_right, /turf/simulated/floor/bluegrid{ @@ -280,7 +280,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "nc" = ( /obj/machinery/alarm{ locked = 0; @@ -304,7 +304,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "nR" = ( /obj/machinery/power/apc/super{ name = "south bump"; @@ -325,7 +325,7 @@ }, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "ov" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable{ @@ -337,7 +337,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "ow" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -399,7 +399,7 @@ dir = 5 }, /turf/simulated/wall/r_wall, -/area/construction/Storage) +/area/construction/storage) "sF" = ( /obj/machinery/telecomms/relay/preset/station, /turf/simulated/floor/bluegrid{ @@ -476,7 +476,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "tv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -553,17 +553,17 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "wb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/wall/r_wall, -/area/construction/Storage) +/area/construction/storage) "wf" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "wp" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 @@ -588,7 +588,7 @@ pixel_y = 22 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "wJ" = ( /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -600,7 +600,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "xI" = ( /obj/structure/cable{ d1 = 32; @@ -610,7 +610,7 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/zpipe/down/supply, /turf/simulated/open, -/area/construction/Storage) +/area/construction/storage) "xN" = ( /obj/machinery/telecomms/receiver/preset_right, /turf/simulated/floor/bluegrid{ @@ -642,14 +642,14 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "yH" = ( /turf/template_noop, /area/space) "zQ" = ( /obj/structure/lattice/catwalk, /turf/simulated/open, -/area/construction/Storage) +/area/construction/storage) "Ab" = ( /obj/structure/cable{ d1 = 2; @@ -704,7 +704,7 @@ }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Dd" = ( /obj/machinery/light{ brightness_range = 16; @@ -783,7 +783,7 @@ /area/tcommsat/chamber) "Ex" = ( /turf/simulated/wall/r_wall, -/area/construction/Storage) +/area/construction/storage) "Fo" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -813,7 +813,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "GG" = ( /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -862,7 +862,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Jr" = ( /obj/structure/table/standard, /obj/item/paper/monitorkey, @@ -935,7 +935,7 @@ "MO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall/r_wall, -/area/construction/Storage) +/area/construction/storage) "MW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -944,7 +944,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Nz" = ( /turf/simulated/wall/r_wall, /area/turret_protected/ai) @@ -993,7 +993,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Pc" = ( /obj/machinery/camera/network/command{ c_tag = "Telecomms"; @@ -1014,7 +1014,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Pv" = ( /obj/machinery/light{ brightness_range = 16; @@ -1035,7 +1035,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "QF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1044,13 +1044,13 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "QS" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "QX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled{ @@ -1070,7 +1070,7 @@ "RK" = ( /obj/structure/stairs/south, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "RM" = ( /obj/machinery/light{ brightness_range = 16; @@ -1125,7 +1125,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Um" = ( /obj/structure/cable{ d1 = 4; @@ -1151,13 +1151,13 @@ name = "skrell_entry" }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Vd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled, -/area/construction/Storage) +/area/construction/storage) "Vp" = ( /turf/simulated/wall/r_wall, /area/tcommsat/chamber) @@ -1195,7 +1195,7 @@ /obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk, /turf/simulated/open, -/area/construction/Storage) +/area/construction/storage) "Xd" = ( /obj/structure/cable{ d2 = 8; @@ -1255,7 +1255,7 @@ dir = 4 }, /turf/simulated/wall/r_wall, -/area/construction/Storage) +/area/construction/storage) "ZL" = ( /obj/structure/cable/cyan{ d1 = 4; diff --git a/maps/sccv_horizon/code/sccv_horizon_unittest.dm b/maps/sccv_horizon/code/sccv_horizon_unittest.dm index 9e1297beba8..421551eb474 100644 --- a/maps/sccv_horizon/code/sccv_horizon_unittest.dm +++ b/maps/sccv_horizon/code/sccv_horizon_unittest.dm @@ -16,36 +16,35 @@ ,/area/turbolift ,/area/mine ,/area/horizonexterior - ) - ut_apc_exempt_areas = list(/area/construction - ,/area/medical/genetics - ,/area/horizonexterior - ) - ut_atmos_exempt_areas = list(/area/maintenance - ,/area/storage - ,/area/engineering/atmos/storage - ,/area/rnd/test_area ,/area/construction + ) + ut_apc_exempt_areas = list() + ut_atmos_exempt_areas = list(/area/maintenance + ,/area/engineering/atmos/storage ,/area/server - ,/area/security/nuke_storage ,/area/tcommsat/chamber ,/area/bridge/aibunker - ,/area/engineering/cooling ,/area/outpost/research/emergency_storage - ,/area/bridge/selfdestruct ,/area/medical/cryo - ,/area/medical/patient_c + ,/area/medical/surgery ,/area/turret_protected/ai - ,/area/engineering/engine_monitoring/tesla - ,/area/engineering/smes - ,/area/horizonexterior + ,/area/engineering/smes/tesla ,/area/tcommsat/mainlvl_tcomms__relay ,/area/tcommsat/mainlvl_tcomms__relay/second - ,/area/medical/surgery ,/area/rnd/isolation_a ,/area/rnd/isolation_b ,/area/rnd/isolation_c ) + ut_fire_exempt_areas = list( + /area/maintenance, + /area/construction, + /area/bridge/aibunker, + /area/medical/cryo, + /area/horizon/crew_quarters/cryo/washroom, + /area/rnd/isolation_a, + /area/rnd/isolation_b, + /area/rnd/isolation_c + ) /datum/unit_test/zas_area_test/sccv_horizon map_path = "sccv_horizon" diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index e6c773a3da2..1165d4f5fe0 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -7219,6 +7219,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 }, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "fKk" = ( @@ -8033,6 +8034,7 @@ c_tag = "Security - First Deck Checkpoin"; dir = 4 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "gnn" = ( @@ -23963,6 +23965,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/tcommsat/mainlvl_tcomms__relay) "tHv" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 8ca1caffa38..ad2e237916c 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2265,6 +2265,7 @@ name = "Powernet Sensor - Master Grid"; name_tag = "Master" }, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/engineering/engine_waste) "bdy" = ( @@ -4732,6 +4733,7 @@ /obj/machinery/door/airlock/maintenance{ req_access = list(24) }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "cDD" = ( @@ -5797,6 +5799,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm/south, /turf/simulated/floor/reinforced, /area/storage/secure) "dki" = ( @@ -10676,6 +10679,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) +"fYi" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 10 + }, +/obj/machinery/firealarm/south, +/turf/simulated/floor/tiled/dark, +/area/rnd/hallway) "fYC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11725,6 +11735,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 9 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/engineering/storage/tech) "gyC" = ( @@ -12567,6 +12578,10 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/storage/tech) +"gVl" = ( +/obj/machinery/firealarm/east, +/turf/simulated/floor/wood, +/area/library) "gVn" = ( /turf/simulated/wall, /area/horizon/stairwell/central) @@ -13505,6 +13520,11 @@ /obj/structure/lattice, /turf/simulated/open/airless, /area/horizonexterior) +"hwf" = ( +/obj/structure/bed/stool/padded/red, +/obj/machinery/firealarm/south, +/turf/simulated/floor/wood, +/area/hydroponics/garden) "hww" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -13700,6 +13720,7 @@ c_tag = "Engineering - Tesla Room 4"; dir = 1 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "hCj" = ( @@ -16293,6 +16314,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/mauve/diagonal, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/white, /area/rnd/chemistry) "jeb" = ( @@ -16439,6 +16461,7 @@ c_tag = "Operations - Mail Sorting"; dir = 1 }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/operations/mail_room) "jih" = ( @@ -16964,14 +16987,19 @@ /obj/effect/floor_decal/corner/orange/full{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 5 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/firealarm/east{ + pixel_x = 29; + pixel_y = -5 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 9 + }, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "jwc" = ( @@ -18175,6 +18203,7 @@ c_tag = "Medical - Main Storage"; dir = 8 }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "kiK" = ( @@ -24932,6 +24961,7 @@ /obj/item/roller{ pixel_y = 4 }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled/white, /area/medical/reception) "off" = ( @@ -28696,6 +28726,7 @@ }, /obj/effect/floor_decal/industrial/hatch/grey, /obj/item/storage/box/monkeycubes, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/freezer{ name = "cold storage tiles"; temperature = 278 @@ -28917,6 +28948,7 @@ c_tag = "Security - Corridor Camera 3"; dir = 4 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/security/brig) "qnl" = ( @@ -30549,6 +30581,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/engineering/smes) "rgH" = ( @@ -31115,6 +31148,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "ruS" = ( @@ -31359,6 +31393,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/security/brig) "rCd" = ( @@ -35163,6 +35198,10 @@ /obj/item/circuitboard/arcade/battle, /turf/simulated/floor/tiled/dark, /area/engineering/storage/tech) +"tKs" = ( +/obj/machinery/firealarm/north, +/turf/simulated/floor/plating, +/area/engineering/smes/tesla) "tKw" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -36381,6 +36420,7 @@ c_tag = "Dinner - Kitchen Freezer"; dir = 4 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -36755,6 +36795,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "uzL" = ( @@ -37706,6 +37747,7 @@ name = "south bump"; pixel_y = -24 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/plating, /area/tcommsat/mainlvl_tcomms__relay/second) "vbk" = ( @@ -42671,6 +42713,7 @@ /area/maintenance/wing/starboard) "xGz" = ( /obj/machinery/light, +/obj/machinery/firealarm/south, /turf/simulated/floor/carpet/rubber, /area/rnd/strongroom) "xGM" = ( @@ -43358,6 +43401,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/security/prison) "xZw" = ( @@ -65274,14 +65318,14 @@ pWx oNS lnr tPJ -pea +gVl rAn xOo gFc tpc mBk mBk -mBk +hwf dvw bTM lgB @@ -66843,7 +66887,7 @@ mte mte cQS wfD -bTg +tKs bTg vQl hpw @@ -70300,7 +70344,7 @@ viR rbK iRq wpb -rnA +fYi kGX alr cAx @@ -73330,7 +73374,7 @@ mPn rFn bDv daM -rnA +fYi wsW iwF iwF diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 297ae70ce85..1c9d66de919 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -1736,6 +1736,7 @@ /obj/effect/floor_decal/corner/purple{ dir = 9 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/horizon/deck_three/nature_showcase) "do" = ( @@ -4533,6 +4534,7 @@ }, /obj/item/circuitboard/telecomms/relay, /obj/item/circuitboard/ntnet_relay, +/obj/machinery/firealarm/north, /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "iv" = ( @@ -4974,6 +4976,7 @@ /obj/structure/mirror{ pixel_x = 25 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/showers) "jh" = ( @@ -7910,6 +7913,7 @@ c_tag = "Bridge - Crewman Lockeroom"; dir = 1 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "oE" = ( @@ -9314,6 +9318,12 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) +"rq" = ( +/obj/machinery/porta_turret/stationary, +/obj/effect/floor_decal/industrial/warning/full, +/obj/machinery/firealarm/east, +/turf/simulated/floor/reinforced, +/area/bridge/selfdestruct) "rr" = ( /obj/machinery/light_switch{ dir = 8; @@ -9322,6 +9332,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/firealarm/east{ + pixel_x = 29; + pixel_y = -5 + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/showers) "rs" = ( @@ -9335,6 +9349,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/engineering_ladder) +"ru" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled/white, +/area/medical/ward/isolation) "rv" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/spline/fancy/wood{ @@ -12127,6 +12146,17 @@ /obj/item/device/flashlight/lamp/lava/pink, /turf/simulated/floor/carpet/art, /area/crew_quarters/lounge/secondary) +"wE" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/emergency) "wF" = ( /obj/machinery/computer/telecomms/monitor{ network = "tcommsat" @@ -14379,10 +14409,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/structure/flora/pottedplant/random, /obj/machinery/camera/network/command{ c_tag = "Bridge - Breakroom" }, +/obj/machinery/firealarm/north, /turf/simulated/floor/wood, /area/bridge/minibar) "AP" = ( @@ -15038,6 +15068,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/bridge/third_deck_stairs) "Ce" = ( @@ -18473,6 +18504,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "Iy" = ( @@ -18614,6 +18646,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "IN" = ( @@ -19946,6 +19979,7 @@ table_reinf = "glass" }, /obj/item/folder, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/white, /area/medical/ward) "Li" = ( @@ -20028,10 +20062,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 9 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/security/investigations) "Lr" = ( @@ -26194,6 +26225,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/washroom) "WN" = ( @@ -44146,7 +44178,7 @@ Rt ib qs Um -qJ +ru qJ qJ qJ @@ -47599,7 +47631,7 @@ KL dc wV dc -KL +rq Zm sb Zr @@ -52434,7 +52466,7 @@ po wK lT Lr -Lr +wE ie sd Eb