diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 4ed9278cd1c..7fcf54e36ba 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -6864,10 +6864,8 @@ "yD" = ( /obj/structure/rack, /obj/effect/turf_decal/delivery, -/obj/machinery/alarm/monitor{ - dir = 8; - locked = 0; - pixel_x = 24 +/obj/machinery/alarm/monitor/directional/east{ + locked = 0 }, /obj/item/analyzer, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index beca406c5a3..b491af4be5c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -999,8 +999,7 @@ /turf/simulated/floor/plasteel/white, /area/ruin/ancientstation/proto) "cW" = ( -/obj/machinery/alarm/all_access{ - pixel_y = 24; +/obj/machinery/alarm/all_access/directional/north{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -1202,9 +1201,7 @@ /turf/simulated/wall, /area/ruin/ancientstation/sec) "dB" = ( -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -1702,9 +1699,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /turf/simulated/floor/plasteel{ @@ -1883,9 +1878,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/alarm/all_access{ - dir = 4; - pixel_x = -24; +/obj/machinery/alarm/all_access/directional/west{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -2197,9 +2190,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /turf/simulated/floor/plasteel, @@ -2228,9 +2219,7 @@ "fP" = ( /obj/structure/rack, /obj/item/clothing/suit/space/nasavoid/old, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -2658,9 +2647,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm/all_access{ - dir = 4; - pixel_x = -24; +/obj/machinery/alarm/all_access/directional/west{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -2873,9 +2860,7 @@ "hj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /mob/living/simple_animal/hostile/hivebot, @@ -4348,8 +4333,7 @@ /area/ruin/ancientstation/atmo) "kx" = ( /obj/effect/decal/cleanable/egg_smudge, -/obj/machinery/alarm/all_access{ - pixel_y = 24; +/obj/machinery/alarm/all_access/directional/north{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -4563,9 +4547,7 @@ "lb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /turf/simulated/floor/plasteel, @@ -4635,12 +4617,8 @@ }, /area/ruin/ancientstation/hydroponics) "lj" = ( -/obj/machinery/alarm{ - dir = 1; - name = "custom placement"; - pixel_y = -22 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "greencorner" @@ -4828,9 +4806,7 @@ }, /area/ruin/ancientstation/engi) "lA" = ( -/obj/machinery/alarm/all_access{ - dir = 4; - pixel_x = -24; +/obj/machinery/alarm/all_access/directional/west{ report_danger_level = 0 }, /obj/structure/rack, @@ -4870,9 +4846,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm/all_access{ - dir = 4; - pixel_x = -24; +/obj/machinery/alarm/all_access/directional/west{ report_danger_level = 0 }, /obj/effect/decal/cleanable/dirt, @@ -4925,9 +4899,7 @@ /area/ruin/ancientstation/atmo) "lK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /mob/living/simple_animal/hostile/hivebot, @@ -4952,9 +4924,7 @@ /area/ruin/ancientstation/sec) "lN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24; +/obj/machinery/alarm/all_access/directional/east{ report_danger_level = 0 }, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 58647062576..9c2fcf54cdc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -779,11 +779,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/atmos) "eD" = ( -/obj/machinery/alarm/syndicate{ - pixel_x = -24; - name = "Syndie West Air Alarm"; - dir = 4 - }, +/obj/machinery/alarm/syndicate/directional/west, /obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ icon_state = "darkgreen"; @@ -1149,11 +1145,7 @@ /area/ruin/unpowered/syndicate_space_base/chemistry) "gt" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm/syndicate{ - pixel_x = -24; - name = "Syndie West Air Alarm"; - dir = 4 - }, +/obj/machinery/alarm/syndicate/directional/west, /obj/item/storage/box/monkeycubes/syndicate{ pixel_x = 7; pixel_y = 7 @@ -2055,11 +2047,7 @@ /turf/simulated/floor/grass, /area/ruin/unpowered/syndicate_space_base/service) "ld" = ( -/obj/machinery/alarm/syndicate{ - pixel_y = -24; - dir = 1; - name = "Syndie South Air Alarm" - }, +/obj/machinery/alarm/syndicate/directional/south, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "lo" = ( @@ -4003,11 +3991,7 @@ /obj/item/reagent_containers/drinks/flask/barflask, /obj/item/reagent_containers/drinks/flask/barflask, /obj/structure/table/wood, -/obj/machinery/alarm/syndicate{ - pixel_x = -24; - name = "Syndie West Air Alarm"; - dir = 4 - }, +/obj/machinery/alarm/syndicate/directional/west, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -4210,11 +4194,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm/syndicate{ - pixel_x = -24; - name = "Syndie West Air Alarm"; - dir = 4 - }, +/obj/machinery/alarm/syndicate/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -4330,10 +4310,7 @@ }, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "xO" = ( -/obj/machinery/alarm/syndicate{ - name = "Syndie North Air Alarm"; - pixel_y = 24 - }, +/obj/machinery/alarm/syndicate/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -5199,10 +5176,7 @@ }, /area/ruin/unpowered/syndicate_space_base/dormitories) "CR" = ( -/obj/machinery/alarm/syndicate{ - name = "Syndie North Air Alarm"; - pixel_y = 24 - }, +/obj/machinery/alarm/syndicate/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5546,10 +5520,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "EU" = ( -/obj/machinery/alarm/syndicate{ - name = "Syndie North Air Alarm"; - pixel_y = 24 - }, +/obj/machinery/alarm/syndicate/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -5750,11 +5721,7 @@ }, /area/ruin/unpowered/syndicate_space_base/main) "FP" = ( -/obj/machinery/alarm/syndicate{ - pixel_x = -24; - name = "Syndie West Air Alarm"; - dir = 4 - }, +/obj/machinery/alarm/syndicate/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -6142,10 +6109,7 @@ }, /area/ruin/unpowered/syndicate_space_base/main) "Ik" = ( -/obj/machinery/alarm/syndicate{ - name = "Syndie North Air Alarm"; - pixel_y = 24 - }, +/obj/machinery/alarm/syndicate/directional/north, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/atmos) "Il" = ( @@ -7130,11 +7094,7 @@ /obj/item/handheld_defibrillator, /obj/item/handheld_defibrillator, /obj/item/defibrillator, -/obj/machinery/alarm/syndicate{ - pixel_x = 24; - name = "Syndie West Air Alarm"; - dir = 8 - }, +/obj/machinery/alarm/syndicate/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -8144,11 +8104,7 @@ /area/ruin/unpowered/syndicate_space_base/engineering) "TW" = ( /obj/structure/table, -/obj/machinery/alarm/syndicate{ - pixel_y = -24; - dir = 1; - name = "Syndie South Air Alarm" - }, +/obj/machinery/alarm/syndicate/directional/south, /obj/item/stack/sheet/metal/fifty, /obj/item/storage/toolbox/mechanical, /obj/item/storage/box/beakers, @@ -8255,11 +8211,7 @@ }, /area/ruin/unpowered/syndicate_space_base/arrivals) "UC" = ( -/obj/machinery/alarm/syndicate{ - pixel_x = -24; - name = "Syndie West Air Alarm"; - dir = 4 - }, +/obj/machinery/alarm/syndicate/directional/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -8577,11 +8529,7 @@ }, /area/ruin/unpowered/syndicate_space_base/virology) "Wr" = ( -/obj/machinery/alarm/syndicate{ - pixel_x = 24; - name = "Syndie West Air Alarm"; - dir = 8 - }, +/obj/machinery/alarm/syndicate/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8781,11 +8729,7 @@ "Xn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm/syndicate{ - pixel_x = 24; - name = "Syndie West Air Alarm"; - dir = 8 - }, +/obj/machinery/alarm/syndicate/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 54348ce265b..9769e9b96be 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -550,11 +550,7 @@ /area/mine/outpost/storage) "bX" = ( /obj/machinery/suit_storage_unit/lavaland, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkyellowcorners" @@ -1469,11 +1465,7 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white"; dir = 8 @@ -2627,11 +2619,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Mining Outpost - Communications"; network = list("Mining Outpost"); @@ -2783,11 +2771,7 @@ /area/mine/laborcamp) "gw" = ( /obj/machinery/economy/vending/snack, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -3236,10 +3220,7 @@ network = list("Mining Outpost"); dir = 5 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -4360,11 +4341,7 @@ /obj/item/radio/intercom/locked/prison{ pixel_y = -28 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/table, /obj/item/paper_bin{ pixel_x = 1; @@ -4526,10 +4503,7 @@ /area/mine/laborcamp) "oa" = ( /obj/machinery/computer/card/minor/qm, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) "ob" = ( @@ -5372,10 +5346,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -6501,11 +6472,7 @@ }, /area/mine/laborcamp) "Ai" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Mining Outpost - West Hallway"; dir = 1; @@ -7978,10 +7945,7 @@ "Jl" = ( /obj/structure/table, /obj/item/storage/firstaid/machine, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "Jn" = ( @@ -8777,11 +8741,7 @@ /obj/machinery/light/small, /obj/structure/closet, /obj/item/storage/bag/trash, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/storage/box/lights/mixed, /obj/item/caution, /obj/item/caution, @@ -8861,11 +8821,7 @@ /obj/machinery/computer/atmos_alert{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -9960,11 +9916,7 @@ }, /area/mine/laborcamp) "Ww" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -10065,11 +10017,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "WX" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -10290,10 +10238,7 @@ /area/mine/laborcamp) "Yk" = ( /obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/loading_area, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 9939e6204ce..ee9f6ef44eb 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -439,11 +439,7 @@ /obj/structure/table/reinforced, /obj/item/gun/energy/laser/practice, /obj/machinery/recharger, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/security/range) "adk" = ( @@ -1429,10 +1425,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -1836,11 +1829,7 @@ /turf/space, /area/station/security/armory/secure) "aiz" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -2651,10 +2640,7 @@ }, /area/station/command/office/hos) "akK" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2870,11 +2856,7 @@ pixel_y = 1 }, /obj/item/storage/fancy/cigarettes/cigpack_robust, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light{ dir = 8 }, @@ -3173,10 +3155,7 @@ "amA" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -4177,11 +4156,7 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "apd" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light/small{ dir = 8 }, @@ -4400,11 +4375,7 @@ dir = 1 }, /obj/machinery/disposal, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -5436,11 +5407,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -5920,11 +5887,7 @@ name = "prisoner supression system"; target_pressure = 4500 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -7127,11 +7090,7 @@ }, /area/station/security/processing) "axU" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -8096,11 +8055,7 @@ "aAI" = ( /obj/structure/table/reinforced, /obj/item/pen, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/paper_bin/nanotrasen, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -8334,11 +8289,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -8557,11 +8508,7 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ req_access = null; req_access_txt = "2" @@ -9017,11 +8964,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -10597,11 +10540,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/landmark/start/assistant, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -10934,11 +10873,7 @@ }, /area/station/security/detective) "aJn" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12397,11 +12332,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/camera{ c_tag = "Fore Primary Hallway South"; dir = 4 @@ -12899,11 +12830,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "aPx" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/legal/courtroom) "aPy" = ( @@ -12987,11 +12914,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -13060,10 +12983,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aPT" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -13380,11 +13300,7 @@ pixel_x = -5; pixel_y = 5 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -14370,11 +14286,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/chem_heater, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -14856,10 +14768,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -15264,10 +15173,7 @@ /area/station/public/storage/tools) "aWn" = ( /obj/structure/table, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/t_scanner, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -16119,10 +16025,7 @@ }, /area/station/service/chapel) "aYJ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet, /area/station/public/mrchangs) @@ -16557,11 +16460,7 @@ c_tag = "Security Checkpoint"; dir = 1 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -16579,11 +16478,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bab" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Garden"; dir = 8 @@ -17351,10 +17246,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bcw" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Chapel Chaplain's Office" }, @@ -17534,11 +17426,7 @@ /turf/simulated/floor/wood, /area/station/service/bar) "bcW" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -17654,10 +17542,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp/bananalamp, /obj/item/food/snacks/pie, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, /area/station/service/clown) "bdq" = ( @@ -17942,10 +17827,7 @@ /turf/simulated/wall, /area/station/service/kitchen) "bdV" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Hydroponics Storage" }, @@ -19182,11 +19064,7 @@ /obj/machinery/photocopier{ toner = 0 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/office) @@ -20249,11 +20127,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/east) "bkg" = ( @@ -21180,11 +21054,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22093,11 +21963,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bpb" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/rack{ dir = 8; layer = 2.9 @@ -22303,11 +22169,7 @@ }, /area/station/service/bar) "bpF" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/lounge) "bpG" = ( @@ -22637,11 +22499,7 @@ /area/station/service/bar) "bqz" = ( /obj/structure/closet/secure_closet/personal, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Locker Room East"; dir = 8 @@ -22696,11 +22554,7 @@ amount = 50 }, /obj/item/storage/toolbox/emergency, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -22838,11 +22692,7 @@ }, /area/station/hallway/secondary/entry/lounge) "brf" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/camera{ c_tag = "Bar West"; dir = 4 @@ -23494,11 +23344,7 @@ }, /area/station/service/kitchen) "bsY" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/lobby) "bsZ" = ( @@ -24204,10 +24050,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "bvc" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, /area/station/public/vacant_office) "bve" = ( @@ -24571,11 +24414,7 @@ /area/station/public/locker) "bwr" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -24908,11 +24747,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/wood, /area/station/service/library) "bxX" = ( @@ -25353,10 +25188,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/rcs, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "arrival" @@ -26447,11 +26279,7 @@ /turf/simulated/floor/plasteel, /area/station/service/chapel) "bEm" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -26683,10 +26511,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bFr" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -26990,11 +26815,7 @@ /turf/simulated/wall/r_wall, /area/station/science/robotics/chargebay) "bGv" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -27802,10 +27623,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bJa" = ( @@ -27875,10 +27693,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bJi" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/office) "bJk" = ( @@ -30768,10 +30583,7 @@ /obj/machinery/camera{ c_tag = "Teleporter Room" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "bTW" = ( @@ -30933,11 +30745,7 @@ /obj/machinery/computer/aifixer{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -31718,11 +31526,7 @@ /area/station/command/teleporter) "bYc" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blue" @@ -32086,11 +31890,7 @@ /area/station/medical/cryo) "bZw" = ( /obj/machinery/photocopier, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -32641,11 +32441,7 @@ "cbE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32959,11 +32755,7 @@ /turf/simulated/floor/grass, /area/station/medical/medbay) "ccv" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -33501,10 +33293,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "ceC" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" @@ -33533,11 +33322,7 @@ }, /area/station/hallway/primary/central/south) "ceH" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, @@ -34113,11 +33898,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "cgq" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -34130,10 +33911,7 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/mixing) "cgA" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/chair/sofa/left, /obj/item/radio/intercom{ name = "east bump"; @@ -34319,11 +34097,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "chq" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -34603,11 +34377,7 @@ /turf/simulated/floor/wood, /area/station/command/office/blueshield) "ciC" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -34618,11 +34388,7 @@ /turf/simulated/floor/wood, /area/station/command/office/blueshield) "ciE" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -3; @@ -36033,11 +35799,7 @@ /obj/structure/table, /obj/item/folder/yellow, /obj/item/pen, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -36172,11 +35934,7 @@ /area/station/command/office/blueshield) "cop" = ( /obj/item/flag/nt, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "cot" = ( @@ -36304,11 +36062,7 @@ }, /area/station/medical/patients_rooms_secondary) "cpb" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -37659,11 +37413,7 @@ }, /area/station/medical/virology) "ctz" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -38170,10 +37920,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cvA" = ( @@ -38699,11 +38446,7 @@ }, /area/station/medical/surgery) "cxF" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -38913,10 +38656,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -39657,11 +39397,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cAo" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/table, /obj/item/book/manual/wiki/sop_engineering, /turf/simulated/floor/plasteel{ @@ -39670,11 +39406,7 @@ /area/station/hallway/primary/aft/south) "cAp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40148,11 +39880,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -40652,10 +40380,7 @@ /area/station/engineering/controlroom) "cDF" = ( /obj/machinery/chem_heater, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/science/misc_lab) "cDG" = ( @@ -41479,11 +41204,7 @@ pixel_x = 6; pixel_y = -6 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" @@ -42323,11 +42044,7 @@ /area/station/science/xenobiology) "cJA" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/stack/tape_roll, /obj/machinery/camera/motion{ c_tag = "EVA Motion Sensor"; @@ -43244,10 +42961,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "cMK" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "cMN" = ( @@ -43294,11 +43008,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cMX" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/table, /obj/item/storage/toolbox/mechanical, /obj/item/t_scanner, @@ -43610,11 +43320,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43865,11 +43571,7 @@ /area/station/maintenance/aft) "cPj" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cPk" = ( @@ -44149,10 +43851,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "cQj" = ( @@ -44740,11 +44439,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/stack/rods{ amount = 50 }, @@ -45948,10 +45643,7 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) "cVS" = ( -/obj/machinery/alarm/engine{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/alarm/engine/directional/west, /obj/machinery/power/apc/critical/directional/north{ shock_proof = 1 }, @@ -46699,11 +46391,7 @@ /turf/simulated/wall, /area/station/engineering/smes) "cYN" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -47862,11 +47550,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "ddm" = ( @@ -49211,10 +48895,7 @@ /area/station/hallway/primary/central/north) "dix" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -50661,11 +50342,7 @@ /turf/simulated/floor/plating, /area/station/aisat/hall) "dmS" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/camera/motion{ c_tag = "AI Satellite Hallway"; dir = 4; @@ -51291,11 +50968,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "doN" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/station_alert{ dir = 4 }, @@ -51503,11 +51176,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/space_heater, /obj/machinery/camera{ c_tag = "AI Satellite Atmospherics"; @@ -51538,11 +51207,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/rack, /obj/item/storage/toolbox/electrical{ pixel_x = -3; @@ -51762,10 +51427,7 @@ }, /area/station/turret_protected/ai) "drq" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/chair{ dir = 8 }, @@ -52258,11 +51920,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dtq" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, @@ -52285,10 +51943,7 @@ dir = 8; layer = 2.9 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -53013,10 +52668,7 @@ pixel_x = -32; pixel_y = 7 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -53203,11 +52855,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "dQa" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -53273,11 +52921,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/door/window/classic/reversed{ dir = 4; name = "Body Delivery System" @@ -54943,11 +54587,7 @@ /obj/structure/chair/comfy/beige{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -55776,11 +55416,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "eXy" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/table, /obj/item/stack/cable_coil, /obj/machinery/cell_charger, @@ -56956,10 +56592,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "fwZ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/computer/general_air_control{ dir = 4; name = "Tank Monitor"; @@ -58145,11 +57778,7 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "gdp" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/rack, /obj/item/clothing/head/helmet/space/plasmaman{ pixel_x = -3; @@ -58581,11 +58210,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "gmQ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -59468,11 +59093,7 @@ }, /area/station/medical/reception) "gJj" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/newscaster{ name = "north bump"; pixel_y = 28 @@ -60646,10 +60267,7 @@ /obj/machinery/conveyor/east{ id = "garbage" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "hjX" = ( @@ -61979,11 +61597,7 @@ dir = 1; network = list("Research","SS13") }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "hTK" = ( @@ -62689,11 +62303,7 @@ /obj/structure/table/glass, /obj/item/hand_labeler, /obj/item/roller, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -63186,10 +62796,7 @@ name = "east bump"; pixel_x = 28 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -63243,11 +62850,7 @@ /area/station/medical/patients_rooms1) "iCq" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "iCI" = ( @@ -63759,10 +63362,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 9; @@ -66170,11 +65770,7 @@ dir = 6 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/port) "jZL" = ( @@ -66220,11 +65816,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -66304,10 +65896,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "kdm" = ( @@ -68140,11 +67729,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -68537,11 +68122,7 @@ }, /area/station/security/prisonlockers) "lgV" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -68967,11 +68548,7 @@ }, /area/station/public/toilet/unisex) "lqw" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -69814,11 +69391,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "lLC" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/delivery/partial{ dir = 1 }, @@ -70053,11 +69626,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/west) "lQS" = ( @@ -70530,10 +70099,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "mdR" = ( @@ -71523,10 +71089,7 @@ level = 1 }, /obj/effect/spawner/random_spawners/cobweb_left_rare, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "mEI" = ( @@ -72227,11 +71790,7 @@ }, /area/station/command/bridge) "mUG" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -72750,11 +72309,7 @@ /area/station/security/brig) "nmO" = ( /obj/structure/closet/secure_closet/paramedic, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, @@ -72872,11 +72427,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "nrD" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "nrS" = ( @@ -73592,11 +73143,7 @@ /turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "nKN" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "nKO" = ( @@ -73753,10 +73300,7 @@ "nNB" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -74106,11 +73650,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nXm" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; @@ -74492,10 +74032,7 @@ /obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus, /obj/item/crowbar, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/mecha_parts/core, /turf/simulated/floor/plasteel{ dir = 1; @@ -74854,11 +74391,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "olG" = ( @@ -75246,11 +74779,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/science/storage) "ouf" = ( @@ -75929,11 +75458,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/firealarm{ dir = 4; name = "east bump"; @@ -76904,10 +76429,7 @@ }, /area/station/maintenance/asmaint2) "piu" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil, /turf/simulated/floor/plasteel, @@ -78119,11 +77641,7 @@ pixel_y = 5 }, /obj/item/pen, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/radio/intercom{ name = "west bump"; pixel_x = -28 @@ -78211,10 +77729,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet, /area/station/supply/qm) "pRE" = ( @@ -80881,10 +80396,7 @@ /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "qZp" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" @@ -82542,10 +82054,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "rPM" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -82732,10 +82241,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "rUf" = ( @@ -83157,10 +82663,7 @@ }, /area/station/medical/virology) "shh" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/economy/vending/janidrobe, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -83285,10 +82788,7 @@ network = list("Toxins"); pixel_x = 32 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "skb" = ( @@ -84243,11 +83743,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "sKF" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -84420,10 +83916,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "sPb" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/station/public/dorms) @@ -86589,10 +86082,7 @@ "tSU" = ( /obj/structure/table/wood, /obj/item/lighter/zippo/engraved, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, /area/station/command/meeting_room) "tSX" = ( @@ -86947,11 +86437,7 @@ /area/station/science/toxins/test) "uaz" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/clothing/mask/gas, /obj/machinery/door/window/classic/reversed{ dir = 1; @@ -87153,11 +86639,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) "ugW" = ( @@ -87782,11 +87264,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "uzd" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/table/glass/reinforced, /obj/item/aiModule/crewsimov{ pixel_y = 3; @@ -88094,11 +87572,7 @@ /turf/simulated/wall, /area/station/maintenance/asmaint2) "uIn" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/table, /obj/item/roller{ pixel_y = 9 @@ -89997,11 +89471,7 @@ /obj/item/stack/sheet/cardboard{ amount = 10 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91615,10 +91085,7 @@ /turf/simulated/floor/plating, /area/station/science/robotics) "wxp" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -91801,11 +91268,7 @@ }, /area/station/command/bridge) "wCQ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -92820,11 +92283,7 @@ }, /area/station/hallway/secondary/exit) "xeT" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/station/command/office/captain) @@ -93175,11 +92634,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "xmN" = ( @@ -93277,10 +92732,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bluefull" }, @@ -93716,11 +93168,7 @@ dir = 4; icon_state = "pipe-j2" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -93736,11 +93184,7 @@ }, /area/station/public/dorms) "xAX" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -94495,10 +93939,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "xTJ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/table/glass, /obj/item/radio/intercom{ name = "west bump"; @@ -94663,10 +94104,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "xWg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -95273,10 +94711,7 @@ /area/station/security/permabrig) "yjv" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/obj/machinery/alarm/server{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/alarm/server/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 22f6bcc00b2..9350ae3cd1f 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -435,22 +435,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bcircuit" }, /area/station/turret_protected/ai) "acM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -806,10 +798,7 @@ }, /area/station/security/permabrig) "aeK" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/closet/secure_closet/injection, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3059,10 +3048,7 @@ /turf/simulated/floor/wood, /area/station/command/office/hos) "atd" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/suit_storage_unit/security/hos/secure, /turf/simulated/floor/wood, /area/station/command/office/hos) @@ -3316,10 +3302,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "auP" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -5090,10 +5073,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -5164,10 +5144,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/railing/corner{ pixel_y = -11 }, @@ -5305,10 +5282,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/northwest) "aIT" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6105,10 +6079,7 @@ /obj/machinery/camera{ c_tag = "Bridge Meeting West" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -6408,11 +6379,7 @@ }, /area/station/turret_protected/aisat/interior) "aPD" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "AI Asteroid Hallway 4"; dir = 1 @@ -7035,11 +7002,7 @@ }, /area/station/supply/office) "aTs" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7680,11 +7643,7 @@ "aWS" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7966,11 +7925,7 @@ /area/station/hallway/secondary/garden) "aYe" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Rehabilitation Dome East 1"; dir = 8 @@ -8430,11 +8385,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/hallway/primary/port/north) "baD" = ( @@ -8620,11 +8571,7 @@ /area/station/hallway/primary/port/north) "bbH" = ( /obj/structure/table, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/machinery/camera{ c_tag = "Arcade West"; dir = 4 @@ -9388,11 +9335,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "bfQ" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/structure/flora/grass/jungle, /turf/simulated/floor/grass/jungle, /area/station/hallway/secondary/garden) @@ -9787,10 +9730,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bhw" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 4 }, @@ -10116,11 +10056,7 @@ /area/station/service/bar) "bjo" = ( /obj/machinery/dye_generator, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/item/radio/intercom{ name = "custom placement"; pixel_y = 28 @@ -10597,10 +10533,7 @@ /area/station/command/office/cmo) "blJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -10659,10 +10592,7 @@ /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/structure/table/glass, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; @@ -11134,11 +11064,7 @@ }, /area/station/medical/virology) "bov" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/security/range) "bow" = ( @@ -12128,11 +12054,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/hop) "bto" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -13652,10 +13574,7 @@ /obj/machinery/atmospherics/binary/pump{ name = "Gas to Filter" }, -/obj/machinery/alarm/engine{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/alarm/engine/directional/west, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "bzB" = ( @@ -13900,10 +13819,7 @@ /area/station/security/storage) "bAl" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -14267,11 +14183,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/firealarm{ dir = 4; pixel_x = 24; @@ -14431,10 +14343,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -14776,10 +14685,7 @@ }, /area/station/medical/chemistry) "bEv" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/closet/secure_closet/reagents, /turf/simulated/floor/plasteel{ dir = 1; @@ -14979,10 +14885,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; dir = 1 @@ -15171,10 +15074,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/item/storage/belt/utility, /obj/item/stack/sheet/plasteel, /turf/simulated/floor/plasteel{ @@ -15735,10 +15635,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "bHy" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -16121,11 +16018,7 @@ dir = 4; color = "#954535" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -17453,11 +17346,7 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "bPB" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/computer/card/minor/ce{ dir = 1 }, @@ -17887,10 +17776,7 @@ }, /area/station/public/sleep/secondary) "bRn" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18734,10 +18620,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine{ slowdown = -0.3 }, @@ -18900,11 +18783,7 @@ }, /area/station/engineering/atmos) "bVb" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/machinery/porta_turret, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -19674,10 +19553,7 @@ c_tag = "EVA Equipment"; dir = 6 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light{ dir = 1 @@ -20715,10 +20591,7 @@ }, /area/station/security/brig) "cgj" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -22258,11 +22131,7 @@ }, /area/station/maintenance/fsmaint) "cpF" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "cpG" = ( @@ -22365,11 +22234,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Cargo Hall West"; dir = 1; @@ -22558,10 +22423,7 @@ /area/station/security/prison/cell_block/A) "crh" = ( /obj/structure/table, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ dir = 1; @@ -23232,20 +23094,13 @@ /turf/simulated/floor/engine, /area/station/science/misc_lab) "cvR" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/machinery/chem_heater, /turf/simulated/floor/engine, /area/station/science/misc_lab) "cvT" = ( /obj/structure/table, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/item/reagent_containers/iv_bag/salglu, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -23776,10 +23631,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "czN" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/keycard_auth{ pixel_x = -28 }, @@ -24030,10 +23882,7 @@ }, /area/station/security/prison/cell_block/A) "cBb" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -24285,10 +24134,7 @@ }, /area/station/public/locker) "cCM" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/photocopier, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -25493,10 +25339,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26102,11 +25945,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "browncorner" }, @@ -28206,10 +28045,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "cUO" = ( -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/alarm/all_access/directional/east, /obj/machinery/atmospherics/unary/portables_connector{ name = "output gas connector port" }, @@ -28514,10 +28350,7 @@ /obj/structure/table, /obj/item/clothing/shoes/orange, /obj/item/clothing/under/color/orange/prison, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29782,11 +29615,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dew" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -30019,11 +29848,7 @@ }, /area/station/supply/office) "dgr" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbrown" @@ -30287,11 +30112,7 @@ /turf/simulated/floor/plating, /area/station/command/office/cmo) "diM" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Dorm Bathroom"; dir = 1 @@ -30598,10 +30419,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine{ slowdown = -0.3 }, @@ -31168,10 +30986,7 @@ /area/station/maintenance/fpmaint) "doB" = ( /obj/machinery/computer/secure_data, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) "doE" = ( @@ -34022,10 +33837,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark/telecomms, /area/station/science/server) "dEW" = ( @@ -36084,10 +35896,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "eoF" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -36246,11 +36055,7 @@ }, /area/station/science/xenobiology) "eru" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "erB" = ( @@ -37307,11 +37112,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4; color = "#954535" @@ -37695,10 +37496,7 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/disposal/south) "eSk" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "eSE" = ( @@ -38154,11 +37952,7 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "faH" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -38372,11 +38166,7 @@ dir = 8; network = list("SS13","QM") }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/structure/sign/directions/evac{ pixel_y = 39 }, @@ -38434,10 +38224,7 @@ }, /area/station/hallway/primary/starboard/south) "fgu" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "fgS" = ( @@ -40075,11 +39862,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -40443,10 +40226,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/trinary/filter{ dir = 4; filter_type = -1 @@ -42668,10 +42448,7 @@ dir = 4 }, /obj/vehicle/janicart, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/service/janitor) "gJw" = ( @@ -43136,11 +42913,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4; color = "#954535" @@ -43501,11 +43274,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/item/flag/nt, /obj/machinery/light_switch{ pixel_y = 24; @@ -45618,10 +45387,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -45714,11 +45480,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "hJz" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46295,10 +46057,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/obj/machinery/alarm/server{ - dir = 4; - pixel_x = -22 - }, +/obj/machinery/alarm/server/directional/west, /turf/simulated/floor/plasteel/dark/telecomms, /area/station/science/server/coldroom) "hUg" = ( @@ -48223,22 +47982,14 @@ c_tag = "Command Quantum Pad"; dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" }, /area/station/public/quantum/security) "iys" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -48711,11 +48462,7 @@ dir = 9 }, /obj/machinery/mecha_part_fabricator, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "iHG" = ( @@ -50120,10 +49867,7 @@ }, /area/station/hallway/secondary/exit) "jcx" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/closet/secure_closet/evidence, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -51117,10 +50861,7 @@ /area/station/hallway/spacebridge/dockmed) "juf" = ( /obj/structure/chair, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -52246,11 +51987,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "jKs" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "jKO" = ( @@ -53593,11 +53330,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "kis" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -53921,10 +53654,7 @@ /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fsmaint) "kny" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -54571,11 +54301,7 @@ /area/station/command/office/ntrep) "kwT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -54758,11 +54484,7 @@ c_tag = "Docking Quantum Pad"; dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/structure/sign/directions/cargo{ dir = 1; pixel_y = 39 @@ -58255,11 +57977,7 @@ }, /area/station/hallway/secondary/entry/east) "lzY" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -58713,11 +58431,7 @@ id = "creamed"; pixel_x = -24 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -59360,10 +59074,7 @@ /obj/machinery/cryopod{ dir = 2 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -59793,10 +59504,7 @@ "mbr" = ( /obj/structure/table, /obj/item/reagent_containers/iv_bag/salglu, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60184,11 +59892,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/engine{ slowdown = -0.3 }, @@ -61730,11 +61434,7 @@ }, /area/station/hallway/primary/port/south) "mLk" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/engine{ slowdown = -0.3 }, @@ -61877,10 +61577,7 @@ }, /obj/item/geiger_counter, /obj/structure/table, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62248,10 +61945,7 @@ }, /area/station/hallway/primary/port/east) "mTL" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/closet, /turf/simulated/floor/wood, /area/station/public/vacant_office) @@ -62501,10 +62195,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 1; @@ -62722,11 +62413,7 @@ }, /area/station/service/bar) "nbn" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -64285,10 +63972,7 @@ }, /area/station/science/robotics/chargebay) "nDq" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/rack, /obj/item/clothing/under/plasmaman{ pixel_x = 2; @@ -64344,11 +64028,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/science/hallway) "nDQ" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64940,11 +64620,7 @@ }, /area/station/service/hydroponics) "nOx" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/public/fitness) "nOF" = ( @@ -65432,10 +65108,7 @@ }, /area/station/maintenance/starboard) "nZi" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4; color = "#954535" @@ -66797,10 +66470,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -68275,10 +67945,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "oTq" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ @@ -68424,11 +68091,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -68515,11 +68178,7 @@ /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/flashlight/lamp/green, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/medical/psych) "oWZ" = ( @@ -69225,10 +68884,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port) "pjH" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/icemachine{ dir = 8 }, @@ -69810,11 +69466,7 @@ /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) "ptA" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Engineering Power Storage"; dir = 1; @@ -69926,10 +69578,7 @@ }, /area/station/service/hydroponics) "puE" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -70819,11 +70468,7 @@ /area/station/medical/morgue) "pII" = ( /obj/machinery/suit_storage_unit/rd/secure, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -71827,10 +71472,7 @@ /turf/simulated/floor/plating, /area/station/science/rnd) "pYy" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -72352,10 +71994,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -72389,10 +72028,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -72436,11 +72072,7 @@ c_tag = "Morgue South"; dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72860,10 +72492,7 @@ network = list("SS13","CMO") }, /obj/structure/closet/crate/freezer/iv_storage, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light/small{ dir = 1 }, @@ -75552,10 +75181,7 @@ }, /area/station/medical/patients_rooms) "rjy" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -75869,11 +75495,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -76069,10 +75691,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -76395,11 +76014,7 @@ }, /area/station/public/quantum/docking) "rAD" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -76725,10 +76340,7 @@ }, /area/station/hallway/secondary/entry/west) "rFO" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, /area/station/service/theatre) "rGm" = ( @@ -76831,11 +76443,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/carpet/black, /area/station/service/chapel) "rIf" = ( @@ -77014,11 +76622,7 @@ /area/station/service/kitchen) "rLb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -77315,11 +76919,7 @@ /area/station/command/office/cmo) "rOX" = ( /obj/structure/closet/secure_closet/CMO, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -77455,11 +77055,7 @@ /obj/structure/disposalpipe/segment{ color = "#954535" }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/engine{ slowdown = -0.3 }, @@ -78318,11 +77914,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "sgE" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78434,11 +78026,7 @@ }, /obj/item/multitool, /obj/item/clothing/glasses/meson, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "sif" = ( @@ -78793,11 +78381,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -78920,10 +78504,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "srN" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -79280,11 +78861,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -80143,10 +79720,7 @@ /area/station/science/robotics/chargebay) "sLO" = ( /obj/structure/curtain/open/shower, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/freezer, /area/station/public/toilet) "sMa" = ( @@ -80371,10 +79945,7 @@ /area/station/science/robotics) "sOx" = ( /obj/machinery/economy/vending/detdrobe, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -81156,10 +80727,7 @@ }, /area/station/maintenance/fore2) "tbf" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -81908,10 +81476,7 @@ pixel_x = 24; name = "east bump" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, /area/station/service/clown) "toQ" = ( @@ -82395,11 +81960,7 @@ /area/station/engineering/smes) "twk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/engine{ slowdown = -0.3 }, @@ -82548,11 +82109,7 @@ pixel_y = 3 }, /obj/item/stack/packageWrap, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel{ @@ -82568,11 +82125,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "tyT" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4; color = "#954535" @@ -83595,10 +83148,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "tUk" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/table/wood, /obj/machinery/computer/library, /turf/simulated/floor/wood, @@ -84946,10 +84496,7 @@ }, /area/station/service/expedition) "uoB" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -85088,10 +84635,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -86688,11 +86232,7 @@ }, /area/station/service/hydroponics) "uQC" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "uQE" = ( @@ -87228,11 +86768,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -88154,11 +87690,7 @@ }, /area/station/hallway/secondary/entry/west) "vmU" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel{ dir = 6; @@ -89681,10 +89213,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "vIu" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/item/kirbyplants/plant21, /turf/simulated/floor/wood, /area/station/legal/magistrate) @@ -92349,11 +91878,7 @@ /area/station/maintenance/maintcentral) "wxm" = ( /obj/structure/closet/secure_closet/miner, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -92688,11 +92213,7 @@ }, /area/station/public/quantum/science) "wAQ" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/portables_connector{ dir = 1; name = "Portable Scrubber Connector" @@ -93355,10 +92876,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -94013,11 +93531,7 @@ /area/station/hallway/spacebridge/engmed) "wWW" = ( /obj/structure/statue/tranquillite/mime, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -94129,11 +93643,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wZF" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24; - name = "west bump" - }, +/obj/machinery/alarm/directional/west, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel{ dir = 8; @@ -95320,10 +94830,7 @@ /obj/structure/bed/amb_trolley{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -95652,10 +95159,7 @@ }, /area/station/science/hallway) "xzJ" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -96439,10 +95943,7 @@ }, /area/station/command/bridge) "xLY" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/item/kirbyplants/plant21, /obj/item/radio/intercom{ pixel_x = 28; @@ -96552,10 +96053,7 @@ }, /area/station/science/robotics) "xNT" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 293adf51411..5c54d7e6c9a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -682,11 +682,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) "age" = ( @@ -1409,10 +1405,7 @@ /area/station/maintenance/fore2) "alR" = ( /obj/structure/chair/stool, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light/small{ dir = 1 }, @@ -2651,11 +2644,7 @@ /area/station/command/customs) "apW" = ( /obj/structure/table, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/kitchen_machine/microwave, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -2676,11 +2665,7 @@ }, /area/station/command/customs) "apY" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -4055,11 +4040,7 @@ "atz" = ( /obj/structure/closet/secure_closet, /obj/item/storage/secure/briefcase, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -4091,11 +4072,7 @@ }, /area/station/command/customs) "atC" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/chair/comfy/brown{ dir = 1 }, @@ -4153,11 +4130,7 @@ }, /area/station/security/checkpoint/secondary) "atI" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ dir = 6; @@ -4347,11 +4320,7 @@ /area/station/engineering/controlroom) "auh" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/circuitboard/microwave, /obj/item/stack/sheet/glass{ pixel_x = 5; @@ -4767,11 +4736,7 @@ /area/station/maintenance/fore2) "avq" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/toy/flash, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -5475,11 +5440,7 @@ /area/station/engineering/controlroom) "awU" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, /obj/structure/cable{ @@ -5775,11 +5736,7 @@ }, /area/station/maintenance/disposal) "axC" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6290,11 +6247,7 @@ /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, /obj/item/lightreplacer, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/service/janitor) "azk" = ( @@ -6497,10 +6450,7 @@ /area/station/supply/storage) "azH" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ dir = 1; @@ -6874,11 +6824,7 @@ }, /area/station/public/toilet) "aAE" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -7368,11 +7314,7 @@ }, /area/station/security/permasolitary) "aBG" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -8246,10 +8188,7 @@ dir = 1; name = "Gas to Chamber" }, -/obj/machinery/alarm/engine{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/alarm/engine/directional/east, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "aEj" = ( @@ -9222,11 +9161,7 @@ }, /area/station/hallway/primary/fore/east) "aGJ" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -9856,10 +9791,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/incinerator) "aIx" = ( @@ -10795,11 +10727,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "aKZ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) @@ -11070,11 +10998,7 @@ /area/station/maintenance/starboard) "aLL" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/newscaster{ dir = 1; name = "south bump"; @@ -11562,11 +11486,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -11620,11 +11540,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Cargo Break Room"; dir = 8 @@ -11876,11 +11792,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/computer/sm_monitor{ dir = 8 }, @@ -12195,11 +12107,7 @@ }, /area/station/security/permabrig) "aPf" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; @@ -13295,11 +13203,7 @@ /area/station/supply/sorting) "aRO" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -14368,11 +14272,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) @@ -16480,11 +16380,7 @@ }, /area/station/supply/qm) "aZA" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Quartermaster Office"; dir = 1 @@ -16545,10 +16441,7 @@ c_tag = "Perma-Brig Hallway Port"; network = list("SS13","Security") }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -17019,11 +16912,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/autolathe, /obj/machinery/light_switch{ dir = 4; @@ -17428,10 +17317,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -18176,11 +18062,7 @@ }, /area/station/service/kitchen) "bdN" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/rack, /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -18236,10 +18118,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 8 }, @@ -18601,11 +18480,7 @@ }, /area/station/service/kitchen) "bff" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -18854,11 +18729,7 @@ }, /area/station/security/permabrig) "bfW" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -19763,10 +19634,7 @@ }, /area/station/security/brig) "bix" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -20117,11 +19985,7 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -21207,11 +21071,7 @@ /obj/structure/table, /obj/item/taperecorder, /obj/item/restraints/handcuffs, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light{ dir = 8 }, @@ -23804,10 +23664,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -24061,11 +23918,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/suit_storage_unit/atmos/secure, /obj/machinery/light{ dir = 8 @@ -24757,10 +24610,7 @@ "bvl" = ( /obj/machinery/computer/shuttle/labor, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -24927,11 +24777,7 @@ }, /area/station/engineering/atmos/distribution) "bvG" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Atmospherics Distribution"; dir = 1; @@ -25629,11 +25475,7 @@ /area/station/security/prisonershuttle) "bxy" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/delivery, /obj/machinery/light, /turf/simulated/floor/plasteel, @@ -26813,11 +26655,7 @@ }, /area/station/command/bridge) "bAI" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/light/small, /obj/structure/closet/crate, /obj/item/storage/belt/champion, @@ -26941,10 +26779,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bBg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -27144,11 +26979,7 @@ }, /area/station/engineering/break_room) "bBI" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "caution" @@ -27163,11 +26994,7 @@ }, /area/station/engineering/atmos) "bBK" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/computer/station_alert{ dir = 1 }, @@ -28654,11 +28481,7 @@ name = "east bump"; pixel_x = 24 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ dir = 6; @@ -29032,11 +28855,7 @@ }, /area/station/hallway/primary/central) "bFN" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -29308,11 +29127,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGv" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) @@ -29601,11 +29416,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -29667,11 +29478,7 @@ /area/station/engineering/tech_storage) "bGY" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/item/stock_parts/scanning_module, @@ -29880,10 +29687,7 @@ /turf/simulated/wall/r_wall, /area/station/command/office/captain) "bHy" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "bHA" = ( @@ -31300,11 +31104,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bLg" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/wood, /area/station/command/office/captain) "bLh" = ( @@ -31448,11 +31248,7 @@ }, /area/station/security/checkpoint) "bLy" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; @@ -31545,11 +31341,7 @@ c_tag = "Brig - Officer's Lockers"; network = list("SS13","Security") }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -31657,11 +31449,7 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -32915,11 +32703,7 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "yellow" @@ -33010,11 +32794,7 @@ /obj/machinery/computer/security{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -33142,10 +32922,7 @@ /area/station/turret_protected/aisat) "bPH" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/portable/canister/air, /obj/structure/cable{ d1 = 2; @@ -33473,10 +33250,7 @@ /turf/simulated/wall, /area/station/public/storage/tools) "bQC" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/teleport/hub, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -33509,11 +33283,7 @@ /turf/simulated/floor/wood, /area/station/command/meeting_room) "bQH" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Command Meeting Room"; dir = 1 @@ -33534,11 +33304,7 @@ /turf/simulated/floor/wood, /area/station/command/meeting_room) "bQK" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/porta_turret{ dir = 4 }, @@ -34880,11 +34646,7 @@ /area/station/engineering/ai_transit_tube) "bUf" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light/small{ dir = 4 }, @@ -35840,11 +35602,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 6; @@ -35896,11 +35654,7 @@ }, /area/station/hallway/primary/port/west) "bWI" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/suit_storage_unit/ce/secure, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -36001,11 +35755,7 @@ }, /area/station/hallway/primary/starboard/west) "bXf" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -36022,11 +35772,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -36241,11 +35987,7 @@ "bXK" = ( /obj/item/kirbyplants, /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36414,11 +36156,7 @@ /turf/simulated/wall, /area/station/service/library) "bYo" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -37246,10 +36984,7 @@ }, /area/station/legal/courtroom) "caC" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -37320,10 +37055,7 @@ pixel_x = 24 }, /obj/structure/closet/secure_closet/iaa, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/storage/secure/briefcase, /obj/item/storage/briefcase, /turf/simulated/floor/wood, @@ -38645,11 +38377,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "cdV" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "cdW" = ( @@ -39163,11 +38891,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "cfr" = ( @@ -39415,10 +39139,7 @@ /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/window/reinforced{ dir = 8 }, @@ -39439,11 +39160,7 @@ /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgi" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgj" = ( @@ -39549,11 +39266,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cgC" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -40194,11 +39907,7 @@ /area/station/command/office/hop) "ciE" = ( /obj/structure/bed/dogbed/ian, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /mob/living/simple_animal/pet/dog/corgi/Ian, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -40224,11 +39933,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "ciH" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "NT Representative's Office"; dir = 1 @@ -40305,11 +40010,7 @@ /turf/simulated/floor/wood, /area/station/command/office/blueshield) "ciP" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Blueshield's Office"; dir = 1 @@ -41725,11 +41426,7 @@ /area/station/security/range) "cmF" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/gun/energy/laser/practice, /obj/item/gun/energy/laser/practice, /obj/item/clothing/ears/earmuffs, @@ -42132,11 +41829,7 @@ /area/station/hallway/primary/central/east) "cnD" = ( /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -42487,11 +42180,7 @@ "coI" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light{ dir = 8 }, @@ -43580,11 +43269,7 @@ /area/station/service/library) "crp" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/clipboard, /obj/item/toy/figure/crew/librarian, /turf/simulated/floor/plasteel/grimy, @@ -43979,11 +43664,7 @@ name = "solar pack crate" }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "csA" = ( @@ -44357,11 +44038,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -44546,11 +44223,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -44877,11 +44550,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cuV" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -45226,11 +44895,7 @@ }, /area/station/hallway/primary/starboard/south) "cvX" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -45490,11 +45155,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cwM" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -45767,11 +45428,7 @@ /area/station/public/locker) "cxw" = ( /obj/structure/closet/wardrobe/green, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -45929,11 +45586,7 @@ /area/station/ai_monitored/storage/eva) "cxR" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/clothing/shoes/magboots{ pixel_x = 4; pixel_y = 4 @@ -46375,10 +46028,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cyV" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cyW" = ( @@ -46776,11 +46426,7 @@ /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "czT" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -46933,11 +46579,7 @@ /turf/simulated/floor/plasteel, /area/station/public/toilet/lockerroom) "cAj" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/public/toilet/lockerroom) "cAl" = ( @@ -46969,11 +46611,7 @@ /area/station/public/sleep) "cAp" = ( /obj/machinery/cryopod/right, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -47154,11 +46792,7 @@ /area/station/maintenance/port) "cAT" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -47299,11 +46933,7 @@ /area/station/ai_monitored/storage/eva) "cBm" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/stack/rods{ amount = 8 }, @@ -48338,11 +47968,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -50331,10 +49957,7 @@ /area/station/maintenance/electrical) "cJU" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -51332,11 +50955,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/white/side{ dir = 4 }, @@ -51940,11 +51559,7 @@ /turf/simulated/floor/wood, /area/station/service/clown) "cQf" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/wood, /area/station/service/clown) "cQg" = ( @@ -51958,11 +51573,7 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "cQh" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "cQi" = ( @@ -53878,11 +53489,7 @@ /area/station/science/research) "cWM" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/stock_parts/matter_bin{ pixel_x = 3; pixel_y = 3 @@ -54217,11 +53824,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "cYD" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/sink{ dir = 8; pixel_x = -12 @@ -54273,11 +53876,7 @@ /obj/machinery/sleeper{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -56022,11 +55621,7 @@ }, /area/station/maintenance/apmaint) "deG" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/abandonedbar) "deI" = ( @@ -56385,11 +55980,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dgs" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ name = "north bump"; @@ -56840,11 +56431,7 @@ name = "north bump"; pixel_y = 28 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, @@ -57014,11 +56601,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -57439,11 +57022,7 @@ /area/station/maintenance/abandonedbar) "dkw" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/stock_parts/matter_bin, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/white, @@ -57683,11 +57262,7 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/cryo) "dle" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -58286,11 +57861,7 @@ /area/station/medical/chemistry) "dnK" = ( /obj/machinery/computer/scan_consolenew, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -58940,11 +58511,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/abandonedbar) "drf" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "drg" = ( @@ -59383,11 +58950,7 @@ /area/station/science/genetics) "dte" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/service/expedition) "dto" = ( @@ -59762,11 +59325,7 @@ "duV" = ( /obj/machinery/constructable_frame/machine_frame, /obj/machinery/light/small, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port2) "duX" = ( @@ -59967,11 +59526,7 @@ /turf/simulated/wall/r_wall, /area/station/science/server) "dwj" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/rdservercontrol{ dir = 4 }, @@ -61449,11 +61004,7 @@ /area/station/maintenance/theatre) "dDK" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dDM" = ( @@ -61673,10 +61224,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/kirbyplants, /obj/machinery/newscaster{ dir = 8; @@ -62934,11 +62482,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dMS" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -63363,11 +62907,7 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel) "dOZ" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "chapel" @@ -63739,11 +63279,7 @@ /area/station/medical/medbay) "dQh" = ( /obj/structure/morgue, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dQi" = ( @@ -64017,11 +63553,7 @@ /area/station/hallway/secondary/exit) "dRm" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/stack/cable_coil/random, /obj/item/multitool, /obj/item/clothing/suit/fire/firefighter, @@ -64050,11 +63582,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/portsolar) "dRp" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/portsolar) @@ -64340,10 +63868,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dSk" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dSm" = ( @@ -65081,11 +64606,7 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) "dUN" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/light_switch{ dir = 8; name = "east bump"; @@ -65166,11 +64687,7 @@ /area/station/hallway/primary/central) "dUY" = ( /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -67301,11 +66818,7 @@ "eGT" = ( /obj/structure/table/wood, /obj/machinery/fishtank/bowl, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/public/pet_store) "eHg" = ( @@ -67518,10 +67031,7 @@ pixel_x = 8; pixel_y = 10 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -67815,11 +67325,7 @@ }, /area/station/security/storage) "eVW" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -67845,11 +67351,7 @@ /area/station/supply/storage) "eWX" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light{ dir = 8 }, @@ -69277,11 +68779,7 @@ pixel_y = -2 }, /obj/item/clothing/ears/earmuffs, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -69444,10 +68942,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/engineering/smes) "fRb" = ( @@ -69554,11 +69049,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -70090,22 +69581,14 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) "gnB" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/delivery, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) @@ -71677,11 +71160,7 @@ /area/station/security/prison/cell_block) "hpD" = ( /obj/structure/table/glass, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/reagent_containers/iv_bag/salglu, /turf/simulated/floor/plasteel{ dir = 10; @@ -71992,11 +71471,7 @@ /turf/simulated/floor/plating, /area/station/medical/virology) "hzW" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/economy/vending/shoedispenser, /turf/simulated/floor/plasteel, /area/station/public/storage/art) @@ -72363,11 +71838,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -72755,11 +72226,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "hZO" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -74356,10 +73823,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -75121,11 +74585,7 @@ }, /area/station/hallway/primary/port/west) "jzc" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -75184,11 +74644,7 @@ /turf/simulated/floor/plating, /area/station/command/meeting_room) "jAP" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -75243,10 +74699,7 @@ /turf/simulated/floor/plating, /area/station/command/office/hos) "jCu" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light/small{ dir = 1 }, @@ -75518,11 +74971,7 @@ dir = 4; network = list("Research","SS13") }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -75681,11 +75130,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -75822,11 +75267,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/economy/vending/robodrobe, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, @@ -75863,11 +75304,7 @@ }, /area/station/engineering/control) "jTJ" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/table, /obj/item/storage/firstaid/fire{ pixel_x = 3; @@ -76860,11 +76297,7 @@ /obj/machinery/sleeper{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -78516,11 +77949,7 @@ /area/station/science/break_room) "lzY" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/clothing/gloves/color/black, /obj/item/taperecorder, /turf/simulated/floor/plasteel/dark, @@ -80660,10 +80089,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "mSV" = ( @@ -81257,11 +80683,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) "nhT" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ name = "Area control access"; @@ -81585,10 +81007,7 @@ /obj/effect/turf_decal{ dir = 9 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/white, /area/station/science/storage) "npn" = ( @@ -81822,11 +81241,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82294,11 +81709,7 @@ /area/station/science/genetics) "nJE" = ( /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -82843,10 +82254,7 @@ /area/station/security/storage) "ocR" = ( /obj/structure/table/glass, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/reagent_containers/iv_bag/salglu, /turf/simulated/floor/plasteel{ dir = 5; @@ -83620,10 +83028,7 @@ }, /area/station/hallway/primary/central/east) "oyD" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -83675,10 +83080,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -84545,11 +83947,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -85409,11 +84807,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pBJ" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Medbay Cloning"; dir = 8; @@ -88028,10 +87422,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) "rfw" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -88158,11 +87549,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "rkq" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -88190,11 +87577,7 @@ }, /area/station/security/warden) "rkF" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -89307,10 +88690,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "rSe" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) @@ -89410,11 +88790,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "rWL" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -89905,11 +89281,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "sgq" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -91327,11 +90699,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "sPS" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/power/solar_control{ dir = 8; name = "Aft Starboard Solar Control" @@ -91386,10 +90754,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -91471,10 +90836,7 @@ /area/station/medical/break_room) "sSH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "sTk" = ( @@ -92465,10 +91827,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "tDQ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/chem_master/condimaster, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, @@ -92490,10 +91849,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "tDU" = ( -/obj/machinery/alarm{ - pixel_y = 24; - name = "north bump" - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -92700,11 +92056,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "tIT" = ( @@ -93297,11 +92649,7 @@ /obj/item/bedsheet/medical, /obj/machinery/iv_drip, /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -94466,11 +93814,7 @@ }, /area/station/hallway/primary/central/north) "uGY" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -94618,11 +93962,7 @@ /area/station/command/meeting_room) "uLc" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -94681,11 +94021,7 @@ }, /area/station/medical/sleeper) "uMB" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -95451,11 +94787,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -95603,10 +94935,7 @@ }, /area/station/medical/reception) "vsy" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/table/reinforced, /obj/item/storage/backpack/duffel/security, /obj/item/reagent_containers/glass/bottle/morphine, @@ -95654,11 +94983,7 @@ /turf/simulated/floor/plating, /area/station/supply/miningdock) "vuX" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/medical/psych) "vvC" = ( @@ -95672,10 +94997,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -95907,11 +95229,7 @@ }, /area/station/hallway/primary/central/sw) "vDg" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96107,10 +95425,7 @@ }, /area/station/medical/storage) "vGR" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/service/theatre) "vHe" = ( @@ -96585,11 +95900,7 @@ /area/station/maintenance/fsmaint) "vXU" = ( /obj/structure/table/glass, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/stack/medical/bruise_pack/advanced{ pixel_x = -7; pixel_y = 7 @@ -96706,10 +96017,7 @@ }, /area/station/medical/virology) "wbi" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -96837,11 +96145,7 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "wew" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel/white, /area/station/science/explab) "weF" = ( @@ -97330,11 +96634,7 @@ /area/station/medical/virology) "wrE" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/hand_labeler, /obj/item/stack/packageWrap, /turf/simulated/floor/plasteel/dark, @@ -99187,11 +98487,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "xzp" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 93799a729a5..05463f4ee2d 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -215,11 +215,7 @@ c_tag = "Law Office"; dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ dir = 4; req_access = null; @@ -604,11 +600,7 @@ /obj/structure/closet/secure_closet/detective, /obj/item/restraints/handcuffs, /obj/item/flash, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/reagent_containers/drinks/flask/detflask, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -979,11 +971,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "ajR" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "ajS" = ( @@ -1200,11 +1188,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/public/fitness) "alm" = ( @@ -2789,11 +2773,7 @@ pixel_x = 12 }, /obj/effect/turf_decal/tile/brown, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -3389,11 +3369,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "avI" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/hologram/holopad, /obj/structure/cable{ d1 = 4; @@ -4306,11 +4282,7 @@ dir = 1; pixel_y = 32 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -4459,11 +4431,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/sign/double/map/right{ desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; icon_state = "map-right-MS"; @@ -4792,11 +4760,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -5164,10 +5128,7 @@ }, /area/station/command/vault) "aCz" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -5692,11 +5653,7 @@ /area/station/engineering/solar/auxport) "aED" = ( /obj/machinery/economy/vending/shoedispenser, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -5979,11 +5936,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "aGc" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -6326,11 +6279,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "aHu" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/table, /obj/item/storage/toolbox/emergency, /turf/simulated/floor/plasteel{ @@ -6856,11 +6805,7 @@ }, /area/station/hallway/primary/fore/east) "aJa" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -7102,11 +7047,7 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "aJI" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/delivery/hollow, /obj/structure/dispenser, /turf/simulated/floor/plasteel, @@ -7536,11 +7477,7 @@ /area/station/legal/courtroom) "aLg" = ( /obj/machinery/light/small, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7715,11 +7652,7 @@ /turf/simulated/floor/plating, /area/station/public/construction) "aLC" = ( -/obj/machinery/alarm{ - dir = 4; - name = "custom placement"; - pixel_x = -34 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -7819,10 +7752,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/computer/card/minor/qm{ dir = 0 }, @@ -7876,11 +7806,7 @@ }, /area/station/supply/qm) "aLW" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) @@ -8555,10 +8481,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Secure Storage" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "aNV" = ( @@ -8643,11 +8566,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "aOk" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/public/construction) "aOl" = ( @@ -9132,11 +9051,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aQa" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -9209,18 +9124,11 @@ /turf/simulated/floor/greengrid, /area/station/turret_protected/ai_upload) "aQk" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/greengrid, /area/station/turret_protected/ai_upload) "aQp" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -9239,11 +9147,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aQz" = ( @@ -11090,11 +10994,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "aWe" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "aWf" = ( @@ -11893,11 +11793,7 @@ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/smes) "aYF" = ( @@ -12380,11 +12276,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -12412,11 +12304,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -12794,10 +12682,7 @@ }, /area/station/turret_protected/ai_upload/foyer) "bbm" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/kirbyplants/applebush, /turf/simulated/floor/plasteel{ dir = 9; @@ -12869,11 +12754,7 @@ }, /area/station/hallway/primary/central/north) "bbt" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -13185,10 +13066,7 @@ c_tag = "AI Upload Foyer"; network = list("SS13","RD","AIUpload") }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/computer/security/telescreen/minisat{ dir = 8; pixel_x = 29 @@ -13917,11 +13795,7 @@ }, /area/station/maintenance/fsmaint) "bdX" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -15361,11 +15235,7 @@ c_tag = "Auxiliary Tool Storage"; dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light/small{ dir = 4 }, @@ -15569,11 +15439,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/engimaint) "bid" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15942,10 +15808,7 @@ /area/station/service/janitor) "bja" = ( /obj/structure/closet/l3closet/janitor, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -16210,11 +16073,7 @@ "bjC" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 @@ -16275,11 +16134,7 @@ "bjI" = ( /obj/structure/closet/secure_closet/engineering_chief, /obj/item/megaphone, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -16590,11 +16445,7 @@ }, /obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bkE" = ( @@ -16726,11 +16577,7 @@ }, /area/station/hallway/primary/starboard/east) "bkV" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -16748,10 +16595,7 @@ /area/station/maintenance/turbine) "bkZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/all_access{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/alarm/all_access/directional/east, /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -17121,11 +16965,7 @@ }, /area/station/hallway/secondary/entry/east) "blX" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/closet, /obj/item/crowbar, /obj/item/flash, @@ -17619,10 +17459,7 @@ /obj/machinery/camera{ c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -17662,10 +17499,7 @@ }, /area/station/medical/medbay) "bnn" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -18603,11 +18437,7 @@ pixel_y = 3 }, /obj/item/rcs, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "arrival" @@ -18813,11 +18643,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "bqs" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/landmark/start/captain, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) @@ -19378,11 +19204,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -20056,11 +19878,7 @@ /obj/structure/filingcabinet/chestdrawer{ pixel_y = 3 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -20660,11 +20478,7 @@ }, /area/station/engineering/controlroom) "bvw" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; @@ -21233,11 +21047,7 @@ /obj/structure/chair/barber{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -21303,10 +21113,7 @@ }, /area/station/telecomms/computer) "bxg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Mini Satellite Access"; network = list("SS13","MiniSat") @@ -21393,11 +21200,7 @@ }, /area/station/ai_monitored/storage/eva) "bxr" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ @@ -21666,11 +21469,7 @@ }, /area/station/hallway/primary/port/west) "bxX" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -21888,11 +21687,7 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "byv" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, @@ -22562,11 +22357,7 @@ }, /area/station/service/bar) "bAA" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light/small{ dir = 8 }, @@ -23261,11 +23052,7 @@ }, /area/station/command/bridge) "bCB" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -23542,11 +23329,7 @@ }, /area/station/hallway/secondary/entry/east) "bDx" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -23590,11 +23373,7 @@ }, /area/station/hallway/secondary/entry/lounge) "bDB" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -23680,11 +23459,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/cultivator, /obj/item/paper/hydroponics, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "bDL" = ( @@ -23874,11 +23649,7 @@ /turf/simulated/floor/carpet, /area/station/command/office/captain) "bEn" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -24223,11 +23994,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/bridge) "bFS" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -24437,11 +24204,7 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "bHi" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/message_monitor{ dir = 4 }, @@ -24908,11 +24671,7 @@ /area/station/hallway/primary/aft/south) "bIT" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/item/folder/red, /obj/item/pen/red, /turf/simulated/floor/carpet, @@ -25234,10 +24993,7 @@ }, /area/station/hallway/secondary/bridge) "bJB" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -25382,11 +25138,7 @@ /area/station/engineering/atmos) "bKj" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "bKk" = ( @@ -25817,11 +25569,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "bLH" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -25885,10 +25633,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -26295,11 +26040,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/cultivator, /obj/item/wirecutters, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -26391,11 +26132,7 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "bOf" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -26782,10 +26519,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -26952,10 +26686,7 @@ /area/station/service/library) "bQc" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -27959,11 +27690,7 @@ /area/station/service/library) "bTw" = ( /obj/machinery/light/small, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/wood, /area/station/service/library) "bTx" = ( @@ -28164,10 +27891,7 @@ /area/station/service/kitchen) "bUj" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "bUl" = ( @@ -28423,11 +28147,7 @@ }, /area/station/science/robotics/showroom) "bVe" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) "bVf" = ( @@ -28812,11 +28532,7 @@ }, /area/station/command/bridge) "bWz" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -28901,11 +28617,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "bWH" = ( @@ -28980,10 +28692,7 @@ /area/station/science/robotics/showroom) "bWR" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, /area/station/command/office/blueshield) @@ -29569,11 +29278,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -29878,11 +29583,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/wood, /area/station/service/library) "caa" = ( @@ -30242,10 +29943,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark/telecomms, /area/station/science/server/coldroom) "cbi" = ( @@ -30580,11 +30278,7 @@ }, /area/station/service/expedition) "ccm" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/table, /obj/item/flashlight, /obj/item/flashlight, @@ -31669,10 +31363,7 @@ /area/station/service/library) "cgu" = ( /obj/structure/chair, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -32356,10 +32047,7 @@ /obj/machinery/camera{ c_tag = "Medbay Foyer Reception" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -32536,11 +32224,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "cjt" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/closet/secure_closet/psychiatrist, /obj/item/clipboard{ pixel_x = -5 @@ -32702,11 +32386,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/solar/starboard) "cjZ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, @@ -32780,11 +32460,7 @@ /turf/space, /area/space/nearstation) "ckq" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, @@ -33989,11 +33665,7 @@ }, /area/station/medical/exam_room) "cpv" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34951,11 +34623,7 @@ name = "north bump"; pixel_y = 24 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -35150,10 +34818,7 @@ "ctY" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/delivery/blue, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -35558,10 +35223,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/medmaint) "cvu" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/window/reinforced{ dir = 4 }, @@ -36470,10 +36132,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36759,11 +36418,7 @@ }, /area/station/hallway/primary/central/south) "cAA" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -36824,11 +36479,7 @@ }, /area/station/engineering/gravitygenerator) "cAJ" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -36979,11 +36630,7 @@ }, /area/station/medical/exam_room) "cBu" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -37027,10 +36674,7 @@ c_tag = "Medbay Genetics" }, /obj/structure/disposalpipe/trunk, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -37052,11 +36696,7 @@ }, /area/station/science/genetics) "cBC" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -37650,10 +37290,7 @@ "cDS" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -38387,11 +38024,7 @@ /area/station/service/kitchen) "cGs" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/clothing/mask/gas, /obj/machinery/door/window/classic/reversed{ dir = 1; @@ -38776,10 +38409,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -38920,10 +38550,7 @@ }, /area/station/science/genetics) "cIg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39438,11 +39065,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39452,11 +39075,7 @@ /obj/machinery/computer/shuttle/labor{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -39506,11 +39125,7 @@ c_tag = "Aft Primary Hallway - Middle"; dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -39569,11 +39184,7 @@ /obj/effect/turf_decal/siding{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41336,11 +40947,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 }, @@ -41596,11 +41203,7 @@ }, /area/station/service/chapel/office) "cSN" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -42011,10 +41614,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/science/misc_lab) "cUz" = ( @@ -42625,10 +42225,7 @@ /obj/machinery/camera{ c_tag = "Fitness Room - Fore" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -42726,11 +42323,7 @@ /area/station/public/fitness) "cXJ" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/storage/fancy/crayons, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -43054,10 +42647,7 @@ /turf/simulated/wall, /area/station/science/xenobiology) "cZw" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/flora/ausbushes/sparsegrass, /mob/living/carbon/human/monkey, /turf/simulated/floor/grass/no_creep, @@ -43116,11 +42706,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "chapel" }, @@ -43749,11 +43335,7 @@ }, /area/station/maintenance/asmaint) "ddz" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/rack, /obj/item/storage/box/beakers{ pixel_x = 6; @@ -43920,11 +43502,7 @@ }, /area/station/service/chapel) "dep" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46936,11 +46514,7 @@ /area/station/science/robotics/showroom) "ekg" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/effect/turf_decal/delivery/blue/hollow, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -47427,10 +47001,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "evl" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -48184,11 +47755,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "eNa" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -48642,11 +48209,7 @@ }, /area/station/medical/surgery/observation) "eVn" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/plasteel{ dir = 9; @@ -49022,11 +48585,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "fdd" = ( @@ -49394,10 +48953,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 2; @@ -49449,10 +49005,7 @@ dir = 8; name = "Air To Distro" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -49816,10 +49369,7 @@ }, /area/station/engineering/solar/port) "ftz" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -49964,10 +49514,7 @@ "fwz" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/firecloset, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -50353,11 +49900,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -51340,10 +50883,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -51885,10 +51425,7 @@ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -52629,10 +52166,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "gDu" = ( @@ -53001,10 +52535,7 @@ }, /area/station/public/fitness) "gIL" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -53223,10 +52754,7 @@ }, /area/station/hallway/primary/starboard/east) "gND" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light/small{ dir = 1 }, @@ -53501,10 +53029,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/ai_upload) "gTS" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -55530,11 +55055,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -55916,10 +55437,7 @@ /area/station/science/toxins/mixing) "hQZ" = ( /obj/structure/closet/secure_closet/magistrate, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/megaphone, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -57276,11 +56794,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "itu" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -58677,11 +58191,7 @@ }, /area/station/hallway/secondary/garden) "iWv" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/telecomms/chamber) "iWB" = ( @@ -58742,11 +58252,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "iYA" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -58936,11 +58442,7 @@ /area/station/science/xenobiology) "jcF" = ( /obj/machinery/photocopier, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 9; @@ -59963,11 +59465,7 @@ }, /area/station/science/research) "jFi" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -60976,11 +60474,7 @@ /turf/simulated/floor/plating, /area/station/engineering/smes) "jVQ" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/binary/pump/on{ dir = 4; name = "External Waste Ports to Filter" @@ -61416,11 +60910,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "kfR" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61981,11 +61471,7 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "ktZ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -62089,11 +61575,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/portable/canister, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) @@ -62335,11 +61817,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -62487,11 +61965,7 @@ }, /area/station/medical/exam_room) "kFk" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/card/minor/rd{ dir = 4 }, @@ -64373,11 +63847,7 @@ pixel_x = -8; pixel_y = -3 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/cafeteria) "lpJ" = ( @@ -65135,10 +64605,7 @@ dir = 8; name = "Gas to Filter" }, -/obj/machinery/alarm/engine{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/alarm/engine/directional/south, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "lGC" = ( @@ -65186,10 +64653,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -65523,11 +64987,7 @@ /obj/item/tank/internals/emergency_oxygen/plasma{ pixel_x = -5 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -67934,11 +67394,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "mPh" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/spawner/window/reinforced/polarized{ id = "ROBO" }, @@ -68028,11 +67484,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "mRr" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -68203,10 +67655,7 @@ /area/station/command/office/hos) "mVl" = ( /obj/structure/chair/sofa/corp/left, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -68508,11 +67957,7 @@ /area/station/engineering/control) "mZZ" = ( /obj/machinery/photocopier, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel{ icon_state = "yellow" @@ -69490,11 +68935,7 @@ }, /area/station/science/research) "nsm" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light{ dir = 8 }, @@ -69737,10 +69178,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -70282,10 +69720,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "nIi" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -71548,10 +70983,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -72000,10 +71432,7 @@ }, /obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/metalfoam, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ dir = 5; @@ -72062,11 +71491,7 @@ }, /obj/item/wrench, /obj/item/clothing/glasses/welding, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -72229,11 +71654,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -72279,11 +71700,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -72349,11 +71766,7 @@ }, /area/station/hallway/primary/central/west) "oMk" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/turf_decal/stripes/line{ @@ -72395,11 +71808,7 @@ /area/station/public/sleep) "oMT" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -72877,11 +72286,7 @@ /obj/machinery/atmospherics/binary/valve{ dir = 1 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oUs" = ( @@ -72968,11 +72373,7 @@ /area/station/science/xenobiology) "oWd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -73200,11 +72601,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "paZ" = ( @@ -73560,10 +72957,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74101,11 +73495,7 @@ }, /area/station/security/armory/secure) "ptU" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/wood, /area/station/public/mrchangs) "ptX" = ( @@ -74660,10 +74050,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/security, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -74828,10 +74215,7 @@ }, /obj/structure/closet/crate/freezer/iv_storage, /obj/effect/turf_decal/delivery/blue/hollow, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Medbay Cold Storage" }, @@ -75126,10 +74510,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "pPJ" = ( @@ -75410,11 +74791,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "pUs" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, @@ -76291,10 +75668,7 @@ }, /area/station/hallway/primary/central/north) "qmL" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -76976,11 +76350,7 @@ /obj/item/reagent_containers/dropper{ pixel_y = -5 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -78294,11 +77664,7 @@ /area/station/service/hydroponics) "rgp" = ( /obj/machinery/light, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -78724,11 +78090,7 @@ /turf/simulated/floor/plating, /area/station/medical/surgery/observation) "rqq" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -80118,10 +79480,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, /area/station/service/clown) "rPx" = ( @@ -80829,10 +80188,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "sfG" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6; level = 1 @@ -80851,10 +80207,7 @@ /area/station/hallway/primary/aft/north) "sgk" = ( /obj/machinery/smartfridge/foodcart, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -81862,10 +81215,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "sFz" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/tank/air, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -81873,10 +81223,7 @@ /area/station/aisat/service) "sFN" = ( /obj/machinery/economy/vending/robodrobe, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/door_control{ id = "roboticsprivacy"; name = "Robotics Privacy Control"; @@ -82007,11 +81354,7 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -82116,11 +81459,7 @@ code = 6; frequency = 1445 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/door_control{ id = "SecJusticeChamber"; layer = 4; @@ -82971,11 +82310,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "tbd" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -83939,11 +83274,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "twL" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -85503,11 +84834,7 @@ /obj/machinery/computer/message_monitor{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/light_switch{ dir = 1; name = "custom placement"; @@ -86720,11 +86047,7 @@ pixel_y = 3 }, /obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -86864,11 +86187,7 @@ /turf/simulated/floor/plating, /area/station/security/main) "uOm" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -88493,10 +87812,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "vwU" = ( @@ -89095,11 +88411,7 @@ }, /area/station/hallway/primary/port/east) "vNw" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -89737,11 +89049,7 @@ }, /area/station/medical/medbay) "wcq" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners" }, @@ -90855,11 +90163,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /obj/structure/cable{ @@ -90924,11 +90228,7 @@ /obj/item/mmi, /obj/item/mmi, /obj/item/mmi, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -91398,11 +90698,7 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -92386,11 +91682,7 @@ /area/station/engineering/atmos) "xml" = ( /obj/structure/closet/l3closet/scientist, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 6 }, diff --git a/code/game/objects/items/mountable_frames/air_alarm_frame.dm b/code/game/objects/items/mountable_frames/air_alarm_frame.dm index 5f18c6ac25d..7bae7f6ef71 100644 --- a/code/game/objects/items/mountable_frames/air_alarm_frame.dm +++ b/code/game/objects/items/mountable_frames/air_alarm_frame.dm @@ -1,8 +1,4 @@ -/* -AIR ALARM ITEM -Handheld air alarm frame, for placing on walls -Code shamelessly copied from apc_frame -*/ +/// Handheld air alarm frame, for placing on walls. /obj/item/mounted/frame/alarm_frame name = "air alarm frame" desc = "Used for building Air Alarms" @@ -14,7 +10,7 @@ Code shamelessly copied from apc_frame mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE /obj/item/mounted/frame/alarm_frame/do_build(turf/on_wall, mob/user) - var/obj/machinery/alarm/A = new/obj/machinery/alarm(get_turf(src), get_dir(on_wall, user), 1) + var/obj/machinery/alarm/A = new/obj/machinery/alarm(get_turf(src), get_dir(user, on_wall), 1) A.buildstage = AIR_ALARM_FRAME // Set the build stage to the initial state A.update_icon() qdel(src) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index b857c44598b..8ef4f4286ce 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -95,10 +95,9 @@ report_danger_level = FALSE /obj/machinery/alarm/engine - name = "engine air alarm" locked = FALSE req_access = null - custom_name = TRUE + custom_name = "engine air alarm" req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) /// general syndicate access @@ -193,13 +192,21 @@ /obj/machinery/alarm/Initialize(mapload, direction, building = 0) . = ..() + + alarm_area = get_area(src) + + if(custom_name) + name = custom_name + else + name = "[alarm_area.name] Air Alarm" + if(building) // Do this first since the Init uses this later on. TODO refactor to just use an Init if(direction) setDir(direction) buildstage = 0 wiresexposed = TRUE - set_pixel_offsets_from_dir(-24, 24, -24, 24) + set_pixel_offsets_from_dir(24, -24, 24, -24) GLOB.air_alarms += src GLOB.air_alarms = sortAtom(GLOB.air_alarms) @@ -221,9 +228,6 @@ return ..() /obj/machinery/alarm/proc/first_run() - alarm_area = get_area(src) - if(!custom_name) - name = "[alarm_area.name] Air Alarm" apply_preset(AALARM_PRESET_HUMAN) // Don't cycle. GLOB.air_alarm_repository.update_cache(src) @@ -1142,13 +1146,19 @@ aidisabled = FALSE /obj/machinery/alarm/all_access - name = "all-access air alarm" desc = "A wall-mounted device used to control atmospheric equipment. Its access restrictions appear to have been removed." locked = FALSE - custom_name = TRUE + custom_name = "all-access air alarm" req_access = null req_one_access = null +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/all_access, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/engine, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/monitor, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/server, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/syndicate, 24, 24) + /* AIR ALARM CIRCUIT Just an object used in constructing air alarms diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index 31d531c1341..47a859bf8f5 100644 Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ diff --git a/tools/UpdatePaths/Scripts/24652_airalarm_directionals.txt b/tools/UpdatePaths/Scripts/24652_airalarm_directionals.txt new file mode 100644 index 00000000000..1e6b790b2ba --- /dev/null +++ b/tools/UpdatePaths/Scripts/24652_airalarm_directionals.txt @@ -0,0 +1,31 @@ +/obj/machinery/alarm{pixel_x=-24} : /obj/machinery/alarm/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm{pixel_x=24} : /obj/machinery/alarm/directional/east{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm{pixel_y=-24} : /obj/machinery/alarm/directional/south{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm{pixel_y=24} : /obj/machinery/alarm/directional/north{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/alarm{pixel_x=-34} : /obj/machinery/alarm/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/alarm/all_access{pixel_x=-24} : /obj/machinery/alarm/all_access/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/all_access{pixel_x=24} : /obj/machinery/alarm/all_access/directional/east{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/all_access{pixel_y=-24} : /obj/machinery/alarm/all_access/directional/south{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/all_access{pixel_y=24} : /obj/machinery/alarm/all_access/directional/north{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/alarm/engine{pixel_x=-22} : /obj/machinery/alarm/engine/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/engine{pixel_x=24} : /obj/machinery/alarm/engine/directional/east{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/engine{pixel_y=-24} : /obj/machinery/alarm/engine/directional/south{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/engine{pixel_y=24} : /obj/machinery/alarm/engine/directional/north{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/alarm/monitor{pixel_x=-22} : /obj/machinery/alarm/monitor/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/monitor{pixel_x=24} : /obj/machinery/alarm/monitor/directional/east{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/monitor{pixel_y=-24} : /obj/machinery/alarm/monitor/directional/south{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/monitor{pixel_y=24} : /obj/machinery/alarm/monitor/directional/north{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/alarm/server{pixel_x=-22} : /obj/machinery/alarm/server/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/server{pixel_x=24} : /obj/machinery/alarm/server/directional/east{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/server{pixel_y=-24} : /obj/machinery/alarm/server/directional/south{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/server{pixel_y=24} : /obj/machinery/alarm/server/directional/north{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/alarm/syndicate{pixel_x=-24} : /obj/machinery/alarm/syndicate/directional/west{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/syndicate{pixel_x=24} : /obj/machinery/alarm/syndicate/directional/east{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/syndicate{pixel_y=-24} : /obj/machinery/alarm/syndicate/directional/south{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/alarm/syndicate{pixel_y=24} : /obj/machinery/alarm/syndicate/directional/north{@OLD;dir=@SKIP;name=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} diff --git a/tools/maplint/lints/directional_airalarms.yml b/tools/maplint/lints/directional_airalarms.yml new file mode 100644 index 00000000000..ca5a84a49b4 --- /dev/null +++ b/tools/maplint/lints/directional_airalarms.yml @@ -0,0 +1,29 @@ +help: "Use the specific directional subtypes for this air alarm." +/obj/machinery/alarm: + banned_variables: + - pixel_x + - pixel_y +=/obj/machinery/alarm: + banned: true +=/obj/machinery/alarm/directional: + banned: true +=/obj/machinery/alarm/all_access: + banned: true +=/obj/machinery/alarm/all_access/directional: + banned: true +=/obj/machinery/alarm/engine: + banned: true +=/obj/machinery/alarm/engine/directional: + banned: true +=/obj/machinery/alarm/monitor: + banned: true +=/obj/machinery/alarm/monitor/directional: + banned: true +=/obj/machinery/alarm/server: + banned: true +=/obj/machinery/alarm/server/directional: + banned: true +=/obj/machinery/alarm/syndicate: + banned: true +=/obj/machinery/alarm/syndicate/directional: + banned: true