diff --git a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm index 058c437789ee..58ae34c81862 100644 --- a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm +++ b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm @@ -9,9 +9,7 @@ /area/ruin/unpowered/misc_lavaruin) "be" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "darkblue"; dir = 4 @@ -45,9 +43,7 @@ /area/ruin/unpowered/misc_lavaruin) "ce" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -114,9 +110,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "fN" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/remains/robot, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -184,7 +178,7 @@ /area/ruin/unpowered/misc_lavaruin) "jQ" = ( /obj/machinery/washing_machine, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "whiteblue" }, @@ -223,9 +217,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "lC" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "lI" = ( @@ -276,9 +268,7 @@ /area/ruin/unpowered/misc_lavaruin) "nz" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -329,9 +319,7 @@ /turf/simulated/wall/indestructible/syndishuttle/nodiagonal, /area/ruin/unpowered/misc_lavaruin) "pv" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "cmo" @@ -370,9 +358,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "rP" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "darkred"; dir = 4 @@ -509,9 +495,7 @@ /area/ruin/unpowered/misc_lavaruin) "xi" = ( /obj/structure/rack, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -576,9 +560,7 @@ /obj/item/clothing/suit/armor/bulletproof{ pixel_y = 6 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -940,9 +922,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "KP" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "cmo" @@ -1059,9 +1039,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "Ss" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -1091,7 +1069,7 @@ /area/ruin/unpowered/misc_lavaruin) "Tk" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "darkblue" }, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index de6c14a62c11..1c47f30f5260 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -90,9 +90,8 @@ /turf/template_noop, /area/template_noop) "dq" = ( -/obj/machinery/light_construct/small{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/small/east{ + icon_state = "bulb-broken" }, /obj/structure/closet, /obj/structure/sign/nosmoking_1{ @@ -153,9 +152,8 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "eJ" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/airless{ @@ -192,9 +190,7 @@ /area/ruin/space/powered) "hV" = ( /obj/machinery/door/poddoor, -/obj/machinery/door_control{ - pixel_x = -30 - }, +/obj/machinery/door_control/shutter/west, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "ia" = ( @@ -273,10 +269,7 @@ /turf/template_noop, /area/template_noop) "mq" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" @@ -485,7 +478,7 @@ /area/ruin/space/unpowered/unpowered_structures) "vP" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = -6 }, /obj/item/folder/yellow{ @@ -737,18 +730,15 @@ /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/unpowered/unpowered_structures) "Fw" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/plasteel/airless{ icon_state = "blackfull" }, /area/ruin/space/powered) "FF" = ( -/obj/machinery/light/small{ - icon_state = "bulb-broken"; - dir = 4 +/obj/machinery/light/small/directional/west{ + icon_state = "bulb-broken" }, /obj/effect/turf_decal/delivery/white, /obj/structure/closet/cardboard, @@ -762,10 +752,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "FZ" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/landmark/burnturf, /obj/item/organ/external/arm, /obj/item/organ/external/hand, @@ -867,9 +854,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "Jf" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -902,9 +887,8 @@ }, /area/ruin/space/unpowered/unpowered_structures) "KY" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/structure/closet, /obj/structure/sign/nosmoking_1{ @@ -952,7 +936,7 @@ /area/template_noop) "MV" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = -6 }, /obj/item/reagent_containers/glass/beaker/waterbottle{ @@ -979,7 +963,7 @@ /area/ruin/space/unpowered/unpowered_structures) "OT" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = -6; id = "convoy_window" }, @@ -1150,18 +1134,15 @@ /area/ruin/space/unpowered/unpowered_structures) "TT" = ( /obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel/airless{ icon_state = "blackfull" }, /area/ruin/space/powered) "TU" = ( /obj/structure/lattice, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /turf/template_noop, /area/template_noop) @@ -1241,9 +1222,8 @@ }, /area/ruin/space/unpowered/unpowered_structures) "YG" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/structure/lattice, /turf/template_noop, @@ -1258,9 +1238,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "Ze" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel/airless{ icon_state = "blackfull" diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm index ac1c95cb83eb..095a64df7995 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm @@ -335,7 +335,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "yT" = ( -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, @@ -444,7 +444,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Io" = ( -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, /obj/effect/landmark/burnturf, @@ -487,9 +487,8 @@ /turf/template_noop, /area/template_noop) "Kg" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -670,9 +669,8 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "UE" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /obj/effect/landmark/burnturf, /turf/simulated/floor/mineral/plastitanium/red/airless, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm index 83c53c4b52d9..90a16bf3f4f8 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm @@ -43,9 +43,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "aY" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/blood/splatter, /obj/effect/spawner/random_spawners/dirt_often, @@ -163,9 +162,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/mineral/plastitanium, @@ -191,18 +188,16 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "ez" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/powered/requires_power_space) "eC" = ( /obj/machinery/atmospherics/portable/canister, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "bulb-broken" }, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor, @@ -220,9 +215,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/glass, /obj/item/shard, /obj/item/stack/cable_coil{ @@ -237,9 +230,8 @@ icon_state = "coil0"; name = "tesla coil" }, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) @@ -255,9 +247,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "eT" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/glass, /obj/item/trash/spentcasing{ @@ -282,9 +273,7 @@ /area/template_noop) "gg" = ( /obj/item/trash/can, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" @@ -311,9 +300,8 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/ruin/space/powered/requires_power_space) "hn" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -332,9 +320,7 @@ /area/ruin/space/powered/requires_power_space) "hF" = ( /obj/structure/closet/crate/trashcart, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/item/bedsheet/syndie, /obj/item/trash/syndi_cakes, /obj/item/trash/syndi_cakes, @@ -343,7 +329,7 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "hG" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/constructable_frame{ icon_state = "box_1" }, @@ -395,9 +381,8 @@ }, /area/ruin/space/powered/requires_power_space) "iL" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/structure/closet/crate/secure/weapon{ req_access_txt = null; @@ -438,9 +423,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "jl" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /obj/effect/decal/cleanable/blood/drip{ icon_state = "5" }, @@ -570,9 +553,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "lm" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/item/trash/spentcasing{ icon_state = "r-casing"; @@ -581,9 +563,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "lt" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/structure/mirror{ dir = 4; @@ -611,9 +592,7 @@ "lP" = ( /obj/effect/spawner/random_spawners/dirt_often, /obj/effect/decal/cleanable/blood/gibs/xeno, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "mS" = ( @@ -698,9 +677,8 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "ol" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -737,9 +715,8 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "pj" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/structure/computerframe{ icon_state = "comp_frame_5" @@ -769,9 +746,8 @@ }, /area/ruin/space/powered/requires_power_space) "pB" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -793,9 +769,8 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "pO" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/structure/closet/crate/can, /obj/item/trash/syndi_cakes, @@ -894,9 +869,8 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "tE" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /obj/machinery/atmospherics/unary/vent_pump{ dir = 4 @@ -904,10 +878,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "tF" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/alien/egg/burst, /obj/effect/decal/warning_stripes/east, /obj/effect/spawner/random_spawners/dirt_often, @@ -967,9 +938,8 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "vk" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/machinery/economy/vending/medical/syndicate_access, /obj/effect/turf_decal/stripes/white/line{ @@ -990,9 +960,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "vX" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "wO" = ( @@ -1045,9 +1013,8 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "xG" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/item/paper/crumpled, /obj/effect/spawner/random_spawners/dirt_often, @@ -1082,17 +1049,13 @@ "yV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "zq" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/blood/splatter, /obj/effect/spawner/random_spawners/dirt_often, @@ -1101,9 +1064,7 @@ }, /area/ruin/space/powered/requires_power_space) "zH" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/item/reagent_containers/syringe, /obj/item/organ/external/leg, /turf/simulated/floor, @@ -1160,9 +1121,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "AV" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "bulb-broken" }, /obj/machinery/atmospherics/unary/vent_pump, /obj/effect/turf_decal/stripes/white/line{ @@ -1188,7 +1148,7 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "BK" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/blood/gibs/xeno/body, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ @@ -1222,9 +1182,8 @@ /area/ruin/space/powered/requires_power_space) "ET" = ( /obj/machinery/atmospherics/portable/canister, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "bulb-broken" }, /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) @@ -1372,9 +1331,8 @@ /turf/simulated/floor, /area/ruin/space/powered/requires_power_space) "Je" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/effect/spawner/random_spawners/dirt_often, /obj/item/trash/spentcasing{ @@ -1390,15 +1348,12 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "JH" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /obj/structure/dispenser/oxygen, /obj/effect/decal/warning_stripes/north, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "JK" = ( @@ -1432,9 +1387,7 @@ icon_state = "r-casing"; dir = 9 }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "Ln" = ( @@ -1545,9 +1498,7 @@ /area/ruin/space/powered/requires_power_space) "OA" = ( /obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "OL" = ( @@ -1557,7 +1508,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "Pm" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, @@ -1595,9 +1546,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "QS" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /obj/machinery/suit_storage_unit/syndicate{ mask_type = null; @@ -1842,15 +1792,11 @@ name = "cyborg recharging station" }, /obj/effect/decal/warning_stripes/south, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "YG" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm index 0f9727a308c1..7de736329d51 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm @@ -20,9 +20,8 @@ "aH" = ( /obj/structure/closet/crate/secure/loot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) @@ -61,7 +60,7 @@ pixel_y = 9; pixel_x = -5 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = 6; id = "bdoorright_mech" }, @@ -97,9 +96,8 @@ "bC" = ( /obj/structure/closet/crate/trashcart, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /turf/simulated/floor/plating, /area/ruin/space/powered) @@ -159,9 +157,8 @@ "cG" = ( /obj/structure/table, /obj/item/crowbar, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) @@ -269,13 +266,11 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "gU" = ( -/obj/machinery/door_control{ - pixel_y = -30; +/obj/machinery/door_control/shutter/south{ id = "sleft_mech" }, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium/purple, @@ -325,9 +320,8 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "ib" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -336,8 +330,7 @@ /turf/simulated/wall/r_wall, /area/ruin/space/powered) "io" = ( -/obj/machinery/door_control{ - pixel_y = 30; +/obj/machinery/door_control/shutter/north{ id = "sright_mech" }, /turf/simulated/floor/mineral/titanium, @@ -373,17 +366,15 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "iU" = ( /obj/item/kirbyplants, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -442,7 +433,7 @@ /area/ruin/space/powered) "kD" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "shang1_mech"; pixel_x = 6; pixel_y = -2 @@ -562,9 +553,8 @@ /obj/structure/toilet{ dir = 1 }, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) @@ -575,7 +565,7 @@ "nc" = ( /obj/structure/closet/crate/secure/loot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/ruin/space/powered) "ng" = ( @@ -624,9 +614,8 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "nV" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /obj/structure/table, /obj/item/hand_labeler{ @@ -667,7 +656,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "oL" = ( -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, @@ -733,13 +722,11 @@ /turf/simulated/floor/mech_bay_recharge_floor, /area/ruin/space/powered) "qB" = ( -/obj/machinery/door_control{ - pixel_y = -30; +/obj/machinery/door_control/shutter/south{ id = "sright_mech" }, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /mob/living/simple_animal/hostile/scavengers/laser, /turf/simulated/floor/mineral/titanium/purple, @@ -784,9 +771,8 @@ "rs" = ( /obj/structure/rack/gunrack, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /turf/simulated/floor/plating, /area/ruin/space/powered) @@ -835,9 +821,8 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "sw" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/turf_decal/box, /turf/simulated/floor/mineral/titanium, @@ -850,9 +835,8 @@ /turf/simulated/floor/carpet/purple, /area/ruin/space/powered) "sP" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium/yellow, @@ -991,9 +975,8 @@ /area/ruin/space/powered) "vL" = ( /obj/machinery/economy/vending/snack/free, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) @@ -1123,11 +1106,7 @@ icon_state = "mirror_broke"; pixel_x = -30 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = -5 - }, +/obj/structure/sink/directional/east, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "yr" = ( @@ -1156,9 +1135,8 @@ /area/ruin/space/powered) "yU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) @@ -1167,9 +1145,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "zy" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "zF" = ( @@ -1190,7 +1166,7 @@ }, /area/ruin/space/powered) "zM" = ( -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, @@ -1202,8 +1178,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "Ae" = ( -/obj/machinery/door_control{ - pixel_y = 30; +/obj/machinery/door_control/shutter/north{ id = "shang1_mech" }, /obj/effect/decal/cleanable/dirt, @@ -1236,9 +1211,8 @@ /area/ruin/space/powered) "AR" = ( /obj/item/flag, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -1280,7 +1254,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) "BD" = ( @@ -1301,9 +1275,8 @@ /turf/simulated/floor/mineral/titanium/purple, /area/ruin/space/powered) "Cm" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/walllocker/emerglocker/north, @@ -1321,9 +1294,8 @@ dir = 4 }, /obj/item/storage/fancy/cigarettes/cigpack_robust, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "bulb-broken" }, /turf/simulated/floor/plating, /area/ruin/space/powered) @@ -1387,22 +1359,18 @@ /turf/simulated/floor/mineral/titanium/purple, /area/ruin/space/powered) "Do" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/door_control{ - id = "hang1_mech"; - pixel_y = 32 +/obj/machinery/door_control/shutter/north{ + id = "hang1_mech" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "DE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plating, /area/ruin/space/powered) "DG" = ( @@ -1420,26 +1388,22 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "Eb" = ( -/obj/machinery/door_control{ - id = "shang2_mech"; - pixel_x = 30 +/obj/machinery/door_control/shutter/east{ + id = "shang2_mech" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Ec" = ( /obj/structure/closet/firecloset, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Ei" = ( /obj/structure/chair, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) "EI" = ( @@ -1493,7 +1457,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Ft" = ( -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, /turf/simulated/floor/carpet/purple, @@ -1507,12 +1471,11 @@ /area/ruin/space/powered) "Fv" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "bwindows_mech" }, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) @@ -1554,17 +1517,15 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "FK" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "FS" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/structure/table, /obj/item/radio/off, @@ -1596,9 +1557,8 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "Gu" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /turf/simulated/wall/indestructible/whiteshuttle/nodiagonal, /area/ruin/space/powered) @@ -1712,9 +1672,8 @@ /area/ruin/space/powered) "Iw" = ( /obj/structure/table, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) @@ -1770,9 +1729,8 @@ /area/ruin/space/powered) "Jq" = ( /obj/item/kirbyplants, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) @@ -1832,9 +1790,7 @@ /area/ruin/space/powered) "KH" = ( /obj/structure/table, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/item/trash/plate, /obj/item/newspaper{ pixel_y = 9; @@ -1865,9 +1821,8 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "Lo" = ( -/obj/machinery/door_control{ - id = "shang3_mech"; - pixel_x = -30 +/obj/machinery/door_control/shutter/west{ + id = "shang3_mech" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -1976,12 +1931,11 @@ /turf/simulated/floor/plating, /area/ruin/space/powered) "Ng" = ( -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, -/obj/machinery/door_control{ - id = "shang1_mech"; - pixel_y = -30 +/obj/machinery/door_control/shutter/south{ + id = "shang1_mech" }, /turf/simulated/floor/plating, /area/ruin/space/powered) @@ -2001,9 +1955,8 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "Nn" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) @@ -2024,9 +1977,8 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Oh" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium/yellow, @@ -2064,16 +2016,11 @@ /area/ruin/space/powered) "Po" = ( /obj/structure/rack/gunrack, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/ruin/space/powered) "PB" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) @@ -2141,9 +2088,8 @@ /obj/item/flag/rnd{ desc = "It's a flag." }, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -2231,9 +2177,8 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "Sq" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/structure/chair/comfy/black{ dir = 4 @@ -2314,25 +2259,21 @@ /area/ruin/space/powered) "TR" = ( /obj/item/kirbyplants, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "TS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/ruin/space/powered) "TZ" = ( /obj/structure/closet/firecloset, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -2345,8 +2286,7 @@ /turf/simulated/floor/mineral/titanium/purple, /area/ruin/space/powered) "Uj" = ( -/obj/machinery/door_control{ - pixel_y = 30; +/obj/machinery/door_control/shutter/north{ id = "sleft_mech" }, /turf/simulated/floor/mineral/titanium, @@ -2404,9 +2344,8 @@ /turf/simulated/floor/mineral/titanium/purple, /area/ruin/space/powered) "UY" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 4 +/obj/machinery/light_construct/directional/west{ + icon_state = "tube-broken" }, /turf/simulated/floor/carpet/blue, /area/ruin/space/powered) @@ -2418,9 +2357,7 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/ruin/space/powered) "Vk" = ( @@ -2490,9 +2427,8 @@ icon_state = "command_broken" }, /obj/effect/landmark/burnturf, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "tube-broken" }, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) @@ -2505,7 +2441,7 @@ /area/ruin/space/powered) "Wk" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = -6; id = "bdoorleft_mech" }, @@ -2518,9 +2454,8 @@ /turf/simulated/floor/plating, /area/ruin/space/powered) "Wu" = ( -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 8 +/obj/machinery/light_construct/directional/east{ + icon_state = "tube-broken" }, /obj/machinery/atmospherics/portable/scrubber, /obj/effect/decal/cleanable/dirt, @@ -2535,7 +2470,7 @@ /obj/item/mecha_modkit/voice/nanotrasen, /obj/item/toy/figure/mech/mauler, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct{ +/obj/machinery/light_construct/directional/north{ icon_state = "tube-broken" }, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, @@ -2565,9 +2500,8 @@ /area/ruin/space/powered) "Xy" = ( /obj/effect/landmark/burnturf, -/obj/machinery/light_construct{ - icon_state = "tube-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "tube-broken" }, /obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/plating, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm index c04e1a1adc94..bd99348a8ba5 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm @@ -9,9 +9,7 @@ /turf/template_noop, /area/space/nearstation) "ae" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "sepia" }, @@ -99,7 +97,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) @@ -114,9 +112,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -180,9 +176,7 @@ /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/restoraunt2) "bi" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "bn" = ( @@ -210,18 +204,14 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "by" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue"; dir = 1 }, /area/ruin/space/spacehotelv1/entryhallway) "bz" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/spawner/random_spawners/dirt_often, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -271,9 +261,7 @@ /area/ruin/space/spacehotelv1/guestroom3) "bM" = ( /obj/structure/chair/sofa/left, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/reception) "bQ" = ( @@ -334,9 +322,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "cp" = ( @@ -368,9 +354,7 @@ "cB" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) @@ -408,9 +392,7 @@ pixel_y = 32; gpstag = "Twin Nexus Space Hotel" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue"; dir = 1 @@ -448,10 +430,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "di" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/kitchen_machine/grill, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) @@ -534,9 +513,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "dJ" = ( @@ -577,9 +554,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "ed" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/window/reinforced{ dir = 4 }, @@ -588,7 +563,7 @@ /turf/simulated/floor/carpet/arcade, /area/ruin/space/spacehotelv1/guestroom2) "ee" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/beach/water{ slowdown = 3 }, @@ -627,9 +602,7 @@ /mob/living/simple_animal/hostile/retaliate/goat{ name = "Albert" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/spacehotelv1/kitchen) "eD" = ( @@ -684,9 +657,7 @@ /area/ruin/space/spacehotelv1/restoraunt2) "eO" = ( /obj/structure/chair/wood, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/restoraunt2) "eP" = ( @@ -952,10 +923,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "hi" = ( @@ -975,11 +943,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -996,9 +960,7 @@ /area/ruin/space/spacehotelv1/centralhallway) "hn" = ( /obj/structure/chair/sofa/right, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/reception) "hs" = ( @@ -1006,10 +968,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "ht" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/item/mounted/mirror{ pixel_x = 32 }, @@ -1103,9 +1062,7 @@ /area/ruin/space/spacehotelv1/restoraunt3) "hW" = ( /obj/structure/filingcabinet, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/reception) "if" = ( @@ -1163,9 +1120,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) @@ -1198,7 +1153,7 @@ /obj/structure/chair/sofa/right{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/reception) "iG" = ( @@ -1230,9 +1185,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "jb" = ( @@ -1264,10 +1217,7 @@ /turf/simulated/floor/carpet/red, /area/ruin/space/spacehotelv1/guestroom1) "je" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "sepia" }, @@ -1357,9 +1307,7 @@ }, /area/ruin/space/spacehotelv1/bar) "jK" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -1432,10 +1380,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "ki" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -1496,16 +1441,10 @@ /area/ruin/space/spacehotelv1/forehallway) "kG" = ( /obj/structure/toilet, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; - id = "restoom1"; - pixel_x = 32 - }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/door_control/bolt_control/east{ + id = "restoom1" }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -1515,12 +1454,8 @@ /area/ruin/space/spacehotelv1/guestroom4) "kS" = ( /obj/structure/chair/sofa/left, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/north{ id = "gstroom5"; - pixel_y = 24; pixel_x = 8 }, /turf/simulated/floor/carpet/cyan, @@ -1549,11 +1484,7 @@ id = "restoom2_tint"; pixel_x = -8 }, -/obj/machinery/door_control{ - pixel_y = 24; - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/north{ id = "restoom2"; pixel_x = 8 }, @@ -1815,9 +1746,7 @@ }, /area/ruin/space/spacehotelv1/bar) "mA" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) @@ -1830,9 +1759,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/restoraunt3) "mE" = ( @@ -1878,15 +1805,9 @@ /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "mX" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/light/small/directional/south, +/obj/machinery/door_control/bolt_control/north{ id = "ext_eva_door2"; - pixel_y = 24; pixel_x = 8 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -1924,9 +1845,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/restoraunt2) "nn" = ( @@ -1955,21 +1874,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "nx" = ( /obj/structure/table/reinforced/brass, /obj/item/flashlight/lamp/bananalamp, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/south{ id = "gstroom1"; - pixel_y = -24; pixel_x = 8 }, /turf/simulated/floor/wood, @@ -2158,9 +2071,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "oL" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/item/holder/mouse{ name = "Nicolas" }, @@ -2236,10 +2147,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "ps" = ( @@ -2267,7 +2175,7 @@ }, /area/ruin/space/spacehotelv1/guestroom5) "py" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -2360,9 +2268,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/guestroom1) "ql" = ( @@ -2464,12 +2370,8 @@ /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/restoraunt3) "qU" = ( -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/north{ id = "gstroom4"; - pixel_y = 24; pixel_x = -8 }, /turf/simulated/floor/carpet/red, @@ -2634,10 +2536,9 @@ dir = 2; id_tag = "hotel_cargo2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "hotel_cargo2"; - name = "Storage Doors"; - pixel_x = 24 + name = "Storage Doors" }, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/cargostorage) @@ -2653,11 +2554,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "rX" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/restoraunt1) @@ -2693,7 +2590,7 @@ /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/restoraunt3) "sH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/ruin/space/spacehotelv1/restoraunt1) "sM" = ( @@ -2880,10 +2777,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "tR" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/mounted/mirror{ pixel_x = -32 }, @@ -2915,7 +2809,7 @@ dir = 6 }, /obj/machinery/economy/vending/snack/free, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "tZ" = ( @@ -3110,10 +3004,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "vB" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/item/mounted/mirror{ pixel_x = 32 }, @@ -3178,11 +3069,8 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/reception) "vV" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/obj/machinery/light/small, +/obj/structure/sink/directional/east, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -3453,11 +3341,7 @@ /area/ruin/space/spacehotelv1/centralhallway) "xt" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -3646,11 +3530,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "yN" = ( -/obj/machinery/door_control{ - pixel_y = -24; - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/south{ id = "ext_shuttle_door"; pixel_x = 8 }, @@ -3759,12 +3639,8 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/south{ id = "gstroom3"; - pixel_y = -24; pixel_x = 8 }, /turf/simulated/floor/wood, @@ -3777,9 +3653,7 @@ pixel_y = 3; pixel_x = 3 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "sepia" }, @@ -3837,9 +3711,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "zN" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/conveyor_switch/oneway{ id = "hotelsdisposal" }, @@ -3852,9 +3724,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "zU" = ( @@ -4051,9 +3921,7 @@ /area/ruin/space/spacehotelv1/bar) "Bj" = ( /obj/structure/coatrack, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/blue, /area/ruin/space/spacehotelv1/guestroom3) "Bn" = ( @@ -4077,9 +3945,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "By" = ( @@ -4138,9 +4004,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "BW" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/restoraunt3) "BY" = ( @@ -4167,7 +4031,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/restoraunt2) "Ck" = ( @@ -4175,10 +4039,9 @@ dir = 8; id_tag = "hotel_cargo3" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "hotel_cargo3"; - name = "Storage Doors"; - pixel_y = -24 + name = "Storage Doors" }, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/cargostorage) @@ -4196,9 +4059,7 @@ /obj/structure/chair/comfy/beige{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/ruin/space/spacehotelv1/centralhallway) "Cq" = ( @@ -4259,9 +4120,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "CO" = ( @@ -4288,7 +4147,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/guestroom1) "Dk" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) @@ -4380,10 +4239,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "DR" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/mounted/mirror{ pixel_x = -32 }, @@ -4501,11 +4357,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -4537,9 +4389,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/ruin/space/spacehotelv1/reception) "Fb" = ( @@ -4563,9 +4413,7 @@ /turf/template_noop, /area/space/nearstation) "Fh" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet, /area/ruin/space/spacehotelv1/restoraunt1) "Fi" = ( @@ -4644,27 +4492,21 @@ /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/guestroom6) "Fx" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "Fy" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/ruin/space/spacehotelv1/guestroom2) "Fz" = ( /obj/structure/closet/firecloset, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "FD" = ( @@ -4684,13 +4526,8 @@ /turf/simulated/floor/carpet/arcade, /area/ruin/space/spacehotelv1/guestroom2) "FN" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue"; dir = 1 @@ -4724,9 +4561,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/spawner/random_spawners/dirt_often, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, @@ -4770,9 +4605,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "Gf" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/dye_generator, /turf/simulated/floor/plasteel{ icon_state = "cmo" @@ -4830,9 +4663,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -4906,14 +4737,8 @@ /turf/simulated/floor/carpet/blue, /area/ruin/space/spacehotelv1/guestroom3) "GV" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/structure/sink/directional/west, +/obj/machinery/firealarm/directional/north, /obj/item/mounted/mirror{ pixel_x = 32 }, @@ -4943,11 +4768,7 @@ }, /area/ruin/space/spacehotelv1/entryhallway) "Hj" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -5002,9 +4823,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -5078,14 +4897,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Iv" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -5095,17 +4912,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "IB" = ( /obj/structure/rack, /obj/random/tool, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -5133,9 +4946,7 @@ dir = 9 }, /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "IT" = ( @@ -5299,9 +5110,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/ruin/space/spacehotelv1/centralhallway) "Ka" = ( @@ -5364,9 +5173,7 @@ }, /area/space/nearstation) "KC" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5377,7 +5184,7 @@ dir = 4 }, /obj/item/paicard, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/cyan, /area/ruin/space/spacehotelv1/guestroom5) "KF" = ( @@ -5391,7 +5198,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/spacehotelv1/tcomms) "KG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/chair/wood{ dir = 8 }, @@ -5507,18 +5314,12 @@ dir = 5 }, /obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "Lr" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "Ls" = ( @@ -5537,9 +5338,7 @@ /area/ruin/space/spacehotelv1/reception) "Lw" = ( /obj/structure/closet/firecloset, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Ly" = ( @@ -5558,9 +5357,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/restoraunt1) "LI" = ( @@ -5588,11 +5385,7 @@ /obj/structure/railing/cap{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/restoraunt3) "LU" = ( @@ -5693,9 +5486,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "ME" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/sign/poster/random{ pixel_x = 32 }, @@ -5748,10 +5539,7 @@ }, /area/ruin/space/spacehotelv1/bar) "Nb" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/mounted/mirror{ pixel_x = -32 }, @@ -5765,9 +5553,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Ne" = ( @@ -5968,10 +5754,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/restoraunt1) "Ox" = ( @@ -5993,9 +5776,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/spacecleanertank/west, /turf/simulated/floor/plasteel/dark, /area/ruin/space/spacehotelv1/janitor) "OF" = ( @@ -6162,7 +5943,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Px" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/restoraunt3) "PD" = ( @@ -6181,9 +5962,7 @@ /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/restoraunt2) "PL" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -6194,11 +5973,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24; - name = "south bump" - }, +/obj/machinery/firealarm/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/restoraunt2) @@ -6295,7 +6070,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/guestroom1) "QH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/restoraunt2) "QI" = ( @@ -6393,7 +6168,7 @@ /obj/structure/chair/sofa/left{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/red, /area/ruin/space/spacehotelv1/guestroom4) "RL" = ( @@ -6402,9 +6177,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "RP" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -6412,22 +6185,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "RS" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/mounted/mirror{ pixel_x = -32 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -6551,7 +6317,7 @@ dir = 8 }, /obj/item/clothing/glasses/sunglasses, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/royalblack, /area/ruin/space/spacehotelv1/guestroom6) "SY" = ( @@ -6569,9 +6335,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Tl" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6580,9 +6344,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) @@ -6633,9 +6395,7 @@ /area/ruin/space/spacehotelv1/forehallway) "TH" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet, /area/ruin/space/spacehotelv1/restoraunt1) "TL" = ( @@ -6687,9 +6447,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "TT" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -6710,24 +6468,17 @@ /turf/simulated/floor/carpet, /area/ruin/space/spacehotelv1/restoraunt1) "Uc" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/kitchen/east, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "Ud" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/east{ id = "ext_eva_door"; - pixel_x = 24; pixel_y = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -6815,7 +6566,7 @@ /obj/structure/chair/sofa/left{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/reception) "UP" = ( @@ -6908,7 +6659,7 @@ /area/ruin/space/spacehotelv1/restoraunt3) "Vr" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/sign/poster/random{ pixel_y = -32 }, @@ -6921,7 +6672,7 @@ }, /area/ruin/space/spacehotelv1/bar) "Vz" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6944,12 +6695,8 @@ /turf/simulated/floor/carpet/black, /area/ruin/space/spacehotelv1/restoraunt2) "VI" = ( -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/south{ id = "gstroom2"; - pixel_y = -24; pixel_x = -8 }, /obj/structure/table/wood/fancy/black, @@ -7032,7 +6779,7 @@ dir = 10 }, /obj/structure/closet/crate/can, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/forehallway) "Wj" = ( @@ -7056,10 +6803,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/centralhallway) "Wq" = ( @@ -7076,8 +6820,7 @@ id_tag = "hotel_cargo" }, /obj/structure/fans/tiny, -/obj/machinery/door_control{ - pixel_x = 24; +/obj/machinery/door_control/shutter/east{ id = "hotel_cargo"; name = "Cargo Doors" }, @@ -7086,21 +6829,19 @@ }, /area/ruin/space/spacehotelv1/entryhallway) "Wu" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/ruin/space/spacehotelv1/bar) "Wv" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/ruin/space/spacehotelv1/restoraunt1) "Wx" = ( /obj/structure/closet/athletic_mixed, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/dark, /area/ruin/space/spacehotelv1/janitor) "Wy" = ( @@ -7129,10 +6870,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "WU" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/item/mounted/mirror{ pixel_x = 32 }, @@ -7171,12 +6909,8 @@ icon_state = "4-8" }, /obj/structure/dresser, -/obj/machinery/door_control{ - specialfunctions = 4; - normaldoorcontrol = 1; - name = "Door Bolt Control"; +/obj/machinery/door_control/bolt_control/north{ id = "gstroom6"; - pixel_y = 24; pixel_x = -8 }, /turf/simulated/floor/carpet/royalblack, @@ -7300,9 +7034,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Yq" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -7359,7 +7091,7 @@ /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/bar) "YG" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -7391,10 +7123,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ icon_state = "sepia" }, @@ -7410,7 +7139,7 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/ruin/space/spacehotelv1/bar) "Zf" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm index c03f5d751347..ff06e9d85e02 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm @@ -30,7 +30,7 @@ }, /area/ruin/space/powered) "d" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/ruin/space/powered) "f" = ( @@ -58,9 +58,7 @@ /turf/simulated/wall/r_wall, /area/ruin/space/powered) "j" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/transparent/glass/reinforced, /area/ruin/space/powered) "k" = ( @@ -98,7 +96,7 @@ /obj/machinery/door/window/reinforced/normal{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/sign/monkey_paint{ pixel_y = -32 }, @@ -155,9 +153,7 @@ }, /area/ruin/space/powered) "B" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/ruin/space/powered) "C" = ( @@ -191,19 +187,13 @@ }, /area/ruin/space/powered) "J" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/chair/stool/bar, /turf/simulated/floor/carpet/red, /area/ruin/space/powered) "K" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/machinery/light/small/directional/south, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/transparent/glass/reinforced, /area/ruin/space/powered) "L" = ( @@ -244,8 +234,7 @@ /area/ruin/space/powered) "T" = ( /obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /obj/item/ashtray/bronze, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm index b3ea2b4b17ad..8a909f84ace2 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm @@ -9,9 +9,8 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "bG" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, /obj/item/rack_parts, @@ -84,9 +83,8 @@ }, /area/ruin/space/powered) "id" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -116,7 +114,7 @@ }, /area/ruin/space/powered) "iG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/ruin/space/powered) "iO" = ( @@ -143,9 +141,8 @@ /area/ruin/space/unpowered/unpowered_structures) "lr" = ( /obj/effect/turf_decal/box, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/loot, @@ -154,8 +151,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "mk" = ( -/obj/machinery/door_control{ - pixel_y = 30; +/obj/machinery/door_control/shutter/north{ id = "scanegers_window" }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen{ @@ -170,9 +166,8 @@ }, /area/ruin/space/powered) "nz" = ( -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 2 +/obj/machinery/light_construct/directional/north{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/airless, @@ -206,9 +201,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "sa" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/mineral/plastitanium/red/nitrogen{ icon_state = "plastitanium" }, @@ -418,9 +411,7 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/ruin/space/powered) "Mp" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/ruin/space/powered) "Mq" = ( @@ -508,9 +499,8 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/light_construct{ - icon_state = "bulb-broken"; - dir = 1 +/obj/machinery/light_construct/directional/south{ + icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/airless{ diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm index 1f3d2b800486..bc80a00987be 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, /area/shuttle/abandoned) @@ -25,9 +23,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/passive_vent, /obj/structure/filingcabinet/chestdrawer/autopsy, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 }, @@ -160,9 +156,7 @@ }, /area/shuttle/abandoned) "cT" = ( -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/structure/table, /obj/item/trash/plate, /obj/item/reagent_containers/food/drinks/coffee{ @@ -171,9 +165,7 @@ pixel_y = 8; volume = 15 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -184,9 +176,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/item/hemostat, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -276,9 +266,7 @@ /area/shuttle/abandoned) "gc" = ( /obj/structure/coatrack, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluefull" @@ -345,9 +333,7 @@ }, /area/shuttle/abandoned) "gL" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -457,16 +443,14 @@ }, /area/shuttle/abandoned) "iO" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "whiteshipinnershutters"; name = "Medical Ship Inner Shutters Control"; - pixel_x = 26; pixel_y = -2 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "whiteshipbridgeshutters"; name = "Medical Ship Bridge Shutters Control"; - pixel_x = 26; pixel_y = 7 }, /obj/structure/chair/comfy/shuttle{ @@ -644,17 +628,11 @@ desc = "This guy seemed to have died in terrible way! Half his remains are dust."; name = "gnawed bones" }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/door_control{ +/obj/machinery/light/small/directional/east, +/obj/machinery/door_control/bolt_control/west{ id = "whiteshipouterairlock1"; in_use = 1; - name = "Airlock Outer Bolts"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = -9; - specialfunctions = 4 + pixel_y = -9 }, /obj/item/clothing/suit/space/hardsuit/medical, /turf/simulated/floor/mineral/titanium, @@ -673,9 +651,7 @@ }, /area/shuttle/abandoned) "oH" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ dir = 4; @@ -697,17 +673,11 @@ pixel_x = 32 }, /obj/structure/fans/tiny, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/door_control{ +/obj/machinery/light/small/directional/east, +/obj/machinery/door_control/bolt_control/west{ id = "whiteshipouterairlock2"; in_use = 1; - name = "Airlock Outer Bolts"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = 8; - specialfunctions = 4 + pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, @@ -870,14 +840,10 @@ /obj/item/reagent_containers/spray/cleaner{ pixel_x = 5 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/south{ id = "whiteshipinnerairlock1"; in_use = 1; - name = "Airlock Inner Bolts"; - normaldoorcontrol = 1; - pixel_x = -8; - pixel_y = -24; - specialfunctions = 4 + pixel_x = -8 }, /obj/item/reagent_containers/syringe{ pixel_x = -1; @@ -968,7 +934,7 @@ /area/shuttle/abandoned) "wF" = ( /obj/structure/rack, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /obj/item/clothing/under/rank/medical/scrubs/green, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -997,9 +963,7 @@ scrub_N2O = 1; scrub_Toxins = 1 }, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; @@ -1030,11 +994,7 @@ }, /area/shuttle/abandoned) "xz" = ( -/obj/structure/sink{ - dir = 4; - layer = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -1098,14 +1058,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/north{ id = "whiteshipbridgeairlock"; in_use = 1; - name = "Bridge Airlock Bolts"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = 26; - specialfunctions = 4 + pixel_x = -24 }, /mob/living/simple_animal/hostile/undead/zombie/fast, /turf/simulated/floor/plasteel{ @@ -1201,13 +1157,10 @@ }, /obj/structure/curtain/open, /obj/machinery/atmospherics/unary/passive_vent, -/obj/machinery/light_construct/small{ - dir = 8 - }, -/obj/machinery/door_control{ +/obj/machinery/light_construct/small/east, +/obj/machinery/door_control/shutter/east{ id = "whiteshiproom1"; name = "Room 1 Shutters Control"; - pixel_x = 26; pixel_y = -2 }, /mob/living/simple_animal/hostile/undead/zombie/fast, @@ -1268,9 +1221,7 @@ "CR" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluefull" @@ -1286,7 +1237,7 @@ /area/shuttle/abandoned) "DH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluefull" @@ -1297,9 +1248,7 @@ /obj/item/mop, /obj/item/reagent_containers/glass/bucket, /obj/item/radio, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel{ dir = 8; @@ -1328,9 +1277,7 @@ "Fw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/wood, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluefull" @@ -1343,9 +1290,7 @@ pixel_y = 5 }, /obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluefull" @@ -1367,9 +1312,7 @@ "FZ" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/sign/lifestar{ pixel_x = -32 }, @@ -1426,13 +1369,10 @@ }, /obj/structure/curtain/open, /obj/machinery/atmospherics/unary/passive_vent, -/obj/machinery/light_construct/small{ - dir = 8 - }, -/obj/machinery/door_control{ +/obj/machinery/light_construct/small/east, +/obj/machinery/door_control/shutter/east{ id = "whiteshiproom2"; name = "Room 2 Shutters Control"; - pixel_x = 26; pixel_y = -2 }, /turf/simulated/floor/plasteel{ @@ -1490,14 +1430,10 @@ }, /area/shuttle/abandoned) "IG" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/south{ id = "whiteshipbackairlock1"; in_use = 1; - name = "Airlock Bolts"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = -24; - specialfunctions = 4 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -1521,9 +1457,7 @@ pixel_x = 8; pixel_y = -4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, @@ -1581,7 +1515,7 @@ /area/shuttle/abandoned) "KE" = ( /obj/machinery/iv_drip, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -1624,7 +1558,7 @@ /area/shuttle/abandoned) "Mx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/plating, /area/shuttle/abandoned) "Mz" = ( @@ -1649,14 +1583,10 @@ /obj/item/weldingtool{ maximum_fuel = 15 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/south{ id = "whiteshuttletoilet"; in_use = 1; - name = "Toilet Lock"; - normaldoorcontrol = 1; - pixel_x = -25; - pixel_y = -24; - specialfunctions = 4 + pixel_x = -25 }, /mob/living/simple_animal/hostile/undead/zombie, /turf/simulated/floor/plasteel{ @@ -1769,14 +1699,10 @@ pixel_x = 5; pixel_y = 30 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/north{ id = "whiteshipinnerairlock2"; in_use = 1; - name = "Airlock Inner Bolts"; - normaldoorcontrol = 1; - pixel_x = -8; - pixel_y = 24; - specialfunctions = 4 + pixel_x = -8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -1784,7 +1710,7 @@ }, /area/shuttle/abandoned) "PU" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 }, @@ -1915,9 +1841,7 @@ pixel_x = -6; pixel_y = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1961,7 +1885,7 @@ /obj/machinery/computer/operating{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, @@ -2044,14 +1968,10 @@ /area/shuttle/abandoned) "Ug" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/north{ id = "whiteshipbackairlock2"; in_use = 1; - name = "Airlock Bolts"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = 24; - specialfunctions = 4 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -2092,9 +2012,7 @@ }, /area/shuttle/abandoned) "Vj" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/item/clothing/gloves/color/red/insulated, /obj/structure/toilet{ dir = 4 @@ -2205,9 +2123,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; name = "standard air scrubber"; diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index 145af268a6b8..bdb001b2b2f3 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -108,9 +108,7 @@ }, /area/awaymission/BMPship/CommonArea) "ax" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /mob/living/simple_animal/hostile/poison/giant_spider/hunter{ health = 150; maxHealth = 150; @@ -135,15 +133,11 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Gate) "aC" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /turf/simulated/floor/engine/vacuum, /area/awaymission/BMPship/TurretsSouth) "aD" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /mob/living/simple_animal/hostile/poison/giant_spider, /obj/structure/spider/stickyweb, /turf/simulated/floor/plasteel{ @@ -174,9 +168,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Engines) "aG" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/structure/alien/weeds, /turf/simulated/floor/wood{ icon_state = "wood-broken3" @@ -348,7 +340,7 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/BMPship/Buffer) "br" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/south, /obj/structure/largecrate/goat, /turf/simulated/floor/plating, @@ -388,9 +380,7 @@ pixel_y = 24; pixel_x = 8 }, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/item/petcollar{ name = "Derpy" }, @@ -825,7 +815,7 @@ /area/awaymission/BMPship/TurretsSouth) "cH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/item/reagent_containers/food/snacks/meat, /obj/structure/spider/stickyweb, /obj/structure/spider/cocoon, @@ -834,9 +824,7 @@ "cI" = ( /obj/structure/table, /obj/item/storage/box, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) @@ -858,9 +846,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "cN" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/chem_master/condimaster, /obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/plasteel{ @@ -897,7 +883,7 @@ /area/awaymission/BMPship/CommonArea) "cR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) @@ -914,7 +900,7 @@ /turf/simulated/floor/vault, /area/awaymission/BMPship/Buffer) "cT" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "cU" = ( @@ -936,18 +922,14 @@ /obj/structure/sign/poster/contraband/energy_swords{ pixel_y = 32 }, -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /obj/structure/spider/stickyweb, /obj/structure/spider/stickyweb, /turf/simulated/floor/engine, /area/awaymission/BMPship/Armory) "cX" = ( /obj/machinery/gibber, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -1566,17 +1548,11 @@ /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Bath) "eI" = ( -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /turf/simulated/floor/engine/vacuum, /area/awaymission/BMPship/Buffer) "eJ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -1646,7 +1622,7 @@ /turf/simulated/floor/grass, /area/awaymission/BMPship/Kitchen) "eR" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellowalt" }, @@ -1717,9 +1693,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "fb" = ( -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/structure/alien/weeds, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -1791,9 +1765,7 @@ /obj/item/cigbutt/roach{ pixel_x = -12 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/spider/stickyweb, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -1852,13 +1824,8 @@ }, /area/awaymission/BMPship/CommonArea) "ft" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/structure/sink/directional/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber"; tag = "icon-barber" @@ -1903,9 +1870,7 @@ icon_state = "plant-dead"; tag = "plant-dead" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "fy" = ( @@ -1916,9 +1881,7 @@ pixel_y = 12; layer = 2.9 }, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plating, /area/awaymission/BMPship/Kitchen) "fz" = ( @@ -1987,7 +1950,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/spider/stickyweb, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/engine, /area/awaymission/BMPship/Armory) "fH" = ( @@ -2010,9 +1973,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "fK" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, /area/awaymission/BMPship/Engines) @@ -2028,7 +1989,7 @@ "fM" = ( /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/item/kirbyplants{ icon_state = "plant-dead"; tag = "plant-dead" @@ -2123,9 +2084,7 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/BMPship/Mining) "gc" = ( -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "gd" = ( @@ -2331,9 +2290,7 @@ "gH" = ( /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/item/kirbyplants{ icon_state = "plant-dead"; tag = "plant-dead" @@ -2416,11 +2373,10 @@ }, /area/awaymission/BMPship/Dormitories) "gV" = ( -/obj/machinery/door_control{ - id = "packerCargo"; - pixel_y = -24 +/obj/machinery/door_control/shutter/south{ + id = "packerCargo" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -2460,9 +2416,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) "hc" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/closet/cardboard{ opened = 1 }, @@ -2582,9 +2536,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "hB" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -2596,9 +2548,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Buffer) "hE" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen/empty, /turf/simulated/floor/plating/asteroid/airless, @@ -2617,9 +2567,7 @@ /turf/simulated/floor/grass, /area/awaymission/BMPship/Kitchen) "hJ" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) @@ -2634,9 +2582,7 @@ /area/awaymission/BMPship/Mining) "hM" = ( /obj/structure/ore_box, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) "hN" = ( @@ -2803,9 +2749,7 @@ /area/awaymission/BMPship/Dormitories) "in" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/grass, /area/awaymission/BMPship/Kitchen) "ir" = ( @@ -3078,7 +3022,7 @@ /area/awaymission/BMPship/CommonArea) "jq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "jr" = ( @@ -3090,10 +3034,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "js" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/structure/mopbucket, /obj/item/mop, /turf/simulated/floor/plasteel{ @@ -3169,9 +3110,7 @@ /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/structure/alien/weeds, /obj/item/reagent_containers/food/snacks/meat, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "jI" = ( @@ -3229,8 +3168,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "kr" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ brightness_range = 2 }, /obj/structure/alien/weeds, @@ -3355,9 +3293,7 @@ /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "lv" = ( -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/structure/alien/weeds, /obj/structure/alien/resin, /turf/simulated/floor/plating/airless, @@ -3417,9 +3353,7 @@ /obj/item/stock_parts/capacitor, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /turf/simulated/floor/plating, /area/awaymission/BMPship/TurretsNorth) "lR" = ( @@ -3446,9 +3380,7 @@ /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/dirt, /obj/structure/spider/stickyweb, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /turf/simulated/floor/engine, /area/awaymission/BMPship/Armory) "lW" = ( @@ -3460,19 +3392,16 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "mb" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/spider/stickyweb, /turf/simulated/floor/wood/fancy, /area/awaymission/BMPship/CommonArea) "mc" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "packerToilet"; - pixel_x = -24; name = "remote door-control packerToilet" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/toilet/material/gold{ dir = 1 }, @@ -3485,7 +3414,7 @@ /area/awaymission/BMPship/Bath) "mh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/engine, /area/awaymission/BMPship/Armory) "mi" = ( @@ -3511,9 +3440,7 @@ icon_state = "plant-dead"; tag = "plant-dead" }, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/structure/spider/stickyweb, /obj/structure/spider/stickyweb, /turf/simulated/floor/mineral/plastitanium/red, @@ -3549,7 +3476,7 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/BMPship/CommonArea) "mY" = ( -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/structure/cable{ icon_state = "1-2" }, @@ -3622,12 +3549,12 @@ /area/space/nearstation) "nO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/item/kirbyplants{ icon_state = "plant-dead"; tag = "plant-dead" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "nQ" = ( @@ -3872,7 +3799,7 @@ /turf/simulated/wall/mineral/titanium/nodiagonal, /area/awaymission/BMPship/CommonArea) "pt" = ( -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /mob/living/simple_animal/cockroach, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) @@ -3963,13 +3890,11 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "pW" = ( -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "pZ" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/spider/stickyweb, /obj/structure/sign/radiation/rad_area{ pixel_x = 32 @@ -3990,9 +3915,7 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/BMPship/CommonArea) "ql" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "qp" = ( @@ -4144,9 +4067,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/item/clothing/suit/soldiercoat, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Bath) @@ -4272,9 +4193,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Bath) "tb" = ( @@ -4332,9 +4251,7 @@ /area/awaymission/BMPship/Kitchen) "tE" = ( /obj/effect/landmark/damageturf, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "tF" = ( @@ -4538,10 +4455,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/awaymission/BMPship/TraderShuttle) "vy" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -4607,7 +4521,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "wd" = ( -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/blood/oil, /obj/effect/landmark/damageturf, @@ -4616,8 +4530,7 @@ "wg" = ( /obj/structure/alien/weeds, /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/door_control{ - pixel_y = 24; +/obj/machinery/door_control/shutter/north{ id = "packerCaptain" }, /turf/simulated/floor/plating/airless, @@ -4684,9 +4597,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "wH" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -4750,9 +4661,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "xg" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/closet/critter{ opened = 1 }, @@ -4879,9 +4788,7 @@ "yu" = ( /obj/item/reagent_containers/food/snacks/meat, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /mob/living/simple_animal/hostile/poison/giant_spider/hunter{ health = 150; maxHealth = 150; @@ -5148,9 +5055,7 @@ "AZ" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/effect/mob_spawn/human/corpse/damaged, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) @@ -5404,10 +5309,7 @@ }, /area/awaymission/BMPship/Kitchen) "Dx" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 13 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 32 }, @@ -5621,9 +5523,7 @@ /turf/space, /area/space) "Fs" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/reagent_containers/food/pill/charcoal, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) @@ -6092,8 +5992,7 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Engines) "JL" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ brightness_range = 2 }, /turf/simulated/floor/engine, @@ -6259,9 +6158,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "Mf" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/awaymission/BMPship/TurretsSouth) "Mg" = ( @@ -6315,7 +6212,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "MT" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Bath) "MY" = ( @@ -6337,9 +6234,7 @@ /obj/item/storage/fancy/cigarettes, /obj/item/storage/fancy/cigarettes/dromedaryco, /obj/item/storage/box/matches, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/cable{ icon_state = "2-4" }, @@ -6451,9 +6346,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "OU" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/cable{ icon_state = "4-8" }, @@ -6542,9 +6435,7 @@ "PQ" = ( /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/effect/mob_spawn/human/corpse/tacticool, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) @@ -6703,8 +6594,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/TurretsNorth) "Rm" = ( -/obj/machinery/door_control{ - pixel_y = -24; +/obj/machinery/door_control/shutter/south{ id = "packerCaptain" }, /turf/simulated/floor/wood, @@ -6788,9 +6678,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Engines) "Sy" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/structure/alien/weeds, /turf/simulated/floor/wood, /area/awaymission/BMPship/Armory) @@ -6856,9 +6744,7 @@ /obj/item/stock_parts/capacitor, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /turf/simulated/floor/plating, /area/awaymission/BMPship/TurretsNorth) "TI" = ( @@ -6956,9 +6842,7 @@ /area/awaymission/BMPship/CommonArea) "UH" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Engines) "UI" = ( @@ -7105,14 +6989,9 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "Wc" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green"; @@ -7253,7 +7132,7 @@ "XP" = ( /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/item/kirbyplants{ icon_state = "plant-dead"; tag = "plant-dead" @@ -7305,7 +7184,7 @@ /area/awaymission/BMPship/Kitchen) "Yh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/item/reagent_containers/food/snacks/meat, /obj/structure/spider/stickyweb, /obj/structure/spider/cocoon, @@ -7337,15 +7216,11 @@ /area/awaymission/BMPship/Containment) "Yz" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "YA" = ( -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /obj/effect/decal/warning_stripes/west, /obj/structure/closet/walllocker/firelocker/west, /turf/simulated/floor/plating, @@ -7383,7 +7258,7 @@ icon_state = "plant-dead"; tag = "plant-dead" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "YX" = ( diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index 84076ebca0ff..a04f66011b02 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -50,7 +50,7 @@ }, /area/awaymission/jungle_planet/outside) "adt" = ( -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -149,8 +149,7 @@ /area/awaymission/jungle_planet/outside) "aiM" = ( /obj/effect/turf_decal/delivery/white, -/obj/machinery/door_control{ - pixel_y = 28; +/obj/machinery/door_control/shutter/north{ id = "Main in"; req_access = list(271) }, @@ -246,8 +245,7 @@ pixel_y = -9 }, /obj/item/clothing/accessory/stethoscope, -/obj/machinery/door_control{ - pixel_x = -27; +/obj/machinery/door_control/shutter/west{ id = "CMDgate"; req_access = list(271) }, @@ -444,8 +442,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/light{ - dir = 8; +/obj/machinery/light/directional/east{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -640,9 +637,7 @@ /turf/simulated/wall/mineral/wood, /area/awaymission/jungle_planet/outside/cave) "aUN" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "aVe" = ( @@ -711,8 +706,7 @@ }, /area/awaymission/jungle_planet/inside) "baN" = ( -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ no_emergency = 1 }, /turf/simulated/floor/plasteel{ @@ -1198,7 +1192,7 @@ /obj/item/clothing/glasses/sunglasses{ pixel_y = 11 }, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -1210,8 +1204,7 @@ }, /area/awaymission/jungle_planet/outside/cave) "bxc" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ no_emergency = 1 }, /turf/simulated/floor/wood, @@ -1440,9 +1433,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/jungle_planet/outside/abandoned) "bND" = ( @@ -1626,7 +1617,7 @@ /turf/simulated/floor/wood, /area/awaymission/jungle_planet/inside/complex) "cbj" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; @@ -1849,10 +1840,9 @@ name = "second hangar"; req_access = list(271) }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "Cargo out"; - req_access = list(271); - pixel_y = 28 + req_access = list(271) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1902,7 +1892,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "crR" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -1996,8 +1986,7 @@ desc = "A portable generator for emergency backup power."; name = "P.A.C.M.A.N.-type portable generator" }, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ no_emergency = 1 }, /obj/structure/cable, @@ -2428,9 +2417,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 20 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /turf/simulated/floor/mineral/titanium/blue, /area/awaymission/jungle_planet/outside/abandoned) "cYa" = ( @@ -2568,8 +2555,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "dkt" = ( -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_maybe, @@ -3073,8 +3059,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "dVT" = ( -/obj/machinery/door_control{ - pixel_y = 28; +/obj/machinery/door_control/shutter/north{ name = "Armory Shutters-control"; id = "Arm in"; req_access = list(271) @@ -3087,9 +3072,7 @@ /area/awaymission/jungle_planet/inside/complex) "dWp" = ( /obj/effect/turf_decal/delivery/white, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "dWC" = ( @@ -3118,9 +3101,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "dXw" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -3203,10 +3184,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "ebS" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -3229,9 +3207,7 @@ desc = "Its cold like the space outside noo!"; list_reagents = list("coffee" = 0) }, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgrey" @@ -3257,7 +3233,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "efM" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -3548,7 +3524,7 @@ /area/awaymission/jungle_planet/inside/complex) "evE" = ( /obj/structure/toilet/material/gold, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ layer = 2.9; id = "gatelizard_piratcaptain"; name = "hidden button" @@ -3620,9 +3596,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "eAh" = ( -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -3778,9 +3752,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/jungle_planet/outside/abandoned) "eKg" = ( @@ -3906,8 +3878,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "eRi" = ( -/obj/machinery/door_control{ - pixel_x = 25; +/obj/machinery/door_control/shutter/east{ id = "Right in"; req_access = list(271) }, @@ -4106,9 +4077,7 @@ /obj/structure/flora/junglebush{ anchored = 1 }, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/structure/spider/stickyweb, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/abandoned) @@ -4587,9 +4556,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 8; @@ -4873,8 +4840,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "gfM" = ( -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ no_emergency = 1 }, /turf/simulated/floor/wood{ @@ -5105,9 +5071,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "gys" = ( -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -5730,10 +5694,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "hlm" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ icon_state = "mirror_broke"; pixel_x = 28 @@ -6219,8 +6180,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "hNN" = ( -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ no_emergency = 1 }, /obj/effect/decal/cleanable/cobweb2, @@ -6259,12 +6219,8 @@ /obj/item/clipboard, /obj/item/pen, /obj/item/newspaper, -/obj/machinery/light_construct{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, +/obj/machinery/light_construct/directional/west, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, /turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/jungle_planet/outside/abandoned) "hPE" = ( @@ -6310,9 +6266,7 @@ /obj/item/folder/red, /obj/item/pen, /obj/item/radio, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -6442,9 +6396,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -6460,9 +6412,7 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_often, /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ @@ -6729,8 +6679,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/crowbar/large, /obj/item/storage/box/lights/mixed, -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ no_emergency = 1 }, /turf/simulated/floor/plasteel{ @@ -6785,9 +6734,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "itu" = ( -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "itw" = ( @@ -7200,7 +7147,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "rampbottom" @@ -7614,9 +7561,7 @@ /area/awaymission/jungle_planet/outside/river) "jrP" = ( /obj/item/stock_parts/capacitor, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jrS" = ( @@ -7847,8 +7792,7 @@ pixel_x = -9; pixel_y = 11 }, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_frequent, @@ -7886,10 +7830,9 @@ /area/awaymission/jungle_planet/inside/complex) "jFM" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "Cargo in"; - req_access = list(271); - pixel_y = -32 + req_access = list(271) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -8004,9 +7947,7 @@ /obj/item/kitchen/utensil/fork{ pixel_x = 7 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/wood, /area/awaymission/jungle_planet/inside/complex) @@ -8047,9 +7988,7 @@ /area/awaymission/jungle_planet/inside/complex) "jOD" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel{ icon_state = "purplefull" }, @@ -8095,8 +8034,7 @@ icon_state = "tracks"; dir = 4 }, -/obj/machinery/door_control{ - pixel_y = -26; +/obj/machinery/door_control/shutter/south{ id = "Sec in"; name = "Security Shutters-control"; req_access = list(271) @@ -8217,9 +8155,7 @@ }, /area/awaymission/jungle_planet/outside/waterfall) "kba" = ( -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -8332,9 +8268,7 @@ "kjd" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/largecrate/chick, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "kjn" = ( @@ -8567,8 +8501,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "kwl" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -8581,9 +8514,7 @@ /turf/simulated/floor/wood, /area/awaymission/jungle_planet/inside/complex) "kwU" = ( -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -8617,9 +8548,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /turf/simulated/floor/wood, /area/awaymission/jungle_planet/inside/complex) "kzn" = ( @@ -8804,9 +8733,7 @@ /obj/structure/bed{ dir = 4 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -8902,10 +8829,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "kRO" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/effect/spawner/random_spawners/blood_often, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -9922,9 +9846,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "maV" = ( -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/awaymission/jungle_planet/outside/abandoned) "mbt" = ( @@ -10574,9 +10496,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgrey" @@ -10659,8 +10579,7 @@ pixel_x = 9; pixel_y = -9 }, -/obj/machinery/light{ - dir = 8; +/obj/machinery/light/directional/east{ no_emergency = 1 }, /turf/simulated/floor/plasteel{ @@ -10841,9 +10760,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, /obj/item/stack/sheet/metal/fifty, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/mineral/titanium/blue, /area/awaymission/jungle_planet/outside/abandoned) "mTI" = ( @@ -10863,9 +10780,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "mUM" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/wall/indestructible/riveted, /area/awaymission/jungle_planet/inside/complex) "mUR" = ( @@ -10880,7 +10795,7 @@ "mVg" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgrey" @@ -10903,26 +10818,23 @@ /area/awaymission/jungle_planet/outside/cave/small) "mWX" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = 8; id = "Command"; name = "command shsutters control"; req_access = list(271) }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = -8; name = "shutters control"; id = "Hang in"; req_access = list(271) }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control{ pixel_y = 8; in_use = 1; desiredstate_open = 1; - normaldoorcontrol = 1; - specialfunctions = 4; - id = "commanddoor"; - name = "door bolts control" + id = "commanddoor" }, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -11065,9 +10977,7 @@ /obj/structure/chair/sofa/right{ dir = 8 }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/wood{ icon_state = "wood-broken2" @@ -11188,8 +11098,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "nou" = ( -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ no_emergency = 1 }, /turf/simulated/floor/wood, @@ -11301,8 +11210,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light{ - dir = 8; +/obj/machinery/light/directional/east{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -11621,7 +11529,7 @@ }, /area/awaymission/jungle_planet/outside/river) "nSR" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/wood, /area/awaymission/jungle_planet/inside/complex) @@ -11714,9 +11622,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "nZd" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) @@ -11757,9 +11663,7 @@ /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/inside) "obG" = ( -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_frequent, /obj/effect/decal/cleanable/ants, /turf/simulated/floor/plasteel, @@ -11911,7 +11815,7 @@ icon_state = "tracks"; dir = 4 }, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "onB" = ( @@ -11988,8 +11892,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "oqo" = ( -/obj/machinery/light{ - dir = 8; +/obj/machinery/light/directional/east{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_frequent, @@ -12298,12 +12201,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/writing, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/structure/sign/poster/official/random/west, +/obj/machinery/light_construct/directional/east, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; @@ -12362,9 +12261,7 @@ "oKw" = ( /obj/effect/turf_decal/bot_red, /obj/structure/mecha_wreckage/ripley/firefighter, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "oKy" = ( @@ -12738,9 +12635,7 @@ "piJ" = ( /obj/structure/bed, /obj/item/bedsheet/red, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -12776,7 +12671,7 @@ "pjP" = ( /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c500, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -13096,9 +12991,7 @@ /obj/structure/closet{ opened = 1 }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -13338,8 +13231,7 @@ /obj/structure/sign/radiation{ pixel_y = 65 }, -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ no_emergency = 1 }, /obj/machinery/atmospherics/portable/pump, @@ -13511,8 +13403,7 @@ "qlE" = ( /obj/effect/spawner/random_spawners/blood_often, /obj/effect/decal/remains/human, -/obj/machinery/light{ - dir = 8; +/obj/machinery/light/directional/east{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_maybe, @@ -13525,9 +13416,7 @@ /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = 32 }, -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "qmr" = ( @@ -14015,8 +13904,7 @@ /area/awaymission/jungle_planet/outside/river) "qPA" = ( /obj/machinery/kitchen_machine/oven, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ no_emergency = 1 }, /turf/simulated/floor/plasteel{ @@ -14181,10 +14069,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "rbk" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -14814,8 +14699,7 @@ /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/jungle_planet/outside) "rNJ" = ( -/obj/machinery/door_control{ - pixel_y = -25; +/obj/machinery/door_control/shutter/south{ id = "Main in"; req_access = list(271); requires_power = 0 @@ -15254,7 +15138,7 @@ "snP" = ( /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/south, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkgrey" @@ -15271,8 +15155,7 @@ /area/awaymission/jungle_planet/outside/cave) "soK" = ( /obj/effect/decal/cleanable/generic, -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -15371,15 +15254,11 @@ /area/awaymission/jungle_planet/inside/complex) "srT" = ( /obj/effect/turf_decal/delivery/white, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ssu" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 2; @@ -15750,8 +15629,7 @@ /area/awaymission/jungle_planet/inside/complex) "sQH" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/door_control{ - pixel_y = -32; +/obj/machinery/door_control/shutter/south{ id = "Cargo in"; req_access = list(271) }, @@ -15875,9 +15753,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "sWi" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/cobweb2, /obj/item/rack_parts, /turf/simulated/floor/plating, @@ -16348,9 +16224,7 @@ }, /area/awaymission/jungle_planet/inside) "tAY" = ( -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -16805,7 +16679,7 @@ icon_state = "4-8" }, /obj/effect/spawner/random_spawners/blood_often, -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "uca" = ( @@ -16968,8 +16842,7 @@ }, /obj/item/coin/diamond, /obj/item/coin/silver, -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ no_emergency = 1 }, /obj/item/coin/diamond, @@ -16998,8 +16871,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/abandoned) "umH" = ( -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ no_emergency = 1 }, /turf/simulated/floor/plating/asteroid/ancient{ @@ -17483,7 +17355,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "uND" = ( -/obj/machinery/light_construct, +/obj/machinery/light_construct/directional/north, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; @@ -17645,9 +17517,7 @@ /area/awaymission/jungle_planet/inside/complex) "val" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /obj/random/tool, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating, @@ -17733,16 +17603,13 @@ /obj/item/folder/yellow{ pixel_x = -5 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control{ pixel_x = 8; desiredstate_open = 1; in_use = 1; - normaldoorcontrol = 1; - specialfunctions = 4; - id = "hang2in"; - name = "door bolts control" + id = "hang2in" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ pixel_x = 8; pixel_y = 8; id = "gate_lizard_QM" @@ -17862,9 +17729,7 @@ /obj/effect/decal/remains/human, /obj/item/ammo_casing/caseless/arrow, /obj/effect/spawner/random_spawners/blood_often, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -18398,8 +18263,7 @@ }, /area/awaymission/jungle_planet/outside/river) "vNE" = ( -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ no_emergency = 1 }, /obj/effect/spawner/random_spawners/dirt_often, @@ -18532,9 +18396,7 @@ /obj/item/scalpel{ pixel_y = -1 }, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /obj/effect/spawner/random_spawners/dirt_maybe, /obj/effect/turf_decal/grass{ icon_state = "grass_edge_medium"; @@ -18996,9 +18858,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "wEF" = ( -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "wEK" = ( @@ -19280,9 +19140,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /mob/living/simple_animal/hostile/poison_snake{ wander = 0 }, @@ -19532,8 +19390,7 @@ /obj/item/ammo_casing/caseless/arrow, /obj/effect/spawner/random_spawners/blood_often, /obj/effect/spawner/random_spawners/dirt_often, -/obj/machinery/door_control{ - pixel_y = -28; +/obj/machinery/door_control/shutter/south{ name = "Armory Shutters-control"; id = "Arm in"; req_access = list(271) @@ -19744,8 +19601,7 @@ /area/awaymission/jungle_planet/outside/cave) "xyX" = ( /obj/effect/decal/cleanable/blood/writing, -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ no_emergency = 1 }, /turf/simulated/floor/plating, diff --git a/_maps/map_files220/RandomZLevels/terrorspiders.dmm b/_maps/map_files220/RandomZLevels/terrorspiders.dmm index 02d9176c62ae..51f95ae992d8 100644 --- a/_maps/map_files220/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files220/RandomZLevels/terrorspiders.dmm @@ -29,9 +29,7 @@ locked = 0; pixel_x = -23 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/landmark/burnturf, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -124,9 +122,7 @@ }, /area/awaymission/UO71/plaza) "aw" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "ax" = ( @@ -172,9 +168,7 @@ }, /area/awaymission/UO71/plaza) "aD" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "aE" = ( @@ -184,9 +178,7 @@ pixel_x = 30 }, /obj/item/gun/energy/laser/retro, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "aF" = ( @@ -265,17 +257,13 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "aQ" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/awaymission/UO71/plaza) "aR" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -352,7 +340,7 @@ }, /area/awaymission/UO71/plaza) "bc" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/alarm/monitor{ dir = 1; locked = 0; @@ -387,15 +375,11 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "bg" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/table/wood, /obj/machinery/newscaster{ pixel_x = 30 @@ -480,9 +464,7 @@ /obj/structure/toilet{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -491,9 +473,7 @@ /obj/structure/toilet{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -703,9 +683,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cg" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/alarm/monitor{ locked = 0; pixel_y = 23 @@ -735,9 +713,7 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "cl" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/alarm/monitor{ locked = 0; pixel_y = 23 @@ -792,12 +768,8 @@ /obj/structure/chair/wood{ dir = 1 }, -/obj/machinery/door_control{ - id = "awaydorm2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/south{ + id = "awaydorm2" }, /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -828,12 +800,8 @@ dir = 1; on = 1 }, -/obj/machinery/door_control{ - id = "awaydorm1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/south{ + id = "awaydorm1" }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) @@ -977,9 +945,7 @@ layer = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "greencorner" }, @@ -1063,9 +1029,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -1107,9 +1071,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -1150,9 +1112,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -1165,9 +1125,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -1197,9 +1155,7 @@ /area/awaymission/UO71/centralhall) "dv" = ( /obj/structure/chair, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, +/obj/structure/reagent_dispensers/peppertank/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -1743,9 +1699,7 @@ locked = 0; pixel_x = 23 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -1852,12 +1806,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door_control{ - id = "awaydorm3"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/north{ + id = "awaydorm3" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -1945,7 +1895,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "fl" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/alarm/monitor{ dir = 1; locked = 0; @@ -2026,9 +1976,7 @@ }, /area/awaymission/UO71/centralhall) "fw" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -2059,9 +2007,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "fA" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -2229,9 +2175,7 @@ /turf/simulated/wall, /area/awaymission/UO71/centralhall) "fY" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -2425,9 +2369,7 @@ }, /area/awaymission/UO71/science) "gB" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 @@ -2457,9 +2399,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "gD" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -2490,9 +2430,7 @@ /area/awaymission/UO71/centralhall) "gH" = ( /obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -2635,9 +2573,7 @@ /area/awaymission/UO71/gateway) "gY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/awaymission/UO71/gateway) @@ -3024,9 +2960,7 @@ /area/awaymission/UO71/centralhall) "hR" = ( /obj/machinery/processor, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -3040,9 +2974,7 @@ }, /area/awaymission/UO71/gateway) "hT" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/window/reinforced, /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ @@ -3100,7 +3032,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) "if" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/vault, /area/awaymission/UO71/prince) "ig" = ( @@ -3325,9 +3257,7 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -3346,9 +3276,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "iT" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/alarm/monitor{ dir = 4; locked = 0; @@ -3359,12 +3287,8 @@ }, /area/awaymission/UO71/centralhall) "iU" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -3425,9 +3349,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) "ja" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ pixel_x = -32 @@ -3504,9 +3426,7 @@ on = 1; welded = 1 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/landmark/burnturf, /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) @@ -3631,9 +3551,7 @@ }, /area/awaymission/UO71/science) "jE" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -3783,9 +3701,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -3935,9 +3851,7 @@ }, /area/awaymission/UO71/science) "kp" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -3963,9 +3877,7 @@ "ks" = ( /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; on = 1 @@ -3990,9 +3902,7 @@ "ku" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "kv" = ( @@ -4153,9 +4063,7 @@ }, /area/awaymission/UO71/science) "kM" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4181,9 +4089,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; heat_capacity = 1e+006; @@ -4220,9 +4126,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4264,9 +4168,7 @@ locked = 0; pixel_y = 23 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4343,7 +4245,7 @@ /area/awaymission/UO71/science) "lh" = ( /obj/structure/closet/firecloset, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ @@ -4407,7 +4309,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "lo" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "lp" = ( @@ -4838,9 +4740,7 @@ }, /area/awaymission/UO71/centralhall) "mc" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -4899,9 +4799,7 @@ "mk" = ( /obj/structure/table, /obj/item/folder/white, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "warndark" @@ -4998,9 +4896,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "mz" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Engineering Secure Storage"; network = list("UO71") @@ -5032,9 +4928,7 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "mD" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/alarm/monitor{ locked = 0; pixel_y = 23 @@ -5062,9 +4956,7 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "mG" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/alarm/monitor{ locked = 0; pixel_y = 23 @@ -5105,12 +4997,11 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch for secure storage."; id = "UO71_Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 6; - pixel_y = -24; req_access = list(271) }, /turf/simulated/floor/plating, @@ -5173,7 +5064,7 @@ pixel_y = -24; start_charge = 100 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/rack{ dir = 8; layer = 2.9 @@ -5198,9 +5089,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) "mT" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -5339,12 +5228,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber{ on = 1 }, -/obj/machinery/door_control{ - id = "awaydorm5"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/south{ + id = "awaydorm5" }, /obj/structure/chair/wood{ dir = 1 @@ -5372,12 +5257,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "nm" = ( -/obj/machinery/door_control{ - id = "awaydorm7"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/south{ + id = "awaydorm7" }, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) @@ -5504,9 +5385,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "nC" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; heat_capacity = 1e+006; @@ -5725,9 +5604,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/engine, /area/awaymission/UO71/science) "nY" = ( @@ -5813,9 +5690,7 @@ locked = 0; pixel_x = -23 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/table, /obj/item/radio/off, /obj/item/laser_pointer, @@ -5853,9 +5728,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, @@ -5921,9 +5794,7 @@ }, /area/awaymission/UO71/science) "op" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/window/reinforced{ dir = 1 }, @@ -5949,9 +5820,7 @@ pixel_x = -23 }, /obj/item/radio/off, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/item/screwdriver, /turf/simulated/floor/plasteel{ dir = 8; @@ -5981,9 +5850,7 @@ }, /area/awaymission/UO71/centralhall) "ou" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm/monitor{ dir = 4; @@ -6066,9 +5933,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -6167,9 +6032,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -6191,9 +6054,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "oH" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -6514,7 +6375,7 @@ }, /area/awaymission/UO71/centralhall) "pq" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6541,9 +6402,7 @@ locked = 0; pixel_x = 23 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; @@ -6575,9 +6434,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -6618,9 +6475,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "pA" = ( @@ -6649,9 +6504,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -6716,9 +6569,7 @@ }, /area/awaymission/UO71/centralhall) "pK" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -6915,12 +6766,8 @@ dir = 1; on = 1 }, -/obj/machinery/door_control{ - id = "awaydorm4"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/west{ + id = "awaydorm4" }, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) @@ -6936,12 +6783,8 @@ dir = 1; on = 1 }, -/obj/machinery/door_control{ - id = "awaydorm6"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/east{ + id = "awaydorm6" }, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) @@ -6955,9 +6798,7 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "qp" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/toilet{ dir = 4 }, @@ -7020,10 +6861,7 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -7148,9 +6986,7 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "qM" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/alarm/monitor{ dir = 8; locked = 0; @@ -7167,16 +7003,12 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "qO" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/dresser, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "qP" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/alarm/monitor{ dir = 4; locked = 0; @@ -7187,10 +7019,7 @@ }, /area/awaymission/UO71/centralhall) "qQ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -7293,9 +7122,7 @@ }, /area/awaymission/UO71/eng) "ra" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/alarm/monitor/server{ dir = 4; pixel_x = -22 @@ -7325,9 +7152,7 @@ pixel_y = 24 }, /obj/item/multitool, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -7396,9 +7221,7 @@ }, /area/awaymission/UO71/science) "rk" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/chair/office/light, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -7420,9 +7243,7 @@ }, /area/awaymission/UO71/medical) "rp" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -7461,9 +7282,7 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "rw" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/toilet{ dir = 4 }, @@ -7484,10 +7303,7 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -7506,7 +7322,7 @@ dir = 5; initialize_directions = 5 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "rB" = ( @@ -7568,18 +7384,14 @@ /obj/structure/table, /obj/item/storage/box, /obj/item/storage/box, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, +/obj/structure/reagent_dispensers/peppertank/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" }, /area/awaymission/UO71/eng) "rJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/table, /obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 @@ -7677,9 +7489,7 @@ }, /obj/item/reagent_containers/food/pill/methamphetamine, /obj/item/storage/toolbox/syndicate, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, /area/awaymission/UO71/science) @@ -7779,9 +7589,7 @@ /area/awaymission/UO71/bridge) "sf" = ( /obj/structure/table, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) @@ -7805,9 +7613,7 @@ dir = 8; on = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) "sj" = ( @@ -8094,9 +7900,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "sE" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/portable/scrubber, /obj/effect/decal/warning_stripes/west, @@ -8169,9 +7973,7 @@ }, /area/awaymission/UO71/eng) "sM" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/engine{ name = "vacuum floor"; nitrogen = 0.01; @@ -8299,9 +8101,7 @@ }, /area/awaymission/UO71/centralhall) "sY" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -8348,7 +8148,7 @@ }, /area/awaymission/UO71/centralhall) "td" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -8594,9 +8394,7 @@ locked = 0; pixel_y = 23 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "tK" = ( @@ -8647,9 +8445,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; initialize_directions = 11 @@ -8709,11 +8505,10 @@ network = list("UO71"); dir = 1 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch for the security privacy shutters."; id = "UO71_EngineeringOffice"; name = "Privacy Shutters"; - pixel_x = -24; pixel_y = 6; req_access = list(271) }, @@ -8978,8 +8773,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/science) "ux" = ( -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ on = 1 }, /turf/simulated/floor/plasteel, @@ -9069,11 +8863,10 @@ dir = 1; on = 1 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ desc = "A remote control-switch for the engineering security doors."; id = "UO71_Engineering"; name = "Engineering Lockdown"; - pixel_x = 24; pixel_y = 6; req_access = list(271) }, @@ -9225,9 +9018,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "uY" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -9382,9 +9173,7 @@ /area/awaymission/UO71/medical) "vs" = ( /obj/machinery/optable, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, @@ -9468,7 +9257,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "vD" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) @@ -9527,9 +9316,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) "vK" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9634,7 +9421,7 @@ /area/awaymission/UO71/bridge) "vW" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Containment"; name = "Science Containment Doors"; @@ -9646,7 +9433,7 @@ /area/awaymission/UO71/bridge) "vX" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Queen"; name = "Terror Queen Containment Doors"; @@ -9658,7 +9445,7 @@ /area/awaymission/UO71/bridge) "vY" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Armory"; name = "Armory Doors"; @@ -9787,7 +9574,7 @@ /obj/machinery/atmospherics/air_sensor{ autolink_id = "UO71_n2_sensor" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/engine/n2, /area/awaymission/UO71/eng) "wm" = ( @@ -9798,7 +9585,7 @@ /obj/machinery/atmospherics/air_sensor{ autolink_id = "UO71_o2_sensor" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/engine/o2, /area/awaymission/UO71/eng) "wo" = ( @@ -10002,9 +9789,7 @@ dir = 4; network = list("UO71") }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -10021,9 +9806,7 @@ /obj/machinery/conveyor{ id = "UO71_mining" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/awaymission/UO71/mining) @@ -10080,7 +9863,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) "wV" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) "wW" = ( @@ -10097,9 +9880,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) "wY" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/chair/wood{ dir = 8 }, @@ -10220,12 +10001,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door_control{ - id = "awaydorm8"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/south{ + id = "awaydorm8" }, /turf/simulated/floor/carpet, /area/awaymission/UO71/mining) @@ -10379,11 +10156,8 @@ }, /area/awaymission/UO71/eng) "xE" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/machinery/light/small, +/obj/structure/sink/directional/west, +/obj/machinery/light/small/directional/north, /obj/structure/mirror{ pixel_x = 28 }, @@ -10409,12 +10183,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door_control{ - id = "awaydorm9"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/north{ + id = "awaydorm9" }, /turf/simulated/floor/carpet, /area/awaymission/UO71/mining) @@ -10477,9 +10247,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/alarm/monitor{ dir = 8; locked = 0; @@ -10491,7 +10259,7 @@ }, /area/awaymission/UO71/eng) "xO" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/bed, /obj/item/bedsheet, /turf/simulated/floor/carpet, @@ -10515,7 +10283,7 @@ pixel_y = -24; start_charge = 1 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10652,24 +10420,22 @@ }, /area/awaymission/UO71/eng) "yd" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/computer/atmos_alert{ dir = 1 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch for the engineering security doors."; id = "UO71_Engineering"; name = "Engineering Lockdown"; pixel_x = -6; - pixel_y = -24; req_access = list(271) }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch for secure storage."; id = "UO71_Secure Storage"; name = "Engineering Secure Storage"; pixel_x = 6; - pixel_y = -24; req_access = list(271) }, /turf/simulated/floor/plasteel{ @@ -10709,9 +10475,7 @@ name = "EXTERNAL AIRLOCK"; pixel_x = 32 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -10721,9 +10485,7 @@ /area/awaymission/UO71/mining) "yj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -10805,9 +10567,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/mining) "yw" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/table, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; @@ -10878,9 +10638,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) "yF" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) @@ -10959,9 +10717,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) "yP" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) @@ -11082,7 +10838,7 @@ /area/awaymission/UO71/queen) "zm" = ( /obj/structure/table, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) @@ -11124,9 +10880,7 @@ /obj/item/chameleon, /obj/item/reagent_containers/glass/bottle/traitor, /obj/item/borg/upgrade/syndicate, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/carpet, /area/awaymission/UO71/loot) "zx" = ( @@ -11154,9 +10908,7 @@ "zO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/item/borg/upgrade/vtec, /obj/item/stock_parts/cell/bluespace, /obj/item/paper/researchnotes, @@ -11192,15 +10944,11 @@ "zU" = ( /obj/structure/table/holotable/wood, /obj/item/reagent_containers/food/drinks/cans/beer, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/awaymission/UO71/queen) "zV" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/awaymission/UO71/queen) "zW" = ( @@ -11263,11 +11011,11 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/awaymission/UO71/queen) "Ah" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/awaymission/UO71/queen) "AW" = ( @@ -11285,9 +11033,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "CE" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "CI" = ( diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index bd0561e7813d..f7a2883f985c 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -14,10 +14,7 @@ /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) "ai" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) @@ -146,7 +143,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/wildwest/wildwest_refine) "bB" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /mob/living/simple_animal/hostile/syndicate/melee/autogib{ name = "Syndicate Operative" }, @@ -173,10 +170,7 @@ /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "bW" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -243,9 +237,7 @@ /area/awaymission/wildwest/wildwest_refine) "cC" = ( /obj/structure/chair/comfy/shuttle, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "cK" = ( @@ -264,9 +256,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "cN" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/carpet/green, /area/awaymission/wildwest/wildwest_mines) "cQ" = ( @@ -339,15 +329,12 @@ /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "dG" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "dI" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/carpet, @@ -395,7 +382,7 @@ pixel_x = 10; pixel_y = 14 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "ww_window"; pixel_x = -9 }, @@ -428,8 +415,7 @@ /turf/simulated/mineral/ancient, /area/awaymission/wildwest/wildwest_mines) "en" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor/carpet/purple, @@ -440,7 +426,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "et" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ icon_state = "bulb-broken" }, /turf/simulated/floor/plasteel{ @@ -483,11 +469,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "eP" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -579,8 +561,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /turf/simulated/floor, @@ -603,9 +584,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "fM" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating/asteroid{ icon_state = "asteroid5" }, @@ -617,9 +596,7 @@ /area/awaymission/wildwest/wildwest_mines) "fQ" = ( /obj/structure/table_frame, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellowfull" @@ -660,8 +637,7 @@ }, /area/awaymission/wildwest/wildwest_refine) "gq" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor/plating/asteroid, @@ -812,10 +788,7 @@ "hN" = ( /obj/structure/table, /obj/item/megaphone, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/item/reagent_containers/food/drinks/coffee, /obj/item/folder/yellow{ pixel_x = 2; @@ -876,15 +849,14 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/awaymission/wildwest/wildwest_refine) "iy" = ( -/obj/machinery/door_control{ - id = "ww_door_ext"; - pixel_y = 30 +/obj/machinery/door_control/shutter/north{ + id = "ww_door_ext" }, /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "iB" = ( /obj/structure/closet, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellowfull" @@ -897,9 +869,7 @@ /area/awaymission/wildwest/wildwest_refine) "iE" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "iG" = ( @@ -912,7 +882,7 @@ /area/awaymission/wildwest/wildwest_mines) "iJ" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "iL" = ( @@ -989,9 +959,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "jn" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "js" = ( @@ -1071,10 +1039,7 @@ /turf/simulated/floor/plating/ironsand, /area/awaymission/wildwest/wildwest_mines) "kf" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1112,8 +1077,7 @@ /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "kx" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/carpet/orange, @@ -1162,9 +1126,7 @@ /area/awaymission/wildwest/wildwest_mines) "kV" = ( /obj/effect/mine/dnascramble, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating/asteroid{ icon_state = "asteroid9" }, @@ -1183,9 +1145,7 @@ "lg" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/closet/cardboard, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1214,8 +1174,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "ln" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -1224,7 +1183,7 @@ /turf/simulated/floor/carpet/purple, /area/awaymission/wildwest/wildwest_mines) "lp" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ icon_state = "bulb-broken" }, /turf/simulated/floor/plating/asteroid{ @@ -1289,9 +1248,7 @@ }, /area/awaymission/wildwest/wildwest_refine) "lR" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet/green, /area/awaymission/wildwest/wildwest_mines) "lX" = ( @@ -1391,7 +1348,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "mW" = ( @@ -1400,9 +1357,7 @@ /area/awaymission/wildwest/wildwest_mines) "nf" = ( /mob/living/simple_animal/hostile/syndicate/ranged, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "nh" = ( @@ -1418,9 +1373,7 @@ icon_state = "syndicate" }, /obj/item/clothing/mask/balaclava, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "nn" = ( @@ -1478,9 +1431,7 @@ /turf/simulated/mineral/ancient, /area/awaymission/wildwest/wildwest_vault) "nL" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "nQ" = ( @@ -1569,7 +1520,7 @@ /obj/effect/decal/cleanable/blood/drip{ icon_state = "5" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "oC" = ( @@ -1579,7 +1530,7 @@ pixel_x = -5; pixel_y = 6 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "ww_pod"; pixel_x = 7; pixel_y = 8 @@ -1590,8 +1541,7 @@ }, /area/awaymission/wildwest/wildwest_refine) "oF" = ( -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, @@ -1680,9 +1630,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "pE" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "pF" = ( @@ -1702,16 +1650,14 @@ /obj/structure/chair/comfy/black{ dir = 8 }, -/obj/machinery/door_control{ - id = "ww_hang1"; - pixel_y = -27 +/obj/machinery/door_control/shutter/south{ + id = "ww_hang1" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "pL" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, @@ -1950,16 +1896,13 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "rU" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) @@ -2055,9 +1998,7 @@ /area/awaymission/wildwest/wildwest_refine) "sZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "th" = ( @@ -2103,8 +2044,7 @@ /area/awaymission/wildwest/wildwest_mines) "tB" = ( /obj/machinery/economy/vending/snack/free, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -2139,8 +2079,7 @@ /turf/simulated/floor/carpet/red, /area/awaymission/wildwest/wildwest_mines) "tX" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /mob/living/simple_animal/hostile/syndicate/melee, @@ -2192,9 +2131,7 @@ /area/awaymission/wildwest/wildwest_vault) "ur" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2337,14 +2274,11 @@ }, /area/awaymission/wildwest/wildwest_mines) "vG" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "vJ" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor/carpet/orange, @@ -2358,8 +2292,7 @@ /obj/effect/turf_decal/bot_white, /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -2385,9 +2318,7 @@ /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "wu" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "wz" = ( @@ -2468,38 +2399,28 @@ /obj/structure/table/wood, /obj/item/folder/blue, /obj/item/pen, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) "xd" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/awaymission/wildwest/wildwest_mines) "xf" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "xj" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor, /area/awaymission/wildwest/wildwest_mines) "xk" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/carpet/cyan, /area/awaymission/wildwest/wildwest_mines) "xm" = ( @@ -2623,7 +2544,7 @@ /turf/simulated/floor/carpet/cyan, /area/awaymission/wildwest/wildwest_mines) "za" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ icon_state = "bulb-broken" }, /turf/simulated/floor/plasteel{ @@ -2670,7 +2591,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "zG" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -2687,9 +2608,7 @@ }, /area/awaymission/wildwest/wildwest_vault) "zO" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/orange, /area/awaymission/wildwest/wildwest_mines) @@ -2698,7 +2617,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "zU" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "zV" = ( @@ -2720,9 +2639,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery, /obj/structure/largecrate, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2779,7 +2696,7 @@ /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "AJ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) @@ -2888,10 +2805,7 @@ /area/awaymission/wildwest/wildwest_mines) "Bm" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Bo" = ( @@ -2973,9 +2887,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/soda{ pixel_x = 11 }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Cx" = ( @@ -3048,18 +2960,15 @@ /obj/structure/chair/sofa/left{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Dj" = ( /obj/effect/turf_decal/loading_area{ dir = 4 }, -/obj/machinery/door_control{ - id = "ww_hang1"; - pixel_y = 28 +/obj/machinery/door_control/shutter/north{ + id = "ww_hang1" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3071,9 +2980,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "Do" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "Du" = ( @@ -3110,8 +3017,7 @@ /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "DF" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/cobweb, @@ -3148,9 +3054,7 @@ "DO" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3210,8 +3114,7 @@ /obj/structure/chair/comfy{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -3255,9 +3158,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "ER" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "ES" = ( @@ -3279,9 +3180,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "EV" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/carpet/purple, /area/awaymission/wildwest/wildwest_mines) "EX" = ( @@ -3391,14 +3290,11 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "FU" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Gb" = ( -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ icon_state = "bulb-broken" }, /turf/simulated/floor/plating/asteroid, @@ -3436,10 +3332,7 @@ /turf/simulated/floor/carpet/purple, /area/awaymission/wildwest/wildwest_mines) "Gz" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "GC" = ( @@ -3491,8 +3384,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "GS" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /obj/effect/mine/dnascramble, @@ -3573,8 +3465,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "HJ" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, @@ -3617,9 +3508,7 @@ /turf/simulated/floor/carpet/green, /area/awaymission/wildwest/wildwest_mines) "Im" = ( -/obj/machinery/door_control{ - pixel_x = -29 - }, +/obj/machinery/door_control/shutter/west, /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3632,7 +3521,7 @@ /area/awaymission/wildwest/wildwest_vault) "Ip" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "Ir" = ( @@ -3711,10 +3600,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "Jt" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -28 }, @@ -3769,8 +3655,7 @@ /turf/space, /area/space) "JV" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /mob/living/simple_animal/hostile/syndicate/ranged, @@ -3786,7 +3671,7 @@ "Kk" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3797,8 +3682,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Ku" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/plating/asteroid, @@ -3820,8 +3704,7 @@ /area/awaymission/wildwest/wildwest_refine) "KK" = ( /obj/structure/barricade/sandbags, -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ icon_state = "bulb-broken" }, /turf/simulated/floor/plating/asteroid, @@ -3858,7 +3741,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "Lp" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "Lr" = ( @@ -3880,7 +3763,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "LM" = ( @@ -3996,7 +3879,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -4028,7 +3911,7 @@ /turf/space, /area/space) "MK" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellowfull" @@ -4094,8 +3977,7 @@ /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "Nl" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -4144,9 +4026,7 @@ /turf/simulated/floor/carpet/purple, /area/awaymission/wildwest/wildwest_mines) "NH" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/carpet/red, /area/awaymission/wildwest/wildwest_mines) "NJ" = ( @@ -4193,8 +4073,7 @@ /area/awaymission/wildwest/wildwest_mines) "Os" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ icon_state = "bulb-broken" }, /turf/simulated/floor/plating/asteroid, @@ -4234,9 +4113,7 @@ /area/awaymission/wildwest/wildwest_refine) "OS" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) "OT" = ( @@ -4264,9 +4141,7 @@ "Ph" = ( /obj/effect/turf_decal/delivery, /obj/structure/ore_box, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4280,9 +4155,7 @@ }, /area/awaymission/wildwest/wildwest_refine) "Pn" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4324,8 +4197,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "PL" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor, @@ -4378,9 +4250,7 @@ }, /area/awaymission/wildwest/wildwest_vault) "Qg" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/red, /area/awaymission/wildwest/wildwest_mines) @@ -4427,7 +4297,7 @@ "Qy" = ( /obj/effect/turf_decal/delivery, /obj/structure/largecrate, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4457,8 +4327,7 @@ /area/awaymission/wildwest/wildwest_vault) "QQ" = ( /obj/effect/landmark/damageturf, -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /turf/simulated/floor, @@ -4603,9 +4472,7 @@ "SU" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4692,8 +4559,7 @@ /area/awaymission/wildwest/wildwest_mines) "TN" = ( /obj/structure/table, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /turf/simulated/floor/wood, @@ -4706,16 +4572,14 @@ /area/awaymission/wildwest/wildwest_vault) "TQ" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ icon_state = "bulb-broken" }, /turf/simulated/floor, /area/awaymission/wildwest/wildwest_refine) "TS" = ( /obj/machinery/mineral/ore_redemption, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/plasteel{ @@ -4764,10 +4628,7 @@ }, /area/awaymission/wildwest/wildwest_refine) "Uk" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror{ icon_state = "mirror_broke"; pixel_x = -28 @@ -4830,9 +4691,7 @@ dir = 4 }, /obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "UZ" = ( @@ -4852,8 +4711,7 @@ /turf/simulated/floor/carpet/red, /area/awaymission/wildwest/wildwest_mines) "Vj" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, @@ -4876,9 +4734,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "VJ" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) "VO" = ( @@ -4897,17 +4753,14 @@ /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) "VU" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/wood{ icon_state = "wood-broken3" }, /area/awaymission/wildwest/wildwest_mines) "VV" = ( /obj/structure/reagent_dispensers/beerkeg, -/obj/machinery/light/small{ - dir = 1; +/obj/machinery/light/small/directional/south{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -4928,9 +4781,7 @@ /area/awaymission/wildwest/wildwest_mines) "Wa" = ( /obj/item/kirbyplants/dead, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/carpet/green, /area/awaymission/wildwest/wildwest_mines) "Wc" = ( @@ -4956,8 +4807,7 @@ "Ws" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ icon_state = "bulb-broken" }, /turf/simulated/floor/wood, @@ -4979,12 +4829,8 @@ /obj/item/chair/wood{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "WM" = ( @@ -5000,22 +4846,18 @@ }, /area/awaymission/wildwest/wildwest_mines) "WY" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/stack/tile/wood, /turf/simulated/floor, /area/awaymission/wildwest/wildwest_mines) "Xe" = ( /obj/structure/flora/rock/pile, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "Xn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Xr" = ( @@ -5033,10 +4875,7 @@ /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "Xz" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "XE" = ( @@ -5126,8 +4965,7 @@ /turf/simulated/floor/plating/ironsand, /area/awaymission/wildwest/wildwest_mines) "YJ" = ( -/obj/machinery/light/small{ - dir = 8; +/obj/machinery/light/small/directional/east{ icon_state = "bulb-broken" }, /obj/effect/decal/cleanable/dirt, @@ -5138,9 +4976,7 @@ dir = 8 }, /obj/effect/decal/cleanable/cobweb2, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) "YM" = ( @@ -5167,10 +5003,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/awaymission/wildwest/wildwest_mines) @@ -5253,9 +5086,7 @@ /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "ZL" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet/red, /area/awaymission/wildwest/wildwest_mines) "ZO" = ( diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 01208035e9ce..7b2475296e3e 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -7,10 +7,7 @@ /turf/space, /area/space/nearstation) "aac" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -124,9 +121,7 @@ /area/station/security/permabrig) "abO" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/radio/intercom/department/security{ pixel_y = 25 }, @@ -178,9 +173,7 @@ }, /area/station/security/range) "acc" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/security/range) "acf" = ( @@ -191,11 +184,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -256,9 +245,7 @@ }, /area/station/security/main) "acx" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -291,10 +278,7 @@ }, /area/station/security/main) "acE" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -28 }, @@ -333,10 +317,7 @@ "acL" = ( /obj/structure/table/reinforced, /obj/item/storage/box/flashbangs, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -382,7 +363,7 @@ /obj/structure/toilet{ dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -450,11 +431,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) "adj" = ( @@ -466,9 +443,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "adl" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Firing Range" }, @@ -480,11 +455,7 @@ /obj/structure/table/reinforced, /obj/item/gun/energy/laser/practice, /obj/machinery/recharger, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plating, /area/station/security/range) "ado" = ( @@ -525,10 +496,7 @@ /turf/space, /area/space) "adE" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d2 = 8; @@ -759,10 +727,7 @@ }, /area/station/security/warden) "aeA" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -28 }, @@ -861,9 +826,7 @@ }, /area/station/science/hallway) "aeP" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; @@ -904,30 +867,16 @@ /area/station/security/permabrig) "aeU" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch/west, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" }, /area/station/security/warden) "aeV" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/computer/security{ dir = 8; network = list("SS13","Research Outpost","Mining Outpost") @@ -937,26 +886,22 @@ }, /area/station/command/office/hos) "aeW" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; - pixel_x = -26; pixel_y = 6; req_one_access_txt = "2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "Secure Gate"; name = "Brig Lockdown"; - pixel_x = -26; pixel_y = -3; req_one_access_txt = "2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/west{ id = "hosofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; - pixel_x = -26; pixel_y = 15; req_one_access_txt = "58" }, @@ -984,30 +929,24 @@ /area/station/security/armory/secure) "afk" = ( /obj/machinery/photocopier, -/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" }, /area/station/security/warden) "afl" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; - pixel_y = -28; req_one_access_txt = "2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -7; - pixel_y = -28; req_one_access_txt = "2" }, /turf/simulated/floor/plasteel{ @@ -1020,9 +959,7 @@ "afo" = ( /obj/structure/table, /obj/item/storage/box/prisoner, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -1042,11 +979,7 @@ /turf/simulated/floor/engine, /area/station/science/toxins/mixing) "afx" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ dir = 6; @@ -1126,13 +1059,8 @@ }, /area/station/security/armory/secure) "agO" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; @@ -1162,11 +1090,7 @@ }, /area/station/security/armory/secure) "agT" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/machinery/camera{ c_tag = "Brig Main Hall Center" }, @@ -1180,10 +1104,7 @@ }, /area/station/security/brig) "agV" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -1226,10 +1147,7 @@ }, /area/station/security/main) "ahk" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -1312,10 +1230,7 @@ }, /area/station/security/armory/secure) "ahQ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Brig Main Hall East 1" }, @@ -1334,9 +1249,7 @@ }, /area/station/security/armory/secure) "ahT" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, +/obj/structure/reagent_dispensers/peppertank/north, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1365,11 +1278,8 @@ "ahW" = ( /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/power/apc{ - cell_type = 5000; - dir = 4; - name = "east bump Important Area"; - pixel_x = 24 +/obj/machinery/power/apc/directional/east{ + cell_type = 5000 }, /obj/structure/cable{ d2 = 2; @@ -1490,9 +1400,7 @@ /area/station/security/armory/secure) "air" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/west, /obj/item/storage/secure/safe{ pixel_x = 27; @@ -1541,11 +1449,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/decal/warning_stripes/north, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -1565,10 +1469,7 @@ }, /area/station/security/armory/secure) "aiD" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/camera{ c_tag = "Brig Main Hall West 1" }, @@ -1597,11 +1498,7 @@ }, /area/station/security/armory/secure) "aiO" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/warning_stripes/east, /obj/machinery/camera{ c_tag = "Brig Secure Armory East"; @@ -1618,12 +1515,8 @@ }, /area/station/security/armory/secure) "aiU" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/light_switch/south, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -1644,11 +1537,7 @@ }, /area/station/security/brig) "aiV" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -1742,9 +1631,7 @@ }, /area/station/security/armory/secure) "ajp" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -1818,9 +1705,7 @@ }, /area/station/security/permabrig) "ajJ" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -1851,7 +1736,7 @@ }, /area/station/security/brig) "ajP" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -1860,19 +1745,14 @@ }, /area/station/security/brig) "ajT" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" }, /area/station/security/brig) "ajU" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -1893,10 +1773,7 @@ }, /area/station/security/armory/secure) "aki" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -1911,9 +1788,7 @@ }, /area/station/security/armory/secure) "akm" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1974,11 +1849,7 @@ "akv" = ( /obj/structure/table, /obj/item/taperecorder, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/item/radio/intercom/department/security{ pixel_y = 28 }, @@ -2016,18 +1887,14 @@ }, /area/station/security/evidence) "akD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" }, /area/station/security/brig) "akF" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -2051,10 +1918,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/landmark/start/security_officer, /obj/machinery/camera{ c_tag = "Brig Briefing Room East" @@ -2072,10 +1936,7 @@ /turf/simulated/floor/plating, /area/station/command/office/hos) "akK" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine{ department = "Head of Security's Office"; @@ -2160,9 +2021,7 @@ }, /area/station/legal/lawoffice) "ale" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/economy/vending/security, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -2194,19 +2053,15 @@ pixel_x = 6; pixel_y = 3 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "alk" = ( -/obj/machinery/light, -/obj/machinery/door_control{ +/obj/machinery/light/directional/north, +/obj/machinery/door_control/shutter/south{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; pixel_x = 7; - pixel_y = -28; req_one_access_txt = "3" }, /obj/structure/cable{ @@ -2251,14 +2106,8 @@ pixel_y = 1 }, /obj/item/storage/fancy/cigarettes/cigpack_robust, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Brig Briefing Room West"; dir = 4 @@ -2326,18 +2175,11 @@ /area/station/engineering/solar/auxstarboard) "alG" = ( /obj/machinery/economy/vending/cigarette, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel, /area/station/security/main) "alH" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2362,11 +2204,7 @@ /turf/simulated/floor/plasteel, /area/station/security/lobby) "alM" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -2447,11 +2285,7 @@ /area/station/security/processing) "alS" = ( /obj/structure/closet, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2551,9 +2385,7 @@ /obj/structure/sign/goldenplaque{ pixel_y = 30 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -2561,10 +2393,7 @@ /area/station/security/main) "amd" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -2584,10 +2413,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "amf" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ dir = 1; @@ -2711,9 +2537,7 @@ /obj/machinery/recharger{ pixel_y = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Brig Warden's Office" }, @@ -2727,11 +2551,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -2743,10 +2563,7 @@ /area/station/security/warden) "amC" = ( /obj/structure/closet/secure_closet/warden, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -2801,16 +2618,12 @@ /area/station/security/storage) "amJ" = ( /obj/structure/rack, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, +/obj/structure/reagent_dispensers/peppertank/north, /obj/item/restraints/handcuffs{ pixel_y = -4 }, /obj/item/restraints/handcuffs, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ dir = 1; @@ -2818,11 +2631,7 @@ }, /area/station/security/storage) "amK" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plating, /area/station/maintenance/fore) "amL" = ( @@ -2926,10 +2735,7 @@ /obj/structure/chair/comfy/black{ dir = 8 }, -/obj/machinery/keycard_auth{ - pixel_x = -28; - pixel_y = 2 - }, +/obj/machinery/keycard_auth/west, /obj/effect/landmark/start/head_of_security, /obj/structure/cable{ d1 = 1; @@ -3183,14 +2989,8 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Internal Affairs Office" }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -3409,9 +3209,7 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "aoS" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/computer/card/minor/hos{ dir = 8 }, @@ -3425,18 +3223,14 @@ /obj/machinery/camera{ c_tag = "Brig Cell 1" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/station/security/prison/cell_block/A) "aoW" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -3477,23 +3271,13 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/east, /turf/simulated/floor/plasteel, /area/station/security/processing) "apd" = ( /obj/structure/closet, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3505,11 +3289,7 @@ pixel_y = 7 }, /obj/item/pen, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/requests_console{ department = "Warden"; departmentType = 7; @@ -3663,20 +3443,11 @@ /turf/simulated/floor/carpet/cyan, /area/station/security/prison/cell_block/A) "apA" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/structure/table/reinforced, /obj/item/stack/medical/bruise_pack/advanced, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Brig Security Equipment South"; dir = 4 @@ -3700,10 +3471,7 @@ /obj/item/reagent_containers/spray/pepper{ pixel_y = -4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/effect/decal/warning_stripes/red/hollow, /obj/structure/disposalpipe/segment{ dir = 4 @@ -3718,11 +3486,7 @@ /area/station/security/storage) "apE" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -3732,9 +3496,7 @@ }, /area/station/security/storage) "apG" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3746,12 +3508,8 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "apI" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/north, /obj/structure/closet/secure_closet/security, /obj/structure/cable{ d1 = 1; @@ -3776,9 +3534,7 @@ }, /area/station/security/evidence) "apM" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/security/main) "apO" = ( @@ -3813,10 +3569,7 @@ /area/station/security/main) "apU" = ( /obj/structure/table/wood, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/machinery/camera{ c_tag = "Brig Head of Security's Office"; dir = 1 @@ -3847,11 +3600,7 @@ /area/station/command/office/hos) "apW" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -3861,9 +3610,7 @@ /area/station/command/office/hos) "apY" = ( /obj/structure/bed, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) "apZ" = ( @@ -3899,9 +3646,7 @@ /obj/structure/toilet{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aqu" = ( @@ -4170,9 +3915,7 @@ }, /area/station/security/processing) "arA" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -4188,9 +3931,7 @@ }, /area/station/security/brig) "arD" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -4200,11 +3941,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -4223,11 +3960,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "arK" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d2 = 2; @@ -4308,23 +4041,15 @@ /area/station/maintenance/fore) "arS" = ( /obj/item/toy/pet_rock, -/obj/machinery/door_control{ - id = "secmaintdorm1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/east{ + id = "secmaintdorm1" }, /turf/simulated/floor/plating, /area/station/maintenance/fore) "arT" = ( /obj/item/toy/plushie/deer, -/obj/machinery/door_control{ - id = "secmaintdorm2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/east{ + id = "secmaintdorm2" }, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -4411,11 +4136,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "asy" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4434,9 +4155,7 @@ }, /area/station/security/brig) "asz" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/item/storage/bag/trash, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -4480,9 +4199,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "asJ" = ( @@ -4552,14 +4269,8 @@ }, /area/station/legal/lawoffice) "asQ" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -4608,11 +4319,7 @@ /turf/simulated/floor/carpet/cyan, /area/station/security/prison/cell_block/A) "atc" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -4729,12 +4436,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "atx" = ( -/obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/light/directional/north, +/obj/machinery/newscaster/security_unit/south, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -4757,12 +4460,8 @@ }, /area/station/security/permabrig) "atC" = ( -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -4861,18 +4560,11 @@ pixel_y = 3 }, /obj/item/clothing/glasses/sunglasses, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel, /area/station/security/range) "aua" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -4908,10 +4600,7 @@ }, /area/station/security/permabrig) "auh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -4926,26 +4615,14 @@ /turf/simulated/floor/plating, /area/station/security/storage) "auj" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, /area/station/security/permabrig) "aul" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/firealarm/directional/east, /obj/structure/rack, /obj/item/storage/box/handcuffs{ pixel_x = 3; @@ -4993,9 +4670,7 @@ }, /area/station/public/construction) "aup" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/closet/emcloset, /obj/machinery/camera{ c_tag = "Security Pod" @@ -5088,29 +4763,26 @@ icon_state = "4-8" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ desc = "A remote control switch for the brig foyer."; id = "BrigLeft"; name = "Brig Foyer Left Doors"; - normaldoorcontrol = 1; pixel_x = -5; pixel_y = 6; req_one_access_txt = "63" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ desc = "A remote control switch for the brig foyer."; id = "BrigRight"; name = "Brig Foyer Right Doors"; - normaldoorcontrol = 1; pixel_x = 5; pixel_y = 6; req_one_access_txt = "63" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ desc = "A remote control switch for the brig foyer."; id = "BrigEast"; name = "Brig Foyer East Doors"; - normaldoorcontrol = 1; pixel_x = 5; pixel_y = -2; req_one_access_txt = "63" @@ -5132,14 +4804,8 @@ }, /area/station/security/lobby) "auM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/power/apc/directional/east, +/obj/machinery/light/directional/west, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -5189,11 +4855,7 @@ name = "Cell 3" }, /obj/machinery/door/firedoor, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/door/poddoor/preopen{ id_tag = "Secure Gate"; name = "Security Blast Door" @@ -5225,14 +4887,8 @@ }, /area/station/security/prison/cell_block/A) "auS" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light_switch/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -5244,9 +4900,7 @@ dir = 4; pixel_y = -22 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/radio/intercom/department/security{ dir = 4; pixel_x = -22; @@ -5281,11 +4935,7 @@ }, /area/station/security/brig) "auW" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel, /area/station/security/processing) @@ -5296,21 +4946,15 @@ /area/station/maintenance/apmaint) "auY" = ( /obj/structure/table, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/item/hand_labeler, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/evidence) "auZ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -5319,9 +4963,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "avb" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) @@ -5444,16 +5086,11 @@ /area/station/security/permabrig) "avo" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/grass, /area/station/security/permabrig) "avp" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, @@ -5481,11 +5118,8 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "avu" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, @@ -5526,10 +5160,7 @@ }, /area/station/security/processing) "avC" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/soap, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -5703,11 +5334,7 @@ /area/station/security/processing) "awC" = ( /obj/structure/chair, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/camera{ c_tag = "Brig Prisoner Processing East"; dir = 8; @@ -5873,11 +5500,7 @@ }, /area/station/medical/virology) "axk" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -5893,9 +5516,7 @@ name = "Internal Affairs Requests Console"; pixel_x = -30 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -5915,8 +5536,7 @@ /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -5936,11 +5556,7 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "axu" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -5984,11 +5600,7 @@ /turf/simulated/floor/plasteel, /area/station/security/lobby) "axB" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/camera{ c_tag = "Brig Lobby East"; dir = 8 @@ -6029,7 +5641,7 @@ }, /area/station/security/prison/cell_block/A) "axH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -6155,11 +5767,7 @@ }, /area/station/security/processing) "axQ" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -6176,14 +5784,8 @@ }, /area/station/security/processing) "axU" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/alarm/directional/east, +/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/restraints/handcuffs, /obj/item/taperecorder, @@ -6200,9 +5802,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "axX" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/structure/rack{ dir = 1 }, @@ -6211,9 +5811,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "axY" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/table, /obj/item/taperecorder, /turf/simulated/floor/plating, @@ -6325,11 +5923,7 @@ "ayt" = ( /obj/structure/table, /obj/item/storage/box/evidence, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/pen, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -6350,9 +5944,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "ayz" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/sign/electricshock{ pixel_y = 32 }, @@ -6440,10 +6032,8 @@ }, /area/station/security/lobby) "ayM" = ( -/obj/machinery/light, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/ai_status_display/south, /obj/item/reagent_containers/food/drinks/mug/sec, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -6461,11 +6051,7 @@ }, /area/station/security/lobby) "ayP" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -6517,11 +6103,7 @@ id = "Cell 4"; name = "Cell 4" }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/door/poddoor/preopen{ id_tag = "Secure Gate"; name = "Security Blast Door" @@ -6537,11 +6119,7 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "ayW" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -6561,11 +6139,7 @@ }, /area/station/security/prison/cell_block/A) "ayX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -6626,9 +6200,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -6654,11 +6226,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "azq" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6826,11 +6394,7 @@ }, /area/station/security/execution) "azB" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -6858,16 +6422,13 @@ /area/station/security/lobby) "azG" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/science/storage) "azH" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "brig_courtroom"; name = "Brig Courtroom Shutter Control"; - pixel_x = 25; req_one_access_txt = "2" }, /turf/simulated/floor/plasteel{ @@ -6941,9 +6502,7 @@ }, /area/station/security/interrogation) "azM" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/binary/pump/on{ dir = 8 }, @@ -7087,9 +6646,7 @@ /turf/simulated/wall/r_wall, /area/station/legal/courtroom) "aAo" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -7123,7 +6680,7 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "aAu" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 1 }, @@ -7167,11 +6724,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/A) "aAB" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7180,29 +6733,15 @@ }, /area/station/security/interrogation/observation) "aAC" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/interrogation/observation) "aAE" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch/west, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/secure_closet/iaa, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -7223,22 +6762,14 @@ "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" }, /area/station/legal/lawoffice) "aAL" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/chair/stool/bar{ dir = 4 }, @@ -7270,11 +6801,9 @@ pixel_y = 6; req_one_access_txt = "74" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/east{ id = "magistrateofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; - pixel_x = 24; pixel_y = -6; req_one_access_txt = "74" }, @@ -7361,11 +6890,7 @@ name = "Cell 5" }, /obj/machinery/door/firedoor, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/door/poddoor/preopen{ id_tag = "Secure Gate"; name = "Security Blast Door" @@ -7389,9 +6914,7 @@ }, /area/station/security/prison/cell_block/A) "aBb" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -7461,11 +6984,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -7476,11 +6995,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7498,9 +7013,7 @@ /turf/simulated/wall, /area/station/security/interrogation/observation) "aBw" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -7567,9 +7080,7 @@ pixel_x = 32 }, /obj/item/seeds/chili, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/grass, /area/station/security/permabrig) "aBN" = ( @@ -7610,9 +7121,7 @@ "aBS" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/peppertank/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7623,13 +7132,8 @@ /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "aBU" = ( -/obj/machinery/light_construct/small{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light_construct/small/east, +/obj/machinery/status_display/directional/north, /obj/structure/spider/stickyweb, /obj/structure/sign/poster/random{ pixel_x = -32 @@ -7670,9 +7174,7 @@ /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "aCa" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -7708,23 +7210,14 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Magistrate's Office" }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ icon_state = "cult" }, /area/station/legal/magistrate) "aCe" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ req_access = null; req_one_access_txt = "2" @@ -7738,9 +7231,7 @@ /area/station/legal/magistrate) "aCg" = ( /obj/structure/table/wood, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/computer/secure_data/laptop, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -7797,7 +7288,7 @@ "aCq" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/camera{ c_tag = "Brig Cell 2"; dir = 1 @@ -7805,7 +7296,7 @@ /turf/simulated/floor/carpet/cyan, /area/station/security/prison/cell_block/A) "aCr" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7889,11 +7380,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8014,15 +7501,11 @@ /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/patron, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aCZ" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -8034,15 +7517,12 @@ pixel_x = 3; pixel_y = -4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "brig_courtroom"; name = "Brig Courtroom Shutter Control"; - pixel_y = 25; req_one_access_txt = "2" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8122,11 +7602,7 @@ }, /area/station/command/teleporter) "aDm" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -8137,11 +7613,7 @@ }, /area/station/hallway/primary/fore) "aDo" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -8153,9 +7625,7 @@ /area/station/security/prison/cell_block/A) "aDp" = ( /obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -8178,9 +7648,7 @@ /area/station/maintenance/abandonedbar) "aDt" = ( /obj/machinery/fishtank/tank, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /obj/item/tank_brush, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, @@ -8196,9 +7664,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "aDv" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8261,7 +7727,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aDD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aDF" = ( @@ -8280,11 +7746,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "aDH" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -8428,23 +7890,13 @@ /area/station/hallway/primary/fore) "aEn" = ( /obj/structure/chair/office/dark, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/landmark/start/detective, /turf/simulated/floor/carpet, /area/station/security/detective) "aEo" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -8452,11 +7904,7 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "aEp" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/computer/security/wooden_tv{ network = list("SS13","Research Outpost","Mining Outpost") }, @@ -8477,13 +7925,11 @@ "aEw" = ( /obj/item/storage/toolbox/emergency, /obj/structure/table, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aEx" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dust, /obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/plating, @@ -8514,9 +7960,7 @@ "aEB" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -8528,9 +7972,7 @@ /area/station/maintenance/auxsolarport) "aED" = ( /obj/machinery/power/terminal, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -8548,9 +7990,7 @@ "aEF" = ( /obj/structure/table, /obj/item/paper_bin, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aEG" = ( @@ -8604,9 +8044,7 @@ /area/station/security/permabrig) "aEP" = ( /obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aEQ" = ( @@ -8615,9 +8053,7 @@ /area/station/maintenance/fpmaint) "aES" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/mapping_helpers/machinery/destroyed, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) @@ -8655,7 +8091,7 @@ /area/station/maintenance/abandonedbar) "aEX" = ( /obj/item/trash/pistachios, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/mapping_helpers/machinery/destroyed, /turf/simulated/floor/wood{ broken = 1; @@ -8667,25 +8103,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aEZ" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/coatrack, /obj/item/clothing/suit/tracksuit, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aFa" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, -/obj/structure/sink/kitchen{ - dir = 8; - name = "old sink"; - pixel_x = 12 - }, +/obj/structure/sign/poster/contraband/random/east, +/obj/structure/sink/kitchen/east, /obj/structure/closet/walllocker/medlocker/south, /obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -8; @@ -8704,9 +8130,7 @@ /area/station/maintenance/abandonedbar) "aFc" = ( /obj/structure/chair/stool, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aFd" = ( @@ -8727,10 +8151,7 @@ /obj/structure/table, /obj/item/gavelblock, /obj/item/gavelhammer, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -8748,17 +8169,9 @@ }, /area/station/security/interrogation) "aFo" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -8816,14 +8229,8 @@ /area/station/maintenance/fore) "aFt" = ( /obj/machinery/disposal, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/light/directional/west, +/obj/machinery/newscaster/security_unit/south, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -8971,11 +8378,8 @@ c_tag = "Fore Port Solar Control"; dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 4; @@ -9011,9 +8415,7 @@ "aFU" = ( /obj/structure/table, /obj/item/toy/figure/crew/detective, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "aFV" = ( @@ -9028,9 +8430,7 @@ }, /area/station/maintenance/fpmaint2) "aFW" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/item/paper/crumpled, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 @@ -9089,12 +8489,8 @@ /turf/simulated/wall, /area/station/maintenance/fpmaint) "aGj" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/machinery/light/small/directional/south, +/obj/structure/sign/poster/contraband/random/north, /obj/structure/chair/wood, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -9136,12 +8532,8 @@ /area/station/maintenance/fpmaint) "aGq" = ( /obj/structure/chair, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -9204,10 +8596,7 @@ }, /area/station/security/detective) "aGE" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/computer/med_data, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -9220,11 +8609,7 @@ }, /area/station/security/detective) "aGG" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d2 = 2; @@ -9233,9 +8618,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aGH" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aGI" = ( @@ -9249,11 +8632,7 @@ }, /area/station/service/barber) "aGJ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -9266,10 +8645,7 @@ /obj/structure/chair/barber{ dir = 8 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/camera{ c_tag = "Barber Shop" }, @@ -9279,11 +8655,7 @@ /area/station/service/barber) "aGM" = ( /obj/machinery/dye_generator, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -9302,10 +8674,7 @@ /obj/machinery/camera{ c_tag = "Arcade" }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aGQ" = ( @@ -9316,10 +8685,7 @@ /obj/structure/chair/comfy/black{ dir = 8 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aGT" = ( @@ -9354,13 +8720,8 @@ "aGZ" = ( /obj/structure/table, /obj/random/plushie, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aHa" = ( @@ -9500,11 +8861,7 @@ "aHx" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -9534,13 +8891,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "blue" @@ -9599,9 +8951,7 @@ icon_state = "0-8" }, /obj/machinery/power/terminal, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "aHK" = ( @@ -9702,9 +9052,7 @@ /area/station/maintenance/fore) "aIj" = ( /obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -9714,14 +9062,8 @@ /area/station/legal/magistrate) "aIn" = ( /obj/structure/dresser, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -9731,14 +9073,8 @@ /area/station/legal/lawoffice) "aIp" = ( /obj/structure/chair/comfy/black, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/small/directional/east, +/obj/machinery/alarm/directional/west, /obj/effect/landmark/start/assistant, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -9747,11 +9083,7 @@ /turf/simulated/wall, /area/station/maintenance/fore) "aIu" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -9817,11 +9149,8 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) @@ -9892,14 +9221,8 @@ }, /area/station/legal/magistrate) "aIO" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -9946,11 +9269,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aIW" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/wood, /area/station/legal/courtroom) "aIX" = ( @@ -10034,11 +9353,7 @@ }, /area/station/security/detective) "aJl" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/table/wood, /obj/item/folder/red{ pixel_y = 3 @@ -10072,11 +9387,7 @@ }, /area/station/security/detective) "aJn" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/closet/secure_closet{ anchored = 1; name = "Evidence Storage"; @@ -10087,11 +9398,7 @@ }, /area/station/security/detective) "aJo" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -10111,9 +9418,7 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -10146,9 +9451,7 @@ /area/station/service/barber) "aJv" = ( /obj/machinery/gameboard, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aJw" = ( @@ -10182,18 +9485,14 @@ /area/station/public/arcade) "aJA" = ( /obj/structure/closet/lasertag/red, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aJB" = ( /obj/machinery/camera{ c_tag = "Kitchen Freezer" }, -/obj/structure/sink/kitchen{ - pixel_y = 18 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -10320,10 +9619,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aKj" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/carpet, /area/station/legal/courtroom) "aKk" = ( @@ -10405,16 +9701,14 @@ /area/station/security/detective) "aKC" = ( /obj/machinery/photocopier, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/station/security/detective) "aKD" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -10430,22 +9724,14 @@ pixel_y = 5 }, /obj/item/pen, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber" }, /area/station/service/barber) "aKG" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/west, /obj/machinery/hologram/holopad, /obj/structure/cable{ d1 = 1; @@ -10486,14 +9772,8 @@ /area/station/public/arcade) "aKO" = ( /obj/structure/closet/lasertag/blue, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aKQ" = ( @@ -10563,13 +9843,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aLb" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -10589,13 +9864,8 @@ /turf/space, /area/space/nearstation) "aLf" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -10662,9 +9932,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLt" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aLu" = ( @@ -10721,7 +9989,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLK" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLL" = ( @@ -10735,12 +10003,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLN" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/structure/sign/poster/official/random/west, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Courtroom "; dir = 4 @@ -10895,11 +10159,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aMp" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -10915,22 +10175,14 @@ /turf/simulated/wall, /area/station/hallway/secondary/entry) "aMt" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/structure/chair/comfy/shuttle{ dir = 1 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "aMw" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10961,10 +10213,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "aMD" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -10982,11 +10231,7 @@ /area/station/public/arcade) "aMJ" = ( /obj/machinery/economy/vending/snack, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aMK" = ( @@ -11069,9 +10314,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aNa" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/carpet, /area/station/legal/courtroom) "aNb" = ( @@ -11085,11 +10328,7 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "aNc" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -11129,10 +10368,7 @@ }, /area/station/maintenance/fsmaint) "aNk" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -11243,14 +10479,8 @@ }, /area/station/legal/courtroom) "aNK" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/alarm/directional/west, /obj/machinery/camera{ c_tag = "Fore Primary Hallway South"; dir = 4 @@ -11287,21 +10517,14 @@ /turf/simulated/floor/wood, /area/station/legal/courtroom) "aNT" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/station/hallway/primary/fore) "aNX" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -11321,9 +10544,7 @@ }, /area/station/service/barber) "aOb" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/economy/arcade/claw, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -11366,7 +10587,7 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "aOn" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/chefhat, /turf/simulated/floor/plasteel, @@ -11380,7 +10601,7 @@ /area/station/maintenance/fpmaint) "aOp" = ( /obj/structure/closet/crate/freezer, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -11488,11 +10709,7 @@ /obj/item/clothing/gloves/color/fyellow, /obj/item/storage/toolbox/electrical, /obj/item/multitool, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -11501,19 +10718,14 @@ /area/station/maintenance/electrical) "aOM" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" }, /area/station/hallway/secondary/exit) "aOP" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "aOQ" = ( @@ -11692,11 +10904,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "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) "aPA" = ( @@ -11709,9 +10917,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -11731,12 +10937,8 @@ }, /area/station/legal/courtroom) "aPE" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -11750,11 +10952,7 @@ /area/station/legal/courtroom) "aPG" = ( /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 }, @@ -11798,9 +10996,7 @@ }, /area/station/public/sleep) "aPN" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -11815,9 +11011,7 @@ /turf/simulated/wall, /area/station/maintenance/electrical) "aPR" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11827,11 +11021,8 @@ }, /area/station/hallway/secondary/entry) "aPS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 2; @@ -11840,10 +11031,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/scrubbers{ dir = 4 }, @@ -11913,10 +11101,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aQf" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -11939,10 +11124,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aQk" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -11957,10 +11139,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aQn" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11971,9 +11150,7 @@ /area/station/public/dorms) "aQo" = ( /obj/structure/chair, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/effect/landmark/start/assistant, /obj/structure/disposalpipe/segment{ dir = 4 @@ -12021,13 +11198,8 @@ }, /area/station/public/dorms) "aQr" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/south, /obj/structure/table, /obj/item/stack/tape_roll, /obj/structure/disposalpipe/segment{ @@ -12198,23 +11370,15 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) "aQE" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/station/public/dorms) "aQG" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -12262,9 +11426,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aQS" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -12285,9 +11447,7 @@ /area/space/nearstation) "aQV" = ( /obj/structure/table/glass, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/computer/mob_healer_terminal{ pixel_y = 30 }, @@ -12310,14 +11470,8 @@ pixel_x = -5; pixel_y = 5 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/alarm/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aQY" = ( @@ -12327,13 +11481,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aRa" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Arrivals Escape Pods" }, @@ -12357,10 +11506,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "aRf" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -12438,9 +11584,7 @@ }, /area/station/hallway/primary/starboard/west) "aRA" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -12451,10 +11595,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aRF" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -12496,11 +11637,7 @@ "aRM" = ( /obj/structure/table, /obj/item/storage/box/cups, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/wood, /area/station/legal/courtroom) "aRO" = ( @@ -12513,14 +11650,11 @@ /area/station/science/hallway) "aRP" = ( /obj/machinery/economy/vending/coffee, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/legal/courtroom) "aRQ" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/wood, /area/station/legal/courtroom) @@ -12540,9 +11674,7 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "aRW" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -12586,10 +11718,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aSc" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -12752,10 +11881,7 @@ }, /area/station/hallway/secondary/entry) "aTa" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "aTb" = ( @@ -12779,9 +11905,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "aTf" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -12790,9 +11914,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aTh" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -12828,12 +11950,7 @@ "aTt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc{ - cell_type = 15000; - dir = 4; - name = "Cryo and Arrivals Super APC"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 4; @@ -12974,12 +12091,8 @@ /turf/simulated/floor/plating, /area/station/medical/reception) "aTN" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/ai_status_display/west, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -13006,9 +12119,7 @@ "aTT" = ( /obj/effect/decal/warning_stripes/northwest, /obj/machinery/chem_master, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_y = 32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/north, /turf/simulated/floor/engine, /area/station/medical/chemistry) "aTU" = ( @@ -13025,9 +12136,7 @@ "aTV" = ( /obj/effect/decal/warning_stripes/northeast, /obj/machinery/chem_heater, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/engine, /area/station/medical/chemistry) "aTW" = ( @@ -13059,10 +12168,7 @@ info = "*Здесь было что-то написано, но вы не можете разобрать что именнно.*"; name = "Окровавленная записка" }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/spawner/random_spawners/mod/maint, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -13172,10 +12278,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aUs" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aUt" = ( @@ -13188,15 +12291,11 @@ /area/station/hallway/secondary/garden) "aUx" = ( /obj/machinery/seed_extractor, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aUz" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aUA" = ( @@ -13259,19 +12358,14 @@ }, /area/station/public/dorms) "aUL" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "cult" }, /area/station/service/chapel/office) "aUN" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "aUO" = ( @@ -13298,11 +12392,10 @@ /turf/simulated/floor/plating, /area/station/medical/chemistry) "aUP" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control switch for the medbay foyer."; id = "imnotmakingyoulubepissoff"; - name = "Chemistry Privacy Shutter Control"; - pixel_y = 26 + name = "Chemistry Privacy Shutter Control" }, /obj/structure/table/glass, /obj/item/clothing/glasses/science{ @@ -13350,9 +12443,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -13420,20 +12511,14 @@ /area/station/public/storage/tools) "aVk" = ( /obj/structure/closet/secure_closet/freezer/money, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/station/command/vault) "aVl" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -13444,13 +12529,8 @@ }, /area/station/command/vault) "aVm" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/alarm/directional/north, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -13461,10 +12541,7 @@ }, /area/station/command/vault) "aVn" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/table/reinforced, /obj/structure/closet/fireaxecabinet{ pixel_x = 32 @@ -13537,9 +12614,7 @@ /area/station/medical/reception) "aVA" = ( /obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aVC" = ( @@ -13631,11 +12706,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aWc" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -13647,22 +12718,15 @@ /area/station/security/checkpoint/secondary) "aWd" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" }, /area/station/security/checkpoint/secondary) "aWf" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, +/obj/structure/reagent_dispensers/peppertank/north, /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost") }, @@ -13698,10 +12762,7 @@ /area/station/security/checkpoint/secondary) "aWi" = ( /obj/structure/table, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/item/wirecutters, /obj/item/flashlight{ pixel_x = 1; @@ -13739,19 +12800,13 @@ /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) "aWo" = ( /obj/structure/table, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/item/assembly/signaler, /obj/item/assembly/signaler, /obj/item/multitool, @@ -13761,11 +12816,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWp" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -13774,20 +12825,14 @@ /area/station/public/storage/tools) "aWq" = ( /obj/structure/table, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWr" = ( /obj/structure/table, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -13840,9 +12885,7 @@ }, /area/station/command/vault) "aWz" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/cryopod{ dir = 4 }, @@ -13855,9 +12898,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -13914,13 +12955,8 @@ "aWI" = ( /obj/structure/table/glass, /obj/item/storage/box/cups, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/light/directional/south, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -13956,11 +12992,7 @@ }, /area/station/public/dorms) "aWN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -13992,10 +13024,7 @@ /area/station/maintenance/asmaint2) "aWS" = ( /obj/machinery/economy/vending/chinese, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -14075,11 +13104,7 @@ }, /area/station/public/dorms) "aXg" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -14103,10 +13128,7 @@ /area/station/service/chapel) "aXi" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/lipstick/random{ pixel_x = 3; pixel_y = 6 @@ -14132,10 +13154,7 @@ }, /area/station/service/chapel/office) "aXk" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -14185,9 +13204,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXt" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/computer/arcade, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) @@ -14209,9 +13226,7 @@ /area/shuttle/arrival/station) "aXy" = ( /obj/structure/closet/walllocker/emerglocker/north, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXA" = ( @@ -14319,11 +13334,7 @@ pixel_x = 1; pixel_y = -2 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/item/storage/belt/champion/wrestling, /turf/simulated/floor/plasteel{ dir = 1; @@ -14441,9 +13452,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aYl" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/economy/vending/medidrobe, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -14463,36 +13472,24 @@ /area/station/public/storage/office) "aYo" = ( /obj/machinery/economy/vending/coffee, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, /area/station/medical/reception) "aYr" = ( /obj/machinery/washing_machine, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, /area/station/medical/reception) "aYs" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/machinery/cryopod{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -14594,17 +13591,13 @@ /area/station/service/chapel) "aYG" = ( /obj/structure/closet/coffin, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/service/chapel) "aYI" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/computer/cryopod{ dir = 8; pixel_x = 30 @@ -14617,10 +13610,7 @@ }, /area/station/public/sleep) "aYJ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/station/public/mrchangs) @@ -14639,9 +13629,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aYL" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) @@ -14676,7 +13664,7 @@ "aYU" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14715,11 +13703,7 @@ /obj/item/radio/intercom/department/security{ pixel_y = -28 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -14729,10 +13713,7 @@ }, /area/station/security/checkpoint/secondary) "aZc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) @@ -14749,9 +13730,7 @@ /area/station/maintenance/fsmaint) "aZe" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/stack/cable_coil{ pixel_x = 2; pixel_y = -2 @@ -14799,9 +13778,7 @@ }, /area/station/command/vault) "aZj" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/table/glass, /obj/item/cultivator, /obj/item/hatchet, @@ -14827,11 +13804,7 @@ /obj/structure/safe{ known_by = list("captain") }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, @@ -14845,9 +13818,7 @@ /area/station/command/vault) "aZr" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -14994,11 +13965,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_pump/on{ dir = 4 }, @@ -15016,11 +13983,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 @@ -15070,9 +14033,7 @@ pixel_y = -3 }, /obj/effect/decal/warning_stripes/blue/hollow, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/clothing/shoes/magboots{ pixel_x = -3; pixel_y = -3 @@ -15093,10 +14054,7 @@ }, /area/station/service/expedition) "bao" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/table/wood, /obj/item/paper_bin{ pixel_x = 1; @@ -15139,10 +14097,7 @@ /turf/simulated/wall, /area/station/service/library) "bav" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/table/wood, /obj/item/dice/d20, /obj/item/dice, @@ -15150,11 +14105,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "baw" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -15266,9 +14217,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "baZ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "bbf" = ( @@ -15446,10 +14395,7 @@ }, /area/station/ai_monitored/storage/eva) "bbL" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/decal/warning_stripes/blue/hollow, /turf/simulated/floor/plasteel{ @@ -15481,9 +14427,7 @@ }, /area/station/ai_monitored/storage/eva) "bbQ" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/decal/warning_stripes/blue/hollow, /turf/simulated/floor/plasteel{ @@ -15509,9 +14453,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bbZ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -15637,15 +14579,8 @@ /area/station/service/library) "bcq" = ( /obj/structure/closet/secure_closet/chaplain, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -15678,16 +14613,11 @@ /obj/structure/table/wood, /obj/item/pen, /obj/item/reagent_containers/food/drinks/bottle/holywater, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) "bcw" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Chapel Chaplain's Office" }, @@ -15705,10 +14635,7 @@ /area/station/service/chapel/office) "bcA" = ( /obj/structure/dispenser, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "bcB" = ( @@ -15718,19 +14645,13 @@ pixel_y = 5 }, /obj/item/storage/fancy/crayons, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/station/service/chapel/office) "bcC" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -15741,12 +14662,8 @@ }, /area/station/service/chapel) "bcF" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -15756,9 +14673,7 @@ /obj/machinery/camera{ c_tag = "Arrivals Lounge" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -15776,10 +14691,7 @@ /turf/simulated/floor/plating, /area/station/security/brig) "bcM" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -15789,17 +14701,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bcN" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 1 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bcO" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) @@ -15815,16 +14724,8 @@ /obj/structure/table/glass, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -15849,11 +14750,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bcW" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -15909,11 +14806,7 @@ /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/storage/firstaid/regular, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bdh" = ( @@ -15945,26 +14838,18 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bdm" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/station/public/dorms) "bdn" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bdq" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/electricshock{ pixel_y = 32 }, @@ -15988,16 +14873,8 @@ /obj/item/clothing/suit/soldiercoat{ pixel_y = 6 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/light_switch/south, /turf/simulated/floor/wood, /area/station/service/clown) "bdu" = ( @@ -16038,21 +14915,15 @@ /obj/item/reagent_containers/spray/pestspray, /obj/item/reagent_containers/glass/bottle/nutrient/ez, /obj/item/reagent_containers/glass/bottle/nutrient/rh, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" }, /area/station/hallway/secondary/garden) "bdy" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/structure/sign/poster/official/random/west, +/obj/machinery/light/directional/east, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/decal/warning_stripes/blue/hollow, /turf/simulated/floor/plasteel{ @@ -16061,11 +14932,7 @@ /area/station/ai_monitored/storage/eva) "bdz" = ( /obj/structure/filingcabinet, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -16085,12 +14952,8 @@ }, /area/station/ai_monitored/storage/eva) "bdB" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/random/east, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/decal/warning_stripes/blue/hollow, /turf/simulated/floor/plasteel{ @@ -16098,16 +14961,11 @@ }, /area/station/ai_monitored/storage/eva) "bdD" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "bdE" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen/engi{ @@ -16117,12 +14975,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bdF" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -16264,16 +15118,13 @@ /turf/simulated/wall, /area/station/service/hydroponics) "bec" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/table/wood, /obj/machinery/bottler, /turf/simulated/floor/wood/fancy/oak, /area/station/service/bar) "bee" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/effect/decal/warning_stripes/southeast, /obj/structure/cable, /turf/simulated/floor/plasteel{ @@ -16335,9 +15186,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "beq" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -16350,11 +15199,7 @@ /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) "bes" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bet" = ( @@ -16365,11 +15210,7 @@ /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) "beu" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -16399,7 +15240,7 @@ /turf/simulated/wall/r_wall, /area/station/turret_protected/ai_upload) "beG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "beL" = ( @@ -16489,11 +15330,7 @@ /turf/simulated/floor/plating, /area/station/ai_monitored/storage/eva) "bfi" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Dormitories Center"; dir = 1 @@ -16532,10 +15369,7 @@ }, /area/station/service/kitchen) "bfp" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -16574,11 +15408,7 @@ }, /area/station/public/dorms) "bfv" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -16643,10 +15473,7 @@ }, /area/station/service/hydroponics) "bfM" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/table, /obj/item/paper_bin{ pixel_x = -3; @@ -16669,17 +15496,11 @@ }, /area/station/service/chapel) "bfT" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "bfU" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/table, /obj/item/stack/sheet/metal{ amount = 50 @@ -16714,11 +15535,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bfX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -16798,9 +15615,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bgn" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/directions/cargo{ dir = 4; pixel_y = 25 @@ -16817,11 +15632,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bgq" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -16829,10 +15640,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "bgr" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) @@ -16842,10 +15650,7 @@ c_tag = "Office Supplies"; dir = 4 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/office) @@ -16869,10 +15674,7 @@ }, /area/station/hallway/secondary/entry) "bgw" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16947,14 +15749,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bgH" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -16967,20 +15763,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bgJ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "bgK" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/gateway{ dir = 10 }, @@ -16989,9 +15778,7 @@ }, /area/station/service/expedition) "bgL" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/gateway{ dir = 6 }, @@ -17006,11 +15793,7 @@ /obj/item/crowbar, /obj/item/plant_analyzer, /obj/item/reagent_containers/glass/bucket, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" @@ -17043,7 +15826,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bgR" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17061,18 +15844,7 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/public/mrchangs) -"bgU" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/north) "bgV" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 1; @@ -17122,10 +15894,7 @@ /turf/simulated/floor/carpet, /area/station/hallway/secondary/entry) "bhn" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -17167,11 +15936,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) @@ -17192,9 +15957,7 @@ pixel_y = 2 }, /obj/item/vending_refill/cola, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -17209,9 +15972,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -17247,9 +16008,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/item/radio/alternative{ pixel_y = 12 }, @@ -17302,20 +16061,13 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/service/chapel) "bia" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/papershredder, /turf/simulated/floor/wood, /area/station/service/library) @@ -17325,14 +16077,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bih" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /obj/structure/table/wood, /turf/simulated/floor/wood, /area/station/service/library) @@ -17347,9 +16093,7 @@ /turf/space, /area/space/nearstation) "bip" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -17405,11 +16149,7 @@ }, /area/station/hallway/secondary/entry) "biw" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17460,9 +16200,7 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/white/hollow, /obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ @@ -17477,13 +16215,8 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -17616,13 +16349,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bjA" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17647,10 +16375,7 @@ /area/station/service/library) "bjI" = ( /obj/item/kirbyplants, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17659,10 +16384,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/table, /obj/item/reagent_containers/food/condiment/enzyme{ layer = 5; @@ -17716,10 +16438,7 @@ c_tag = "Arrivals Center"; dir = 4 }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -17736,10 +16455,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bjY" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "bkb" = ( @@ -17747,11 +16463,7 @@ c_tag = "Port Hallway 3"; dir = 1 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -17778,18 +16490,14 @@ }, /area/station/hallway/secondary/entry) "bkf" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "bki" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "bkn" = ( @@ -17851,7 +16559,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bky" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/sign/electricshock{ pixel_y = -32 }, @@ -17949,11 +16657,7 @@ pixel_y = 2 }, /obj/item/vending_refill/coffee, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d2 = 8; @@ -17990,11 +16694,7 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18003,11 +16703,7 @@ /obj/structure/railing/cap{ dir = 5 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/effect/landmark/start/explorer, /turf/simulated/floor/plasteel{ dir = 4; @@ -18044,11 +16740,7 @@ c_tag = "Chapel South"; dir = 8 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18066,9 +16758,7 @@ }, /area/station/service/chapel) "blp" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "bls" = ( @@ -18097,11 +16787,7 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18144,10 +16830,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "blE" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -18257,11 +16940,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/central/ne) "bmk" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/railing/cap{ dir = 1 }, @@ -18332,9 +17011,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) "bmD" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/camera{ c_tag = "Library East"; dir = 8 @@ -18342,18 +17019,14 @@ /turf/simulated/floor/wood, /area/station/service/library) "bmE" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cult" }, /area/station/service/library) "bmF" = ( /obj/structure/cult/archives, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -18375,9 +17048,7 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18389,14 +17060,8 @@ }, /area/station/service/chapel) "bmK" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18418,9 +17083,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bmT" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18433,9 +17096,7 @@ }, /area/station/service/chapel) "bmW" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18494,11 +17155,7 @@ }, /area/station/hallway/primary/central/north) "bng" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -18604,10 +17261,7 @@ }, /area/station/command/bridge) "bnr" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -18670,10 +17324,7 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "bnA" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel, /area/station/public/locker) "bnB" = ( @@ -18764,9 +17415,7 @@ pixel_y = 4 }, /obj/item/storage/box/ids, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/command/bridge) "bnV" = ( @@ -18810,10 +17459,7 @@ }, /area/station/command/bridge) "bob" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -18825,9 +17471,7 @@ }, /area/station/hallway/primary/central/ne) "boe" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "bof" = ( @@ -18842,9 +17486,7 @@ /obj/item/assembly/timer, /obj/item/assembly/signaler, /obj/item/assembly/signaler, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/command/bridge) "bol" = ( @@ -18882,11 +17524,7 @@ pixel_x = -2; pixel_y = -2 }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -18919,7 +17557,7 @@ /area/station/service/hydroponics) "boD" = ( /obj/structure/closet/crate/can, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -18957,17 +17595,13 @@ }, /area/station/hallway/secondary/entry) "boP" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/station/hallway/secondary/entry) "boT" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18981,9 +17615,7 @@ /area/station/public/mrchangs) "boV" = ( /obj/structure/closet/secure_closet/bar, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/wood/fancy/oak, /area/station/service/bar) "boW" = ( @@ -19020,11 +17652,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 @@ -19038,11 +17666,7 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "bpc" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "bpd" = ( @@ -19050,9 +17674,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bpe" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel, /area/station/public/locker) "bpf" = ( @@ -19060,9 +17682,7 @@ /obj/item/clothing/shoes/workboots, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/head/hardhat, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/port) "bpl" = ( @@ -19134,21 +17754,21 @@ /area/station/command/bridge) "bpw" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "bridge blast east"; name = "East Bridge Blast Door Control"; pixel_x = 6; pixel_y = -2; req_one_access_txt = "19" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "bridge blast west"; name = "West Bridge Blast Door Control"; pixel_x = -6; pixel_y = -2; req_one_access_txt = "19" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "bridge blast north"; name = "North Bridge Blast Door Control"; pixel_x = 6; @@ -19176,11 +17796,7 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "bpF" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -19194,13 +17810,8 @@ /turf/simulated/floor/carpet, /area/station/service/chapel) "bpQ" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/directional/west, /obj/machinery/economy/vending/chinese, /turf/simulated/floor/carpet, /area/station/public/mrchangs) @@ -19220,43 +17831,28 @@ dir = 8; name = "Library Desk Door" }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/library{ dir = 8 }, /turf/simulated/floor/wood, /area/station/service/library) "bqb" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" }, /area/station/science/hallway) "bqc" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/station/service/library) "bqd" = ( /obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/light_switch/east, /obj/machinery/computer/library, /turf/simulated/floor/wood, /area/station/service/library) @@ -19357,18 +17953,12 @@ /area/station/public/locker) "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 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/public/locker) "bqA" = ( @@ -19402,11 +17992,7 @@ amount = 50 }, /obj/item/storage/toolbox/emergency, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "bqI" = ( @@ -19456,10 +18042,7 @@ /area/station/command/bridge) "bqP" = ( /obj/machinery/computer/secure_data, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -19472,9 +18055,7 @@ /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost","Telecomms") }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -19506,10 +18087,7 @@ /area/station/command/bridge) "bqZ" = ( /obj/machinery/computer/shuttle/mining, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -19527,9 +18105,7 @@ c_tag = "Bridge East" }, /obj/machinery/computer/supplycomp, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -19565,10 +18141,7 @@ }, /area/station/hallway/secondary/entry) "brn" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -19628,11 +18201,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "brB" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "brD" = ( @@ -19674,7 +18243,7 @@ /turf/space, /area/space) "brL" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19796,15 +18365,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bst" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port) "bsv" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -19828,7 +18393,7 @@ }, /area/station/command/bridge) "bsx" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -19910,19 +18475,14 @@ }, /area/station/command/bridge) "bsG" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" }, /area/station/command/bridge) "bsI" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -19952,27 +18512,18 @@ /turf/simulated/wall/r_wall, /area/station/hallway/primary/central/ne) "bsO" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "bsP" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "bsQ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -19981,9 +18532,7 @@ /area/station/public/storage/emergency/port) "bsR" = ( /obj/machinery/computer/arcade, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -20011,10 +18560,7 @@ }, /area/station/maintenance/port) "bta" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -20075,11 +18621,7 @@ /area/station/service/hydroponics) "bts" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -20124,11 +18666,7 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "btH" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -20159,11 +18697,7 @@ /area/station/public/locker) "btT" = ( /obj/structure/closet/secure_closet/personal, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/public/locker) "btU" = ( @@ -20173,11 +18707,7 @@ }, /area/station/service/hydroponics) "btZ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -20187,9 +18717,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/maintcentral2) "bua" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/rcs, /obj/structure/rack{ dir = 8; @@ -20208,9 +18736,7 @@ /area/station/public/storage/tools/auxiliary) "buf" = ( /obj/machinery/door/firedoor, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -20341,17 +18867,11 @@ /area/station/hallway/secondary/entry) "buT" = ( /obj/machinery/economy/vending/cigarette, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "buU" = ( -/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" @@ -20370,10 +18890,7 @@ /area/station/service/chapel) "bvb" = ( /obj/structure/chair/comfy/black, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet, /area/station/public/vacant_office) "bvc" = ( @@ -20417,14 +18934,8 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "bvm" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light_switch/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet, /area/station/public/vacant_office) "bvn" = ( @@ -20486,15 +18997,11 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "bvF" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/port) "bvL" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "bvN" = ( @@ -20508,11 +19015,7 @@ }, /area/station/service/chapel/office) "bvO" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -20521,11 +19024,7 @@ /turf/simulated/floor/carpet, /area/station/service/library) "bvP" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -20594,11 +19093,7 @@ /area/station/command/bridge) "bwc" = ( /obj/structure/closet/emcloset, -/obj/machinery/light_switch{ - dir = 1; - name = "west bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -20616,7 +19111,7 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "bwh" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -20655,9 +19150,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bwx" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bwz" = ( @@ -20724,11 +19217,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/wood, /area/station/public/vacant_office) "bwN" = ( @@ -20755,9 +19244,7 @@ /obj/structure/toilet{ pixel_y = 8 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -20831,9 +19318,7 @@ dir = 5; id = "packageSort1" }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plating, /area/station/supply/office) "bxf" = ( @@ -20888,10 +19373,7 @@ /area/station/command/teleporter) "bxk" = ( /obj/machinery/door/firedoor, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -20920,13 +19402,11 @@ /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "bxp" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, /obj/structure/table/wood/fancy/blue, /obj/item/kirbyplants{ pixel_y = 10 }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -20963,10 +19443,7 @@ /obj/machinery/camera/motion{ c_tag = "AI Upload Chamber" }, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bxu" = ( @@ -20975,10 +19452,7 @@ }, /area/station/command/bridge) "bxw" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -21020,9 +19494,7 @@ }, /area/station/command/bridge) "bxK" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -21056,7 +19528,7 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/landmark/start/assistant, /turf/simulated/floor/wood, /area/station/service/library) @@ -21066,11 +19538,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood, /area/station/service/library) "bxT" = ( @@ -21095,11 +19563,7 @@ /obj/structure/chair/comfy/black{ 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) "bxW" = ( @@ -21130,11 +19594,7 @@ }, /area/station/science/rnd) "bxY" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -21146,11 +19606,7 @@ }, /area/station/command/bridge) "byh" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Vacant Office"; dir = 1 @@ -21230,10 +19686,7 @@ }, /area/station/hallway/primary/central/ne) "byv" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "byw" = ( @@ -21257,11 +19710,7 @@ }, /area/station/hallway/primary/central/west) "byI" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -21286,12 +19735,8 @@ }, /area/station/turret_protected/ai_upload) "byZ" = ( -/obj/machinery/light, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -21327,7 +19772,7 @@ /turf/simulated/floor/plating, /area/station/service/kitchen) "bzl" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -21350,20 +19795,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bzr" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bzu" = ( /obj/structure/toilet{ pixel_y = 8 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/landmark/start/assistant, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -21458,10 +19897,7 @@ /obj/structure/table, /obj/item/storage/box, /obj/item/storage/box, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -21486,10 +19922,7 @@ }, /area/station/supply/office) "bzM" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -21530,10 +19963,7 @@ /turf/simulated/floor/carpet/green, /area/station/command/bridge) "bzU" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -21541,11 +19971,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bAb" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/photocopier, /turf/simulated/floor/wood, /area/station/command/office/ntrep) @@ -21563,7 +19989,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain/bedroom) "bAe" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/public/locker) "bAf" = ( @@ -21606,11 +20032,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bAl" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -21631,17 +20053,11 @@ }, /area/station/service/kitchen) "bAp" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bAq" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bAr" = ( @@ -21663,7 +20079,7 @@ }, /area/station/hallway/primary/starboard/west) "bAy" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -21733,9 +20149,7 @@ /turf/simulated/wall, /area/station/hallway/secondary/exit) "bAN" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -21752,9 +20166,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bAW" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Starboard Primary Hallway 4"; dir = 4 @@ -21812,11 +20224,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bBk" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -21829,9 +20237,7 @@ /area/station/supply/office) "bBp" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/recharger, /turf/simulated/floor/plasteel{ dir = 4; @@ -21897,10 +20303,7 @@ c_tag = "Central Hallway East"; dir = 4 }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -21913,10 +20316,7 @@ }, /area/station/medical/chemistry) "bBN" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -21996,24 +20396,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bCs" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bCu" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bCv" = ( -/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, /area/station/supply/storage) @@ -22055,11 +20447,7 @@ }, /area/station/supply/office) "bCF" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -22114,7 +20502,7 @@ /obj/structure/chair/comfy/black{ dir = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/wood, /area/station/service/library) "bCT" = ( @@ -22130,17 +20518,13 @@ /turf/simulated/floor/engine, /area/station/medical/chemistry) "bCX" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "green" }, /area/station/hallway/secondary/exit) "bCY" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -22165,7 +20549,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "bDa" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bDb" = ( @@ -22190,13 +20574,8 @@ /obj/item/reagent_containers/dropper{ pixel_y = 11 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteyellow" @@ -22239,7 +20618,7 @@ /area/station/medical/reception) "bDk" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/legal/courtroom) "bDl" = ( @@ -22260,11 +20639,8 @@ }, /area/station/medical/reception) "bDp" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "green" }, @@ -22286,19 +20662,12 @@ /area/station/science/robotics) "bDr" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/aft) "bDu" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22309,10 +20678,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bDv" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22325,9 +20691,7 @@ /area/station/public/toilet/lockerroom) "bDx" = ( /obj/structure/closet/toolcloset, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "bDA" = ( @@ -22450,11 +20814,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; @@ -22543,10 +20903,7 @@ }, /area/station/medical/reception) "bEz" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 28 }, @@ -22689,11 +21046,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bFl" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -22705,44 +21058,29 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFp" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -1; - pixel_y = -24; req_one_access_txt = "31" }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bFq" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bFr" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFs" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFu" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -22750,10 +21088,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFv" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFw" = ( @@ -22771,10 +21106,7 @@ }, /area/station/supply/office) "bFz" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFA" = ( @@ -22807,13 +21139,8 @@ }, /area/station/engineering/gravitygenerator) "bFH" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/light/directional/south, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) @@ -22879,11 +21206,7 @@ /turf/simulated/floor/plating, /area/station/medical/morgue) "bFW" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bFX" = ( @@ -22893,17 +21216,11 @@ }, /area/station/medical/morgue) "bFY" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "bFZ" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) @@ -22990,15 +21307,11 @@ }, /area/station/medical/chemistry) "bGj" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bGk" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/hologram/holopad{ pixel_y = 16 }, @@ -23011,9 +21324,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bGm" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -23028,21 +21339,14 @@ /area/station/hallway/secondary/exit) "bGp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/machinery/firealarm/directional/east, +/obj/item/radio/intercom/directional/north, /obj/structure/closet/firecloset/full, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/science/storage) "bGq" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -23128,11 +21432,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -23425,10 +21725,7 @@ /turf/simulated/wall, /area/station/science/robotics) "bIb" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -23472,10 +21769,7 @@ }, /area/station/medical/chemistry) "bIi" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -23503,11 +21797,10 @@ /turf/simulated/floor/plating, /area/station/medical/chemistry) "bIk" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "robotics"; name = "Robotics Lab Shutters Control"; pixel_x = 24; - pixel_y = 32; req_one_access_txt = "29" }, /turf/simulated/floor/plasteel{ @@ -23573,11 +21866,7 @@ c_tag = "Cargo Delivery Office"; dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/telepad_cargo, /turf/simulated/floor/plasteel{ dir = 8; @@ -23613,11 +21902,7 @@ /area/station/turret_protected/ai_upload) "bIM" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask/gold, /obj/item/clothing/mask/cigarette/cigar, @@ -23682,10 +21967,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bIV" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -23699,10 +21981,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bIW" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -23710,10 +21989,7 @@ /obj/machinery/camera{ c_tag = "Cargo Bay North" }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -23723,10 +21999,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bIY" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -23736,19 +22009,12 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bIZ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bJb" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -23808,10 +22074,7 @@ }, /area/station/medical/storage) "bJi" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/table, /obj/item/paper_bin{ pixel_x = 4; @@ -23831,9 +22094,7 @@ pixel_x = 3; pixel_y = 5 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/button/windowtint{ dir = 4; id = "rnd"; @@ -23846,10 +22107,7 @@ }, /area/station/science/rnd) "bJs" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -23868,10 +22126,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/port) "bJx" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -23893,11 +22148,7 @@ }, /area/station/medical/chemistry) "bJE" = ( -/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" @@ -23929,11 +22180,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "bJP" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/camera{ c_tag = "Medbay Surgery East"; dir = 8 @@ -23944,12 +22191,8 @@ }, /area/station/medical/surgery/primary) "bJU" = ( -/obj/machinery/door_control{ - id = "toilet_unit1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/east{ + id = "toilet_unit1" }, /obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ @@ -23990,10 +22233,7 @@ /obj/structure/chair/comfy/teal{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/landmark/start/doctor, /turf/simulated/floor/plasteel{ dir = 6; @@ -24097,11 +22337,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "packageExternal" }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/east, /turf/simulated/floor/plasteel, /area/station/supply/office) "bKF" = ( @@ -24116,9 +22352,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "bKI" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -24188,11 +22422,10 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint2) "bLo" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "rdlab2"; name = "Research and Development Lab Shutters Control"; pixel_x = -24; - pixel_y = 32; req_one_access_txt = "47" }, /obj/effect/landmark/start/scientist, @@ -24202,9 +22435,7 @@ }, /area/station/science/rnd) "bLp" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/machinery/telepad_cargo, /obj/effect/turf_decal/box, /turf/simulated/floor/plasteel{ @@ -24340,7 +22571,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bMb" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -24380,18 +22611,13 @@ }, /area/station/hallway/secondary/entry) "bMi" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = -1; - pixel_y = 24; req_one_access_txt = "31" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -24399,32 +22625,21 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bMn" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" }, /area/station/hallway/primary/central/west) "bMq" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/north, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bMt" = ( /obj/machinery/disposal, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -24442,9 +22657,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "bMJ" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -24452,18 +22665,14 @@ }, /area/station/hallway/primary/central/sw) "bMT" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" }, /area/station/hallway/primary/central/se) "bMW" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -24576,13 +22785,8 @@ dir = 4 }, /obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -24648,15 +22852,10 @@ }, /obj/item/stock_parts/capacitor, /obj/item/stock_parts/manipulator, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/stock_parts/scanning_module, /obj/item/stock_parts/scanning_module, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -24672,12 +22871,8 @@ }, /area/station/hallway/secondary/exit) "bNx" = ( -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -24718,7 +22913,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bNC" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -24807,10 +23002,7 @@ }, /area/station/medical/morgue) "bNM" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -24835,9 +23027,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bNQ" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/economy/vending/robodrobe, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -24857,10 +23047,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bNW" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -24887,18 +23074,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "bOg" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "QMLoaddoor"; layer = 4; name = "Loading Doors"; - pixel_x = -24; pixel_y = -8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; - pixel_x = -24; pixel_y = 8 }, /obj/effect/turf_decal{ @@ -24919,10 +23104,7 @@ }, /area/station/engineering/gravitygenerator) "bOt" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/computer/supplycomp/public{ dir = 4 }, @@ -24954,10 +23136,7 @@ }, /area/station/hallway/primary/central/sw) "bOz" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bOA" = ( @@ -24988,9 +23167,7 @@ }, /area/station/medical/reception) "bOE" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -25048,11 +23225,7 @@ }, /area/station/medical/reception) "bOR" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -25062,9 +23235,7 @@ /area/station/medical/reception) "bOT" = ( /obj/structure/filingcabinet/chestdrawer/autopsy, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -25086,10 +23257,7 @@ "bPe" = ( /obj/effect/decal/warning_stripes/northwest, /obj/machinery/chem_heater, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/engine, /area/station/medical/chemistry) "bPf" = ( @@ -25118,14 +23286,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/alarm/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -25150,7 +23312,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -25192,15 +23354,8 @@ /area/station/science/robotics) "bPz" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light_switch/north, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purplecorner" @@ -25258,11 +23413,10 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyerPort"; name = "Medbay Doors Control"; - normaldoorcontrol = 1; req_access = list(5) }, /obj/item/storage/box/rxglasses{ @@ -25299,10 +23453,7 @@ /area/station/supply/storage) "bPP" = ( /obj/machinery/computer/security/mining, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -25335,17 +23486,12 @@ /area/station/supply/office) "bPX" = ( /obj/structure/closet/emcloset, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bPY" = ( /obj/structure/closet/emcloset, -/obj/machinery/status_display/supply_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/supply_display/north, /obj/effect/turf_decal{ dir = 8 }, @@ -25391,9 +23537,7 @@ }, /area/station/hallway/primary/central/sw) "bQj" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/office) "bQq" = ( @@ -25465,11 +23609,7 @@ /area/station/medical/paramedic) "bQS" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/item/storage/box/syringes{ pixel_y = 16 }, @@ -25531,11 +23671,7 @@ }, /area/station/medical/morgue) "bRg" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -25543,11 +23679,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bRj" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -25585,11 +23717,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ dir = 9; @@ -25675,11 +23803,7 @@ /area/station/public/locker) "bRM" = ( /obj/machinery/autolathe, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel, /area/station/supply/office) "bRN" = ( @@ -25689,12 +23813,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "bRQ" = ( -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/structure/reagent_dispensers/fueltank/chem/east, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Research Robotics Lab"; dir = 8; @@ -25720,9 +23840,7 @@ }, /area/station/science/robotics) "bRU" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25756,9 +23874,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25771,9 +23887,7 @@ "bSo" = ( /obj/effect/decal/warning_stripes/southwest, /obj/machinery/chem_master, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/west, /turf/simulated/floor/engine, /area/station/medical/chemistry) "bSq" = ( @@ -25832,11 +23946,7 @@ }, /area/station/medical/reception) "bSx" = ( -/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" @@ -26005,13 +24115,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/office) "bSR" = ( @@ -26111,9 +24216,7 @@ /area/station/science/rnd) "bTg" = ( /obj/machinery/disposal, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -26133,9 +24236,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "bTq" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/supply/storage) "bTr" = ( @@ -26197,9 +24298,7 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bTI" = ( @@ -26211,9 +24310,7 @@ /obj/item/storage/box/beakers{ pixel_x = 5 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteyellow" @@ -26229,11 +24326,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -26347,11 +24440,7 @@ range = 10 }, /obj/effect/landmark/start/paramedic, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -26458,20 +24547,12 @@ /turf/simulated/floor/wood, /area/station/command/office/hos) "bUG" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bUH" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -26480,19 +24561,13 @@ /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" }, /area/station/command/office/rd) "bUN" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; @@ -26586,11 +24661,7 @@ pixel_y = 8; req_one_access_txt = "41" }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; @@ -26616,11 +24687,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "bVw" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "bVx" = ( @@ -26644,11 +24711,7 @@ }, /area/station/aisat/atmos) "bVA" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -26827,20 +24890,14 @@ /area/station/science/robotics) "bWl" = ( /obj/structure/closet/secure_closet/roboticist, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, /area/station/science/robotics) "bWq" = ( /obj/structure/closet/firecloset, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -26941,9 +24998,7 @@ }, /area/station/science/misc_lab) "bWS" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -26953,7 +25008,7 @@ /turf/simulated/wall, /area/station/maintenance/storage) "bWU" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/economy/merch, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -27057,7 +25112,7 @@ /obj/machinery/computer/cloning{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -27076,11 +25131,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, -/obj/machinery/light, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -27204,10 +25256,7 @@ pixel_x = -32; pixel_y = 32 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -27257,16 +25306,12 @@ /turf/simulated/floor/plating, /area/station/command/office/blueshield) "bYG" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/papershredder, /turf/simulated/floor/plasteel, /area/station/supply/office) "bYH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/computer/guestpass{ pixel_y = -28 }, @@ -27307,13 +25352,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "bYJ" = ( -/obj/machinery/status_display/supply_display{ - pixel_x = 32 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/status_display/supply_display/east, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -27519,11 +25559,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/item/pen{ pixel_x = -5; pixel_y = 7 @@ -27547,14 +25583,8 @@ /area/station/medical/medbay) "bZw" = ( /obj/structure/closet/radiation, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/machinery/power/apc/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 6; @@ -27565,11 +25595,7 @@ /obj/machinery/camera{ c_tag = "Medbay Waiting Room" }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ dir = 5; @@ -27579,11 +25605,7 @@ "bZE" = ( /obj/structure/chair/comfy/teal, /obj/effect/landmark/start/doctor, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -27598,9 +25620,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/camera{ c_tag = "Virology Observation"; dir = 4 @@ -27633,11 +25653,7 @@ "bZJ" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/camera{ c_tag = "Medbay Treatment West"; dir = 4 @@ -27679,9 +25695,7 @@ }, /area/station/medical/virology) "bZP" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Medbay Hallway North" }, @@ -27702,9 +25716,7 @@ /turf/simulated/wall, /area/station/supply/miningdock) "can" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Medbay Lobby"; dir = 4 @@ -27764,14 +25776,8 @@ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner" }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_y = 32 - }, +/obj/item/radio/intercom/directional/west, +/obj/structure/reagent_dispensers/fueltank/chem/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -27792,21 +25798,14 @@ }, /area/station/science/robotics) "caw" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" }, /area/station/hallway/primary/central/sw) "cay" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ dir = 1; @@ -27829,9 +25828,7 @@ /turf/simulated/wall, /area/station/medical/sleeper) "caC" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27963,9 +25960,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -28060,10 +26055,7 @@ }, /area/station/science/server) "cbo" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "cbq" = ( @@ -28078,9 +26070,7 @@ /turf/simulated/floor/grass, /area/station/medical/sleeper) "cbs" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cbu" = ( @@ -28099,9 +26089,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -28371,10 +26359,7 @@ }, /area/station/science/robotics) "ccj" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -28403,30 +26388,21 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "ccn" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" }, /area/station/hallway/primary/central/se) "cco" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" }, /area/station/hallway/primary/central/se) "ccq" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -28448,17 +26424,13 @@ pixel_x = 5; pixel_y = 8 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -28557,9 +26529,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -28770,11 +26740,7 @@ /area/station/maintenance/apmaint) "cdI" = ( /obj/machinery/door/firedoor, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -28809,11 +26775,7 @@ /area/station/science/hallway) "cdQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/item/stack/cable_coil, /obj/structure/cable{ d1 = 1; @@ -28823,11 +26785,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) "cdS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -28838,10 +26796,7 @@ }, /area/station/hallway/primary/central/sw) "cdT" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -28863,19 +26818,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "cdV" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" }, /area/station/hallway/primary/central/sw) "cdX" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -28965,19 +26915,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "cet" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" }, /area/station/hallway/primary/central/south) "ceu" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" @@ -28995,10 +26940,7 @@ }, /area/station/hallway/primary/central/south) "cex" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -29014,29 +26956,21 @@ /obj/machinery/camera{ c_tag = "Central Primary Hallway South" }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" }, /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 = 4; icon_state = "bluecorner" }, /area/station/hallway/primary/central/south) "ceD" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" @@ -29127,9 +27061,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "cfc" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/storage/firstaid/regular, /turf/simulated/floor/plasteel{ @@ -29156,11 +27088,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "cfi" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "cfm" = ( @@ -29175,9 +27103,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "cfn" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -29230,10 +27156,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cfB" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "cfE" = ( @@ -29300,14 +27223,9 @@ }, /area/station/science/toxins/mixing) "cfL" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -29319,11 +27237,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cfR" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/wall, /area/station/medical/reception) "cfW" = ( @@ -29382,7 +27296,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio4"; name = "Chamber 4 Containment Blast Doors"; pixel_y = 4; @@ -29444,11 +27358,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "cgq" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -29457,11 +27367,7 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/mixing) "cgv" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29586,9 +27492,7 @@ /turf/simulated/wall, /area/station/medical/paramedic) "chk" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -29653,11 +27557,7 @@ }, /area/station/medical/reception) "chu" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/camera{ c_tag = "Medbay Surgery West"; dir = 4 @@ -29750,11 +27650,7 @@ /turf/simulated/floor/plating, /area/station/command/office/ntrep) "chJ" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/carpet, /area/station/medical/psych) @@ -29776,14 +27672,8 @@ }, /area/station/medical/storage) "chL" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/structure/sink/directional/west, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -29810,10 +27700,7 @@ /obj/structure/table/glass, /obj/item/pen/multi, /obj/item/paper_bin/nanotrasen, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/camera{ c_tag = "Research Director's Office"; network = list("Research","SS13") @@ -29849,9 +27736,7 @@ }, /area/station/engineering/atmos) "chU" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle{ pixel_x = 4 @@ -29862,7 +27747,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "chX" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -29934,11 +27819,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" @@ -29949,11 +27830,7 @@ /turf/simulated/floor/plating, /area/station/command/office/ntrep) "ciE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -30091,9 +27968,7 @@ "cjf" = ( /obj/structure/table/glass, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port) "cjg" = ( @@ -30102,10 +27977,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "cjh" = ( -/obj/machinery/light, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "cjj" = ( @@ -30121,11 +27994,7 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "cjm" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Central Primary Hallway Psychiatrist Office"; dir = 1 @@ -30173,9 +28042,7 @@ }, /area/station/medical/medbay) "cjw" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -30191,9 +28058,7 @@ }, /area/station/medical/patients_rooms) "cjz" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -30245,11 +28110,7 @@ /obj/machinery/computer/card/minor/rd{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkpurple" @@ -30305,10 +28166,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "ckg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -30337,11 +28195,7 @@ c_tag = "Mining Dock"; dir = 8 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -30425,9 +28279,7 @@ c_tag = "Medbay Surgery Observation"; dir = 1 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -30482,7 +28334,7 @@ }, /area/station/command/office/cmo) "ckF" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -30502,9 +28354,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "ckI" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ department = "NT Representative's Office" @@ -30618,11 +28468,7 @@ /turf/simulated/wall, /area/station/command/office/rd) "clc" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -30690,7 +28536,7 @@ }, /area/station/command/office/cmo) "cln" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -4; @@ -30705,10 +28551,9 @@ pixel_y = -2 }, /obj/structure/table/glass, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "rdofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = -4; pixel_y = -4; req_one_access_txt = "30" @@ -30728,9 +28573,7 @@ /obj/machinery/computer/mecha{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkpurple" @@ -30752,9 +28595,7 @@ /area/station/maintenance/apmaint) "clw" = ( /obj/machinery/atmospherics/portable/canister/carbon_dioxide, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/science/storage) "clA" = ( @@ -30785,16 +28626,11 @@ c_tag = "Research Toxins Test Chamber North"; network = list("Toxins","Research","SS13") }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "clJ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 28 }, @@ -30851,9 +28687,7 @@ }, /area/station/medical/reception) "clW" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" @@ -30882,22 +28716,14 @@ level = 3; name = "Distribution and Waste Monitor" }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" }, /area/station/engineering/controlroom) "cma" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -30963,11 +28789,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch for secure storage."; id = "enginestorage"; name = "Engineering Engine Storage"; - pixel_y = 24; req_access_txt = "11" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31062,10 +28887,8 @@ }, /area/station/command/office/cmo) "cmv" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/keycard_auth/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -31119,7 +28942,7 @@ /area/station/medical/surgery/primary) "cmK" = ( /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31147,9 +28970,7 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/structure/closet/cabinet, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "cmU" = ( @@ -31162,9 +28983,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cmV" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, @@ -31179,17 +28998,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/bot, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel, /area/station/science/storage) "cmZ" = ( @@ -31240,11 +29051,7 @@ /turf/simulated/wall, /area/station/science/toxins/test) "cnm" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -31258,7 +29065,7 @@ }, /area/station/supply/miningdock) "cns" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -31359,10 +29166,9 @@ /area/station/medical/medbay2) "cnN" = ( /obj/structure/table/glass, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "cmoofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = -4; req_one_access_txt = "40" }, @@ -31371,7 +29177,7 @@ pixel_x = 7; pixel_y = 6 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "Biohazard_medi"; name = "Emergency Medbay Quarantine"; pixel_x = -4; @@ -31390,11 +29196,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -31418,11 +29220,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" @@ -31475,14 +29273,8 @@ }, /area/station/medical/medbay2) "cnZ" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/machinery/status_display/directional/west, +/obj/structure/sink/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -31599,9 +29391,7 @@ /area/station/hallway/primary/aft) "coH" = ( /obj/machinery/computer/med_data/laptop, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/structure/table/wood, /turf/simulated/floor/wood, /area/station/command/office/ntrep) @@ -31634,10 +29424,7 @@ /area/station/supply/miningdock) "coT" = ( /obj/machinery/computer/crew, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "coU" = ( @@ -31679,7 +29466,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -31750,11 +29537,7 @@ /area/station/science/server) "cpv" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer/on/server, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/camera{ c_tag = "Research Server Room"; network = list("Research","SS13"); @@ -31830,7 +29613,7 @@ }, /area/station/science/server) "cpE" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cpI" = ( @@ -31851,9 +29634,7 @@ /obj/machinery/atmospherics/binary/valve/open{ name = "Virology Air Supply" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cpR" = ( @@ -31943,9 +29724,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -32023,11 +29802,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -32057,9 +29833,7 @@ }, /area/station/maintenance/aft) "cqQ" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -32071,9 +29845,7 @@ /area/station/maintenance/port) "cqT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -32084,10 +29856,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "cqZ" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -32108,10 +29877,7 @@ pixel_y = 2 }, /obj/structure/table, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -32210,9 +29976,7 @@ /obj/structure/table, /obj/item/ashtray/bronze, /obj/item/clothing/mask/cigarette, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -32263,9 +30027,7 @@ }, /area/station/science/hallway) "crJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "purple" @@ -32469,9 +30231,7 @@ /obj/machinery/chem_dispenser/soda{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "csC" = ( @@ -32558,9 +30318,7 @@ }, /area/station/science/hallway) "csN" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -32766,20 +30524,14 @@ }, /area/station/medical/morgue) "ctz" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/station/command/office/cmo) "ctC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, @@ -32882,7 +30634,7 @@ /area/station/hallway/primary/aft) "ctY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -32945,9 +30697,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -33107,11 +30857,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -33186,9 +30932,7 @@ }, /area/station/medical/patients_rooms) "cuN" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -33215,22 +30959,14 @@ /turf/simulated/floor/plating, /area/station/aisat/hall) "cuZ" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/reagent_dispensers/watertank, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "cva" = ( /obj/structure/closet/l3closet/scientist, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "cvb" = ( @@ -33276,11 +31012,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/apmaint) "cvr" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) @@ -33421,10 +31153,7 @@ }, /area/station/medical/virology) "cvP" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkblue" @@ -33567,9 +31296,7 @@ }, /area/station/science/genetics) "cwr" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -33706,9 +31433,7 @@ pixel_x = -4; pixel_y = -4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/reagent_containers/food/drinks/mug/sci{ desc = "A purple mug with a small piece of duct tape on it that has 'Janitor's' written on it in sharpie. Looks a bit too.. scientific to belong to the Janitor."; name = "Janitor's mug"; @@ -33735,10 +31460,7 @@ }, /area/station/engineering/atmos) "cxn" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/carpet, /area/station/medical/psych) "cxo" = ( @@ -33754,8 +31476,7 @@ /area/station/hallway/primary/aft) "cxt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -33846,10 +31567,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/aft) "cxP" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -33989,10 +31707,7 @@ /area/station/maintenance/apmaint) "cyn" = ( /obj/structure/closet/emcloset, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -34034,11 +31749,7 @@ }, /area/station/public/construction) "cyt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -34055,10 +31766,8 @@ }, /area/station/engineering/break_room) "cyw" = ( -/obj/machinery/power/apc{ - name = "south bump Engineering"; - pixel_y = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/south{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 8; @@ -34070,10 +31779,7 @@ }, /area/station/engineering/break_room) "cyx" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/closet/l3closet/janitor, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -34102,11 +31808,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "cyA" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -34174,10 +31876,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34281,7 +31980,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/reagent_containers/food/drinks/britcup{ initialized = 1; list_reagents = list("tea"=15); @@ -34476,9 +32175,7 @@ /area/station/service/janitor) "czD" = ( /obj/structure/closet/radiation, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/window/basic{ dir = 4 }, @@ -34588,10 +32285,7 @@ /area/station/medical/surgery/primary) "czY" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -34618,7 +32312,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cAg" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/turretid/stun{ control_area = "\improper AI Satellite Antechamber"; name = "AI Antechamber Turret Control"; @@ -34661,14 +32355,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "cAo" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/small/directional/west, +/obj/item/radio/intercom/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable{ d1 = 1; @@ -34688,11 +32376,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cAq" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/chair/comfy/teal{ dir = 4 }, @@ -34736,11 +32420,7 @@ "cAD" = ( /obj/structure/table/glass, /obj/item/storage/box/syringes, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/book/manual/wiki/sop_science, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" @@ -34850,9 +32530,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "cBj" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/sign/fire{ pixel_y = 32 }, @@ -34866,11 +32544,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/tech_storage) "cBl" = ( -/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; @@ -34882,11 +32556,7 @@ /turf/simulated/floor/bluegrid, /area/station/aisat/hall) "cBn" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) @@ -34901,11 +32571,7 @@ "cBq" = ( /obj/structure/table, /obj/item/mounted/frame/apc_frame, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/camera{ c_tag = "Engineering Drone Fabricator Room"; dir = 4; @@ -34980,9 +32646,7 @@ /area/station/engineering/atmos) "cBB" = ( /obj/machinery/door/firedoor, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -35016,11 +32680,7 @@ }, /area/station/engineering/hallway) "cBF" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -35028,11 +32688,7 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "cBG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -35053,20 +32709,12 @@ }, /area/station/medical/surgery/secondary) "cBJ" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/station/service/janitor) "cBL" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/jcloset, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -35275,11 +32923,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -35311,10 +32955,7 @@ /area/station/medical/surgery/primary) "cCX" = ( /obj/structure/closet/emcloset, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -35424,11 +33065,7 @@ dir = 1; network = list("SS13","Research") }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -35443,9 +33080,7 @@ /area/station/hallway/primary/aft) "cDz" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35482,10 +33117,7 @@ pixel_x = 4; pixel_y = -2 }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -35495,17 +33127,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/station/engineering/gravitygenerator) "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" = ( @@ -35531,7 +33160,7 @@ }, /area/station/engineering/atmos) "cDL" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -35544,13 +33173,11 @@ dir = 1; network = list("Toxins","Research","SS13") }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "cDO" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -35565,10 +33192,7 @@ /area/station/maintenance/incinerator) "cDQ" = ( /obj/structure/closet/toolcloset, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "cDR" = ( @@ -35594,10 +33218,9 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "cDV" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "disvent"; name = "Incinerator Vent Control"; - pixel_y = -24; req_one_access_txt = "12" }, /obj/machinery/atmospherics/meter, @@ -35618,11 +33241,7 @@ }, /area/station/engineering/atmos) "cDX" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, @@ -35640,11 +33259,7 @@ }, /area/station/hallway/primary/aft) "cDZ" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/binary/pump/on{ dir = 4 @@ -35667,11 +33282,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cEd" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35697,7 +33308,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "cEj" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/economy/vending/janidrobe, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -35709,9 +33320,7 @@ pixel_y = 9 }, /obj/item/pen, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -35750,9 +33359,7 @@ }, /area/station/engineering/break_room) "cEs" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -35776,9 +33383,7 @@ /turf/simulated/wall, /area/station/maintenance/aft) "cEy" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/loading_area, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -35841,9 +33446,7 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "cEL" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/port) "cEM" = ( @@ -35860,20 +33463,14 @@ "cES" = ( /obj/structure/table, /obj/item/rcs, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/station/supply/miningdock) "cEV" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -35892,10 +33489,7 @@ /obj/structure/sign/poster/official/safety_eye_protection{ pixel_x = -29 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, /area/station/science/storage) "cFh" = ( @@ -35922,9 +33516,7 @@ anchored = 1 }, /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cFm" = ( @@ -35948,9 +33540,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ layer = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -35963,9 +33553,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ layer = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -36033,10 +33621,7 @@ }, /area/station/science/misc_lab) "cFJ" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -36062,9 +33647,7 @@ dir = 1 }, /obj/machinery/atmospherics/meter, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral2) "cFT" = ( @@ -36302,17 +33885,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "cGJ" = ( /obj/item/kirbyplants, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -36334,9 +33913,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ layer = 2 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -36346,25 +33923,15 @@ /obj/machinery/photocopier{ toner = 0 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/office) "cGS" = ( /obj/structure/table, /obj/item/camera, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/office) @@ -36392,11 +33959,7 @@ /obj/structure/closet/secure_closet/exile, /obj/effect/decal/warning_stripes/white/hollow, /obj/effect/decal/warning_stripes/northeast, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36450,9 +34013,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -36585,10 +34146,7 @@ /area/station/engineering/tech_storage) "cHw" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36605,10 +34163,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cHz" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/structure/cable{ d1 = 1; @@ -36685,9 +34240,7 @@ name = "Prison Intercom (General)"; pixel_x = 22 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -36881,9 +34434,7 @@ pixel_x = 9; pixel_y = -9 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cIh" = ( @@ -36960,9 +34511,7 @@ /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_y = 30 - }, +/obj/structure/reagent_dispensers/spacecleanertank/north, /turf/simulated/floor/plasteel, /area/station/service/janitor) "cIp" = ( @@ -37069,7 +34618,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "RnDChem"; name = "Chamber Blast Doors"; pixel_x = 3; @@ -37123,10 +34672,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "telescienceblast"; - name = "Test Chamber Blast Doors"; - pixel_y = -25 + name = "Test Chamber Blast Doors" }, /obj/structure/cable{ d1 = 4; @@ -37147,21 +34695,18 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch for the engineering lobby emergency supply room."; id = "engemergencyeva"; name = "Lobby Emergency Supply"; pixel_x = -6; - pixel_y = 30; req_access_txt = "32" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/north{ desc = "A remote control-switch for the engineering lobby doors."; id = "englobby"; name = "Lobby Entrance"; - normaldoorcontrol = 1; pixel_x = 6; - pixel_y = 30; req_access_txt = "32" }, /obj/structure/disposalpipe/segment, @@ -37185,11 +34730,7 @@ }, /area/station/hallway/primary/aft) "cIV" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "yellow" @@ -37212,11 +34753,7 @@ pixel_x = 5; pixel_y = -5 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cIX" = ( @@ -37283,11 +34820,10 @@ dir = 1; network = list("SS13","Engineering") }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch for the SM Radiation Security Shutters"; id = "engsm2"; - name = "SM Door Radiation Shutters Control"; - pixel_y = -27 + name = "SM Door Radiation Shutters Control" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -37404,7 +34940,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio6"; name = "Chamber 6 Containment Blast Doors"; pixel_y = 4; @@ -37414,11 +34950,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/machinery/camera/motion{ c_tag = "EVA Motion Sensor"; dir = 4 @@ -37498,11 +35030,7 @@ pixel_x = 28; pixel_y = -10 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/requests_console{ department = "AI"; departmentType = 5; @@ -37651,12 +35179,8 @@ }, /area/station/maintenance/fsmaint) "cKv" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37683,9 +35207,7 @@ /obj/item/circuitboard/mechfab{ pixel_y = 3 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cKD" = ( @@ -37742,11 +35264,7 @@ }, /area/station/maintenance/aft) "cKT" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -37783,10 +35301,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/tech_storage) "cLa" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -37813,9 +35328,7 @@ /obj/machinery/conveyor/south{ id = "Skynet_heavy" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) "cLh" = ( @@ -37943,9 +35456,7 @@ "cLD" = ( /obj/structure/table, /obj/item/lightreplacer, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cLE" = ( @@ -37978,10 +35489,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cLK" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -38135,10 +35643,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "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" = ( @@ -38235,11 +35740,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/cyan{ dir = 5 }, @@ -38260,11 +35761,7 @@ }, /area/station/maintenance/asmaint2) "cNl" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/structure/closet/firecloset/full, /turf/simulated/floor/plasteel{ dir = 10; @@ -38300,9 +35797,7 @@ }, /area/station/engineering/atmos) "cNx" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -38516,9 +36011,7 @@ dir = 1; network = list("SS13","engine","Engineering") }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38589,14 +36082,8 @@ }, /area/station/engineering/hallway) "cOu" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/engine, /area/station/science/test_chamber) @@ -38607,10 +36094,9 @@ /obj/structure/barricade/wooden{ layer = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "maint_house"; - name = "shutter door controller"; - pixel_y = 24 + name = "shutter door controller" }, /obj/structure/cable{ d1 = 4; @@ -38644,11 +36130,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/assembly_line) "cOA" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -38725,19 +36207,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkyellowcorners" }, /area/station/engineering/hallway) "cON" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, @@ -38813,11 +36289,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" = ( @@ -38879,22 +36351,15 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/portsolar) "cPx" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "cPy" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "Engineering Engine Super APC"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 5000 }, /obj/structure/cable{ d2 = 8; @@ -38906,11 +36371,7 @@ /area/station/engineering/control) "cPz" = ( /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; @@ -38926,10 +36387,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/window/reinforced{ dir = 1 }, @@ -38940,9 +36398,7 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -38992,9 +36448,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cPH" = ( @@ -39069,7 +36523,7 @@ /turf/simulated/floor/engine/vacuum, /area/station/maintenance/turbine) "cPU" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -39127,9 +36581,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/supermatter_room) "cQg" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Engineering Atmos East"; network = list("SS13","Engineering") @@ -39255,9 +36707,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "cQB" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "purple" @@ -39269,9 +36719,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cQE" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -39425,20 +36873,13 @@ }, /area/station/engineering/atmos/control) "cQU" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/north, /obj/structure/engineeringcart, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cQW" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/engineering/break_room) "cQX" = ( @@ -39490,11 +36931,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -39546,10 +36983,7 @@ dir = 8; layer = 2.9 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plating, @@ -39578,7 +37012,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39588,11 +37022,8 @@ pixel_x = -1 }, /obj/effect/decal/warning_stripes/blue/hollow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 4; @@ -39714,11 +37145,7 @@ /obj/item/clothing/head/welding, /obj/item/storage/belt/utility, /obj/item/multitool, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/effect/decal/warning_stripes/white/hollow, /obj/item/storage/belt/utility, /obj/item/multitool, @@ -39751,11 +37178,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -39799,11 +37222,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -39827,9 +37246,7 @@ }, /area/station/engineering/hallway) "cRX" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/camera{ c_tag = "Engineering Foyer East"; network = list("SS13","Engineering") @@ -39855,11 +37272,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "cSa" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39935,10 +37348,7 @@ }, /area/station/engineering/atmos/control) "cSm" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -39952,11 +37362,8 @@ }, /area/station/engineering/atmos) "cSq" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump Engineering"; - pixel_x = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/east{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 8; @@ -39969,11 +37376,10 @@ /area/station/engineering/hallway) "cSr" = ( /obj/effect/decal/warning_stripes/yellow/partial, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch for the engineering lobby emergency supply room."; id = "engemergencyeva"; name = "Lobby Emergency Supply"; - pixel_x = -24; pixel_y = 6; req_access_txt = "32" }, @@ -40005,11 +37411,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -40058,10 +37460,7 @@ /area/station/engineering/secure_storage) "cSF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -40083,9 +37482,7 @@ c_tag = "Xenobiology Module North"; network = list("Research","SS13") }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -40151,11 +37548,7 @@ dir = 1; network = list("SS13","engine","Engineering") }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" }, @@ -40194,9 +37587,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/control) "cSV" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -40204,11 +37595,7 @@ /area/station/public/mrchangs) "cSW" = ( /obj/structure/statue/chickenstatue, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/carpet, /area/station/public/mrchangs) "cSX" = ( @@ -40232,11 +37619,7 @@ /turf/simulated/floor/plasteel/stairs, /area/station/engineering/supermatter_room) "cSZ" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -40303,7 +37686,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "cTn" = ( @@ -40321,7 +37704,7 @@ /turf/space, /area/space/nearstation) "cTo" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -40330,11 +37713,7 @@ }, /area/station/engineering/gravitygenerator) "cTp" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/field/generator, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plating, @@ -40524,11 +37903,7 @@ /obj/structure/table, /obj/item/apc_electronics, /obj/item/airlock_electronics, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -40536,10 +37911,7 @@ /area/station/public/storage/tools/auxiliary) "cTT" = ( /obj/structure/table, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/item/radio/alternative{ pixel_y = 6; pixel_x = -8 @@ -40561,15 +37933,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cTV" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Engineering Chief Engineer's Office"; dir = 1 }, -/obj/machinery/keycard_auth{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/keycard_auth/south, /obj/machinery/computer/security/engineering{ dir = 1; network = list("Power Alarms","Atmosphere Alarms","Fire Alarms","Engineering","Singularity","engine") @@ -40603,9 +37972,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cUe" = ( @@ -40644,11 +38011,8 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "cUj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 2; @@ -40840,10 +38204,7 @@ }, /area/station/security/brig) "cUS" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -41024,10 +38385,8 @@ icon_state = "1-8" }, /obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump Engineering"; - pixel_y = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/south{ + cell_type = 2500 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -41062,16 +38421,14 @@ /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, /obj/item/geiger_counter, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcorners" }, /area/station/engineering/supermatter_room) "cVH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -41110,13 +38467,8 @@ /area/station/engineering/break_room) "cVN" = ( /obj/structure/closet/firecloset, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -41127,7 +38479,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" }, @@ -41146,10 +38498,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cVS" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, /obj/machinery/camera{ @@ -41225,10 +38574,7 @@ /area/station/legal/courtroom) "cWm" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/portable/canister, /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -41265,9 +38611,7 @@ /area/station/science/xenobiology) "cWt" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -41277,22 +38621,14 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cWx" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/station/engineering/aitransit) "cWz" = ( -/obj/machinery/light/small, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/small/directional/north, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41348,9 +38684,7 @@ /obj/effect/overlay/coconut{ pixel_y = -6 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/beach/sand, /area/station/hallway/secondary/exit) "cWI" = ( @@ -41437,11 +38771,7 @@ /area/station/hallway/primary/aft) "cWV" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -41460,10 +38790,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "cWX" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41553,19 +38880,12 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) "cXs" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -41614,13 +38934,8 @@ "cXG" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/north, /obj/structure/window/reinforced{ dir = 8 }, @@ -41638,11 +38953,7 @@ /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) "cXO" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -41800,9 +39111,7 @@ }, /area/station/engineering/supermatter_room) "cYe" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -41850,13 +39159,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cYq" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/stairs/left{ dir = 1 }, @@ -41899,11 +39206,7 @@ /area/station/engineering/control) "cYH" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/office) @@ -42003,9 +39306,7 @@ "cYV" = ( /obj/structure/rack, /obj/item/storage/toolbox/electrical, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -42034,11 +39335,7 @@ /area/station/maintenance/fsmaint) "cZa" = ( /obj/structure/table, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -42046,11 +39343,7 @@ /obj/item/storage/firstaid/regular{ pixel_y = 2 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42075,11 +39368,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42108,20 +39397,13 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cZj" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/station/hallway/primary/central/west) "cZn" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -42130,11 +39412,7 @@ "cZp" = ( /obj/item/stack/cable_coil, /obj/structure/table/glass, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/item/weldingtool/research, /obj/structure/cable{ d2 = 2; @@ -42146,9 +39424,7 @@ }, /area/station/science/rnd) "cZq" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/closet/l3closet/scientist, /obj/structure/cable{ d1 = 1; @@ -42162,7 +39438,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio7"; name = "Chamber 7 Containment Blast Doors"; pixel_y = 4; @@ -42173,9 +39449,7 @@ "cZt" = ( /obj/structure/rack, /obj/item/storage/box/syringes, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/window/reinforced{ dir = 4 }, @@ -42218,11 +39492,7 @@ }, /area/station/science/xenobiology) "cZz" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 4; @@ -42391,11 +39661,7 @@ }, /area/station/engineering/supermatter_room) "daa" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) @@ -42413,14 +39679,8 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -42607,9 +39867,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 8; @@ -42640,7 +39898,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/sign/securearea{ pixel_y = -32 }, @@ -42682,10 +39940,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -42824,9 +40079,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dbD" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners" }, @@ -42850,11 +40103,7 @@ pixel_y = 6 }, /obj/structure/table, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -42893,11 +40142,7 @@ pixel_x = 3; pixel_y = -7 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/effect/decal/warning_stripes/white/hollow, /obj/machinery/camera{ c_tag = "EVA"; @@ -42992,11 +40237,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "dcl" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -43093,9 +40335,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel{ dir = 8; @@ -43382,10 +40622,7 @@ /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "ddG" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -43598,21 +40835,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/station/medical/patients_rooms) "deu" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "Engineering Engine Super APC"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 5000 }, /obj/structure/cable{ d2 = 2; @@ -43659,10 +40889,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, @@ -43684,12 +40911,8 @@ }, /obj/structure/table, /obj/item/storage/toolbox/electrical, -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/smes) "deB" = ( @@ -43703,20 +40926,13 @@ 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{ icon_state = "yellow" }, /area/station/engineering/smes) "deD" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -43786,11 +41002,7 @@ /area/station/aisat/hall) "deL" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/item/megaphone, /obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus, @@ -43798,10 +41010,7 @@ /obj/item/rcd_ammo/large, /obj/item/rcd_ammo/large, /obj/item/rcd/preloaded, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkyellow" @@ -43831,9 +41040,7 @@ /area/station/engineering/atmos/storage) "deP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -43862,11 +41069,8 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) @@ -43893,11 +41097,9 @@ pixel_y = 8; req_access_txt = "56" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/west{ id = "ceofficedoor"; name = "Office Doors"; - normaldoorcontrol = 1; - pixel_x = -16; pixel_y = -2; req_access_txt = "56" }, @@ -43960,9 +41162,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "dfn" = ( @@ -44019,11 +41219,7 @@ /area/station/engineering/engine/supermatter) "dft" = ( /obj/machinery/disposal, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -44062,9 +41258,7 @@ /turf/simulated/floor/plating, /area/station/aisat/atmos) "dfD" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -44200,7 +41394,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dgi" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, @@ -44236,9 +41430,7 @@ }, /area/station/engineering/equipmentstorage) "dgp" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -44346,10 +41538,7 @@ "dgH" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/mug, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/wood, /area/station/public/mrchangs) @@ -44367,18 +41556,14 @@ /area/station/engineering/atmos) "dgM" = ( /obj/effect/decal/warning_stripes/eastnorthwest, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/engineering/supermatter_room) "dgN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/mapping_helpers/machinery/damaged, /turf/simulated/floor/plating, /area/station/engineering/control) @@ -44414,10 +41599,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) "dgT" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/structure/transit_tube{ dir = 4; icon_state = "Block" @@ -44500,28 +41682,16 @@ pixel_x = 2; pixel_y = 6 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/public/mrchangs) "dhq" = ( -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/wood, /area/station/public/mrchangs) "dhv" = ( @@ -44752,10 +41922,7 @@ /obj/machinery/camera{ c_tag = "Central Hallway North" }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" @@ -44763,13 +41930,8 @@ /area/station/hallway/primary/central/north) "dix" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -44791,16 +41953,11 @@ }, /area/station/turret_protected/aisat/interior) "diD" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/rack, /obj/item/screwdriver, /obj/item/radio, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44824,10 +41981,7 @@ }, /area/station/turret_protected/aisat/interior) "diG" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44929,7 +42083,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" }, @@ -44946,9 +42100,7 @@ }, /area/station/engineering/supermatter_room) "djb" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/structure/table, /obj/structure/railing{ dir = 8 @@ -44970,14 +42122,8 @@ /area/space/nearstation) "dje" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/power/apc/directional/north, +/obj/machinery/light/directional/south, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -45086,14 +42232,9 @@ }, /area/station/engineering/control) "djv" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/light/directional/south, +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 8; @@ -45149,10 +42290,8 @@ icon_state = "0-8" }, /obj/structure/chair, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/directional/east{ + cell_type = 15000 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45232,11 +42371,7 @@ }, /area/station/engineering/atmos/control) "djV" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -45253,9 +42388,7 @@ }, /area/station/hallway/primary/central/nw) "djZ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -45277,10 +42410,7 @@ }, /area/station/turret_protected/aisat/interior) "dkd" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -45321,19 +42451,14 @@ }, /area/station/engineering/atmos/control) "dkm" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/station/hallway/primary/central/ne) "dkn" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "dkr" = ( @@ -45355,9 +42480,7 @@ /obj/machinery/camera{ c_tag = "Central Hallway North-East" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "dkz" = ( @@ -45376,27 +42499,19 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dkC" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Engineering Atmos Center North"; network = list("SS13","Engineering") }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/station/engineering/atmos) "dkD" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "dkH" = ( @@ -45495,7 +42610,7 @@ /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) "dkU" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -45516,9 +42631,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, @@ -45567,9 +42680,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/plasteel{ dir = 4; @@ -45640,23 +42751,20 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/south{ id = "blueshieldofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = 6; - pixel_y = -24; req_access_txt = "67" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "blueshield"; name = "Privacy Shutters Control"; pixel_x = -6; - pixel_y = -24; req_access_txt = "67" }, -/obj/machinery/keycard_auth{ - pixel_y = -35 +/obj/machinery/keycard_auth/south{ + pixel_y = -32 }, /obj/effect/landmark/start/blueshield, /obj/structure/cable{ @@ -45701,9 +42809,7 @@ /area/space/nearstation) "dlx" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ dir = 4; @@ -45731,9 +42837,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dlR" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -46035,14 +43139,11 @@ }, /area/station/engineering/supermatter_room) "dmS" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door_control{ +/obj/machinery/light/directional/west, +/obj/machinery/door_control/shutter/east{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; - pixel_x = 24; req_access_txt = "11" }, /turf/simulated/floor/plasteel{ @@ -46102,7 +43203,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "dmY" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dnc" = ( @@ -46146,14 +43247,8 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/aft) "dnh" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -46323,9 +43418,7 @@ }, /area/station/turret_protected/ai) "dnG" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/public/locker) "dnI" = ( @@ -46358,9 +43451,7 @@ }, /area/station/service/library) "dnN" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "stairs-l" }, @@ -46419,13 +43510,8 @@ }, /area/station/engineering/solar/starboard) "doi" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/computer/card, /turf/simulated/floor/plasteel{ dir = 1; @@ -46433,11 +43519,7 @@ }, /area/station/security/checkpoint/secondary) "doj" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46495,9 +43577,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "doy" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/table, /obj/item/folder, /obj/item/phone{ @@ -46584,22 +43664,15 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "doM" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, /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 }, @@ -46638,9 +43711,7 @@ /turf/simulated/wall/r_wall, /area/station/turret_protected/aisat/interior) "dpg" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/teleport/station, /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) @@ -46650,21 +43721,13 @@ pixel_x = -3; pixel_y = 6 }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/turret_protected/aisat/interior) "dpl" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46719,10 +43782,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -46739,11 +43799,8 @@ pixel_y = -7 }, /obj/item/storage/toolbox/mechanical, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 4; @@ -46755,10 +43812,7 @@ /area/station/engineering/dronefabricator) "dpx" = ( /obj/structure/table, -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46771,11 +43825,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dpC" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46815,20 +43865,17 @@ /area/station/engineering/supermatter_room) "dpJ" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; - pixel_x = -24; req_access_txt = "11" }, /obj/machinery/the_singularitygen, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "dpK" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/porta_turret{ dir = 8; installation = /obj/item/gun/energy/gun; @@ -46857,10 +43904,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -46900,10 +43944,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "dpZ" = ( @@ -47011,11 +44052,7 @@ }, /area/station/engineering/supermatter_room) "dqx" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellow" @@ -47123,17 +44160,11 @@ /area/station/turret_protected/ai) "drh" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plating, /area/station/maintenance/storage) "dro" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/table/reinforced, /obj/item/paper_bin{ pixel_x = -3; @@ -47145,10 +44176,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 }, @@ -47171,10 +44199,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "drA" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47192,13 +44217,8 @@ }, /area/station/turret_protected/ai) "drG" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "drI" = ( @@ -47225,13 +44245,8 @@ /turf/simulated/wall, /area/station/turret_protected/ai) "drO" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "drP" = ( @@ -47258,20 +44273,14 @@ network = list("SS13","MiniSat"); start_active = 1 }, -/obj/machinery/power/apc{ - cell_type = 5000; - name = "south bump Important Area"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 5000 }, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "drS" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/ai_status_display/north, /obj/machinery/camera{ c_tag = "Engineering Atmos Northeast"; network = list("SS13","Engineering") @@ -47364,11 +44373,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "dsg" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -47382,22 +44387,14 @@ }, /area/station/hallway/primary/aft) "dsh" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/turret_protected/ai) "dsi" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47417,11 +44414,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dsy" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -47449,11 +44442,7 @@ }, /area/station/science/server) "dsG" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "dsH" = ( @@ -47487,9 +44476,7 @@ charge = 100; maxcharge = 15000 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "dsK" = ( @@ -47546,9 +44533,7 @@ dir = 1 }, /obj/machinery/atmospherics/meter, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port) "dsY" = ( @@ -47576,11 +44561,7 @@ /turf/simulated/floor/plasteel/stairs/left, /area/station/engineering/equipmentstorage) "dtc" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -47625,10 +44606,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -47640,10 +44618,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/computer/monitor{ name = "Engine Power Monitoring Computer" }, @@ -47695,11 +44670,8 @@ c_tag = "Tech Storage"; network = list("SS13","Engineering") }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) @@ -47711,9 +44683,7 @@ /area/station/command/office/captain/bedroom) "dtH" = ( /obj/structure/closet/radiation, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/window/basic{ dir = 8 }, @@ -47796,11 +44766,7 @@ icon_state = "0-8" }, /obj/machinery/power/port_gen/pacman, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /turf/simulated/floor/plating, /area/station/aisat/service) "dvv" = ( @@ -47860,11 +44826,7 @@ /area/station/public/arcade) "dwA" = ( /obj/machinery/floodlight, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47881,7 +44843,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dxa" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -47995,7 +44957,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) "dzn" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -48071,9 +45033,7 @@ }, /area/station/security/brig) "dAh" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -48316,9 +45276,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "dEc" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -48404,7 +45362,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "dEI" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -48513,11 +45471,7 @@ }, /area/station/security/brig) "dGj" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "dGn" = ( @@ -48568,9 +45522,7 @@ }, /area/station/science/xenobiology) "dHc" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, @@ -48604,32 +45556,18 @@ /turf/simulated/floor/plating, /area/station/engineering/smes) "dHF" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch/south, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "dHU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/blood_maybe, -/obj/machinery/light/small/built{ - dir = 1 - }, +/obj/machinery/light/small/built/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "dIa" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ department = "Head of Personnel's Office"; @@ -48684,10 +45622,9 @@ }, /obj/item/reagent_containers/glass/bottle/morphine, /obj/item/reagent_containers/glass/bottle/facid, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "justice_blast"; name = "Space Vent"; - pixel_x = -32; req_one_access_txt = "2" }, /obj/machinery/flasher_button{ @@ -48695,10 +45632,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" }, @@ -48874,7 +45808,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "dMJ" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -48931,9 +45865,7 @@ /obj/item/reagent_containers/glass/rag{ pixel_x = -7 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -49029,9 +45961,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "dQM" = ( @@ -49126,10 +46056,7 @@ /turf/simulated/wall, /area/station/maintenance/asmaint) "dTF" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -49162,11 +46089,7 @@ /area/station/maintenance/disposal) "dTO" = ( /obj/structure/closet/secure_closet/captains, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "dTW" = ( @@ -49231,7 +46154,7 @@ }, /area/station/engineering/equipmentstorage) "dVG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -49271,9 +46194,7 @@ /obj/item/storage/firstaid/regular{ pixel_y = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -49305,9 +46226,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/rack, /obj/item/storage/toolbox/emergency{ pixel_x = -2 @@ -49362,9 +46281,7 @@ }, /area/station/maintenance/apmaint) "dXX" = ( -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -49550,9 +46467,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ech" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ecq" = ( @@ -49591,7 +46506,7 @@ /turf/simulated/wall, /area/station/engineering/aitransit) "ecI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/chair/office/dark{ dir = 8 }, @@ -49648,9 +46563,7 @@ /area/station/engineering/hallway) "edk" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "edp" = ( @@ -49679,9 +46592,7 @@ }, /area/station/medical/sleeper) "edM" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -49705,9 +46616,7 @@ /area/station/hallway/secondary/exit) "edS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -49721,9 +46630,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "eei" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -49799,13 +46706,8 @@ pixel_x = 1; pixel_y = 3 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/light/directional/south, +/obj/machinery/newscaster/directional/north, /obj/item/eftpos{ pixel_x = 9; pixel_y = 5 @@ -49899,9 +46801,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "chapel" @@ -49928,11 +46828,7 @@ /area/station/security/lobby) "egq" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -49961,10 +46857,7 @@ pixel_x = 6; pixel_y = -2 }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -50041,9 +46934,7 @@ dir = 1 }, /obj/machinery/atmospherics/meter, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "ehE" = ( @@ -50077,7 +46968,7 @@ "ehT" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/sign/securearea{ pixel_y = -32 }, @@ -50087,9 +46978,7 @@ }, /area/station/engineering/aitransit) "eic" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ @@ -50259,7 +47148,7 @@ /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "emr" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -50367,11 +47256,7 @@ /turf/simulated/floor/carpet, /area/station/service/chapel) "eoR" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -50405,11 +47290,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "epu" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -50613,11 +47494,7 @@ /obj/item/crowbar/red, /obj/item/wrench, /obj/item/clothing/head/welding, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plating, /area/station/aisat/atmos) "esS" = ( @@ -50751,10 +47628,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "evo" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkpurple" @@ -50811,11 +47685,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "ewf" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel/stairs/left, /area/station/command/bridge) "ewu" = ( @@ -50901,7 +47771,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "exD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -50933,9 +47803,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "eyg" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -50959,9 +47827,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkyellow" @@ -50980,7 +47846,7 @@ /area/station/engineering/atmos) "ezf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -50996,11 +47862,7 @@ }, /area/station/command/teleporter) "ezy" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ dir = 5; @@ -51031,11 +47893,7 @@ /area/station/command/office/cmo) "eAk" = ( /obj/structure/kitchenspike, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -51070,11 +47928,7 @@ }, /area/station/medical/virology) "eBx" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -51208,9 +48062,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "eER" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ dir = 5; @@ -51259,9 +48111,7 @@ }, /area/station/security/brig) "eFn" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/poster/official/help_others{ pixel_y = 32 }, @@ -51281,9 +48131,7 @@ /turf/simulated/floor/carpet/orange, /area/station/maintenance/fsmaint) "eFV" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "eFY" = ( @@ -51301,9 +48149,7 @@ /area/station/science/hallway) "eGo" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "eGC" = ( @@ -51460,7 +48306,7 @@ /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "eJo" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51535,9 +48381,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "eKC" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 @@ -51584,10 +48428,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "eLi" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "eLk" = ( @@ -51642,11 +48483,7 @@ dir = 8; network = list("Research","SS13") }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/window/reinforced, /obj/structure/table, /obj/item/reagent_containers/dropper, @@ -51735,11 +48572,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "eND" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/wood{ icon_state = "fancy-wood-cherry" }, @@ -51893,10 +48726,7 @@ "eSg" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -52140,11 +48970,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "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, @@ -52175,7 +49001,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio2"; name = "Chamber 2 Containment Blast Doors"; pixel_y = 4; @@ -52196,10 +49022,9 @@ id_tag = "mechbay_outer"; name = "Mech Bay Public Shutter" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "mechbay_outer"; name = "Outer Mech Bay Shutters Control"; - pixel_x = 24; req_one_access_txt = "29" }, /turf/simulated/floor/plasteel, @@ -52281,10 +49106,9 @@ id_tag = "Biohazard"; name = "Biohazard Shutter" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "mechbay_inner"; name = "Inner Mech Bay Shutter Control"; - pixel_y = -24; req_one_access_txt = "29" }, /turf/simulated/floor/plasteel{ @@ -52293,11 +49117,7 @@ /area/station/science/robotics/chargebay) "fbn" = ( /obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -52337,15 +49157,8 @@ /area/station/engineering/atmos/control) "fbX" = ( /obj/structure/chair/comfy/black, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/economy/vending/wallmed/directional/north, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -52429,11 +49242,7 @@ }, /area/station/command/office/captain) "fdd" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -52583,11 +49392,7 @@ /turf/simulated/floor/plasteel, /area/station/science/rnd) "fgv" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -52606,11 +49411,7 @@ }, /area/station/hallway/secondary/exit) "fho" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel, /area/station/public/dorms) "fhx" = ( @@ -52656,9 +49457,7 @@ pixel_y = -8 }, /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -52775,21 +49574,15 @@ /area/station/maintenance/maintcentral2) "fko" = ( /obj/effect/decal/warning_stripes/northwestcorner, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, /area/station/engineering/control) "fkC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8; +/obj/machinery/light/directional/east{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -52803,11 +49596,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "fkT" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/bluegrid, /area/station/aisat/hall) "flm" = ( @@ -52923,9 +49712,7 @@ /area/station/engineering/supermatter_room) "fnP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -53007,11 +49794,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "fpe" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -53057,14 +49840,8 @@ }, /area/station/security/interrogation) "fqq" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/light_switch/east, /obj/machinery/camera{ c_tag = "Brig Cell Block A South"; dir = 8 @@ -53145,11 +49922,7 @@ }, /area/station/service/kitchen) "frm" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" @@ -53189,13 +49962,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/alarm/directional/north, /obj/machinery/camera{ c_tag = "Engineering Tesling Engine Room North"; network = list("Singularity","SS13","Engineering") @@ -53229,11 +49997,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "fsQ" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -53241,9 +50005,7 @@ /area/station/medical/morgue) "fsR" = ( /obj/item/kirbyplants, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -53304,16 +50066,8 @@ }, /area/station/engineering/control) "ftM" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light_switch/west, /obj/machinery/photocopier, /turf/simulated/floor/carpet, /area/station/medical/psych) @@ -53446,11 +50200,10 @@ }, /area/station/security/permabrig) "fwc" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "smstorage"; name = "Supermatter Storage"; pixel_x = 24; - pixel_y = 24; req_access_txt = "32" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -53526,10 +50279,7 @@ c_tag = "Research Access"; network = list("Research","SS13") }, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -53557,14 +50307,8 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/power/apc/directional/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -53626,9 +50370,7 @@ /obj/machinery/conveyor/east{ id = "garbage" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "fzl" = ( @@ -53810,10 +50552,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fCh" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -53930,9 +50669,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "fEE" = ( @@ -53990,9 +50727,7 @@ /turf/simulated/floor/plating, /area/station/command/office/ntrep) "fET" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/engine, /area/station/science/xenobiology) "fFz" = ( @@ -54070,17 +50805,14 @@ }, /area/station/supply/miningdock) "fGI" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fGT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "maintcham"; - name = "Containment Control"; - pixel_x = 26 + name = "Containment Control" }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -54129,11 +50861,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "fHE" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -54208,12 +50936,8 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "Engineering Engine Super APC"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 5000 }, /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -54415,11 +51139,7 @@ }, /area/station/maintenance/fsmaint) "fNQ" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -54457,9 +51177,7 @@ /area/station/maintenance/aft) "fPq" = ( /obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fPr" = ( @@ -54509,10 +51227,9 @@ /obj/item/stamp/captain{ pixel_x = -10 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "captainofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_y = -3; req_one_access_txt = "20" }, @@ -54552,14 +51269,8 @@ }, /area/station/security/permabrig) "fRK" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/alarm/directional/east, /obj/structure/rack, /obj/item/storage/toolbox/electrical{ pixel_x = -3; @@ -54575,11 +51286,7 @@ /turf/simulated/floor/plating, /area/station/aisat/service) "fRL" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/public/dorms) "fSi" = ( @@ -54670,10 +51377,7 @@ /area/station/maintenance/aft) "fTD" = ( /obj/machinery/plantgenes, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -54685,11 +51389,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "fTR" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -54743,7 +51443,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "fVq" = ( @@ -54850,9 +51550,7 @@ }, /area/station/engineering/atmos) "fWQ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/storage/box/monkeycubes, /turf/simulated/floor/plasteel, /area/station/science/genetics) @@ -54888,10 +51586,9 @@ /area/station/maintenance/portsolar) "fXQ" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "teleshutter"; name = "Teleporter Shutters Access Control"; - pixel_x = -24; req_one_access_txt = "62" }, /turf/simulated/floor/plasteel{ @@ -54921,12 +51618,8 @@ }, /area/station/engineering/hallway) "fYg" = ( -/obj/machinery/door_control{ - id = "toilet_unitb"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/east{ + id = "toilet_unitb" }, /obj/structure/toilet{ dir = 1 @@ -54991,9 +51684,7 @@ /obj/structure/chair/comfy/teal{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -55086,13 +51777,13 @@ /area/station/science/robotics/chargebay) "gbM" = ( /obj/structure/table, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "durka1"; name = "Privacy Shutters Control"; pixel_x = 6; pixel_y = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "durka2"; name = "Privacy Shutters Control"; pixel_x = -6; @@ -55110,9 +51801,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "gdp" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/poster/official/healthy{ pixel_y = 32 }, @@ -55160,10 +51849,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "gdQ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 28 }, @@ -55180,11 +51866,7 @@ }, /area/station/public/toilet/lockerroom) "geb" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" @@ -55197,14 +51879,8 @@ }, /area/station/engineering/atmos) "geo" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/ai_status_display/north, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -55282,7 +51958,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "ggB" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "yellow" }, @@ -55329,10 +52005,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{ icon_state = "floorgrime" }, @@ -55386,11 +52059,10 @@ /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch for the SM Radiation Security Shutters"; id = "engsm2"; - name = "SM Door Radiation Shutters Control"; - pixel_y = 27 + name = "SM Door Radiation Shutters Control" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -55522,9 +52194,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "gjP" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/chair/sofa{ color = "#85130b"; dir = 4 @@ -55549,17 +52219,9 @@ /turf/simulated/floor/plasteel, /area/station/science/storage) "gkn" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -55612,9 +52274,7 @@ /area/station/security/prison/cell_block/A) "gly" = ( /obj/machinery/economy/slot_machine, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -55810,11 +52470,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -55937,16 +52593,7 @@ }, /area/station/legal/magistrate) "gqr" = ( -/obj/machinery/holosign_switch{ - dir = 8; - id = "surgery2"; - pixel_x = 24; - pixel_y = 8 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "custom placement"; - pixel_x = 24; +/obj/machinery/light_switch/east{ pixel_y = -8 }, /obj/machinery/button/windowtint{ @@ -55954,6 +52601,10 @@ pixel_x = 24 }, /obj/structure/closet/crate/freezer/iv_storage, +/obj/machinery/holosign_switch/east{ + id = "surgery2"; + pixel_y = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -56049,7 +52700,7 @@ /area/station/security/brig) "gsd" = ( /obj/structure/table/wood, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/reagent_containers/food/drinks/mug/novelty, /obj/effect/spawner/lootdrop/officetoys, /turf/simulated/floor/wood, @@ -56123,9 +52774,7 @@ "gsY" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -56171,11 +52820,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "gtW" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -56191,11 +52836,7 @@ /area/station/command/office/captain) "gug" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/carpet, /area/station/command/office/hop) "guy" = ( @@ -56290,9 +52931,7 @@ }, /area/station/security/permabrig) "gvi" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "gvW" = ( @@ -56613,9 +53252,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Engineering Atmos West"; network = list("SS13","Engineering") @@ -56700,9 +53337,7 @@ "gEj" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "gEs" = ( @@ -56710,11 +53345,7 @@ /obj/item/toy/figure/crew/cmo{ pixel_y = 14 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -56744,11 +53375,7 @@ "gFm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -56840,11 +53467,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch for the SM Radiation Security Shutters"; id = "engsm2"; - name = "SM Door Radiation Shutters Control"; - pixel_y = -27 + name = "SM Door Radiation Shutters Control" }, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" @@ -56862,16 +53488,12 @@ /area/station/public/toilet) "gGO" = ( /obj/structure/displaycase/captain, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "gGQ" = ( /obj/effect/landmark/spawner/rev, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/engine, /area/station/science/xenobiology) "gGR" = ( @@ -56888,9 +53510,7 @@ /area/station/maintenance/apmaint) "gGY" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "gHg" = ( @@ -56933,7 +53553,7 @@ /area/station/maintenance/aft) "gIp" = ( /obj/effect/landmark/spawner/rev, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/engine, /area/station/science/xenobiology) "gIr" = ( @@ -56963,9 +53583,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "gJa" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/aft) "gJd" = ( @@ -57067,9 +53685,7 @@ /area/station/science/hallway) "gLA" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "gLG" = ( @@ -57234,10 +53850,7 @@ /turf/simulated/floor/plasteel, /area/station/command/office/hop) "gNf" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -57349,9 +53962,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "gOF" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, @@ -57386,7 +53997,7 @@ /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/grass, /area/station/maintenance/asmaint) "gPj" = ( @@ -57401,7 +54012,7 @@ /obj/structure/closet, /obj/item/stack/spacecash/c5, /obj/effect/spawner/lootdrop/trash, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "gPM" = ( @@ -57421,14 +54032,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "gQi" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/west, /obj/machinery/computer/cryopod/robot{ pixel_x = -30; pixel_y = 30 @@ -57523,7 +54128,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -57649,7 +54254,7 @@ }, /area/station/security/prison/cell_block/A) "gUh" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -57683,9 +54288,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "gUq" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -57752,11 +54355,7 @@ /obj/structure/chair/comfy/teal{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/effect/landmark/start/assistant, /turf/simulated/floor/plasteel{ dir = 10; @@ -57766,11 +54365,7 @@ "gVD" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/item/restraints/handcuffs/cable/blue, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "gVE" = ( @@ -57782,13 +54377,8 @@ "gVT" = ( /obj/structure/table, /obj/item/ashtray/glass, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light_switch/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purple" @@ -58070,9 +54660,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "gZX" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; @@ -58101,9 +54689,7 @@ /area/station/service/bar) "hak" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood/fancy/birch{ icon_state = "fancy-wood-birch-broken" }, @@ -58138,16 +54724,8 @@ }, /area/station/security/permabrig) "haD" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/power/apc/directional/west, /obj/machinery/camera{ c_tag = "Dormitories Toilets"; dir = 4 @@ -58185,10 +54763,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "hbc" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -58278,9 +54853,7 @@ /area/station/medical/sleeper) "hew" = ( /obj/item/reagent_containers/glass/bucket, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ icon_state = "Dark" }, @@ -58350,11 +54923,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8; +/obj/structure/sign/poster/official/random/west, +/obj/machinery/light/directional/east{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -58462,9 +55032,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "hhV" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/sign/fire{ pixel_x = 32 }, @@ -58507,11 +55075,7 @@ }, /area/station/security/permabrig) "hib" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -58550,11 +55114,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "hiM" = ( @@ -58610,9 +55170,7 @@ }, /area/station/service/chapel/office) "hjH" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -58646,10 +55204,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" = ( @@ -58684,11 +55239,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "hlq" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Medbay Cryogenics"; dir = 1 @@ -58765,9 +55316,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "hmR" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/turretid/stun{ control_area = "\improper AI Satellite Service"; name = "AI Satellite Service Bay Turret Control"; @@ -58847,9 +55396,7 @@ }, /area/station/command/office/hop) "hnY" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/table, /obj/item/bonegel, /obj/item/bonesetter, @@ -58978,11 +55525,7 @@ /obj/structure/chair/sofa/bench{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "hqe" = ( @@ -59010,11 +55553,7 @@ pixel_y = 2 }, /obj/structure/table/glass, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -59069,16 +55608,12 @@ }, /area/station/engineering/supermatter_room) "hrm" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "hrq" = ( /obj/structure/janitorialcart, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /turf/simulated/floor/plasteel{ @@ -59130,9 +55665,7 @@ /area/station/maintenance/port) "hsz" = ( /obj/effect/decal/cleanable/dust, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /obj/structure/bed{ dir = 1 @@ -59208,11 +55741,7 @@ color = "#85130b"; dir = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/security/permabrig) "htV" = ( @@ -59245,21 +55774,15 @@ pixel_y = 5 }, /obj/item/rpd, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcorners" }, /area/station/engineering/supermatter_room) "hug" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/structure/sign/poster/official/random/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -59325,11 +55848,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "hwH" = ( @@ -59353,9 +55872,7 @@ /obj/item/flashlight/lamp{ pixel_y = 2 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -59391,12 +55908,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -59406,10 +55919,7 @@ /area/station/maintenance/asmaint) "hyv" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -59561,10 +56071,9 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "paramedic"; name = "Garage Door Control"; - pixel_y = 24; req_one_access_txt = "66" }, /turf/simulated/floor/plasteel{ @@ -59602,11 +56111,8 @@ /area/station/science/toxins/mixing) "hAX" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 2; @@ -59660,7 +56166,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "hCz" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -59766,9 +56272,7 @@ /turf/simulated/floor/engine, /area/station/science/toxins/mixing) "hDR" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "blue" @@ -59777,9 +56281,7 @@ "hDS" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/mug/sci, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -59807,11 +56309,7 @@ }, /area/station/command/bridge) "hEu" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/camera{ c_tag = "Prisoner Lockers"; dir = 4 @@ -59838,11 +56336,7 @@ }, /area/station/command/office/ce) "hEX" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -59867,7 +56361,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "hFE" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -59895,12 +56389,8 @@ "hFX" = ( /obj/structure/bed, /obj/item/bedsheet/cmo, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/directional/east, /obj/effect/landmark/start/chief_medical_officer, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -59953,17 +56443,13 @@ pixel_x = 2 }, /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/interrogation) "hGQ" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plating, /area/station/maintenance/storage) "hGY" = ( @@ -59992,9 +56478,7 @@ "hHp" = ( /obj/structure/table/wood/fancy/blue, /obj/item/aiModule/nanotrasen, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -60096,10 +56580,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -60193,10 +56674,7 @@ /obj/item/restraints/handcuffs/cable/cyan, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/item/storage/pill_bottle/random_drug_bottle{ pixel_x = -12 }, @@ -60204,10 +56682,7 @@ /area/station/maintenance/asmaint) "hLu" = ( /obj/machinery/door/firedoor, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -60354,9 +56829,7 @@ "hNT" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "hOa" = ( @@ -60368,15 +56841,8 @@ /obj/item/wrench, /obj/item/crowbar, /obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/machinery/light_switch/west, +/obj/structure/extinguisher_cabinet/directional/south, /obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 10; pixel_y = 4 @@ -60428,7 +56894,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio1"; name = "Chamber 1 Containment Blast Door"; pixel_y = 4; @@ -60452,11 +56918,7 @@ /area/station/maintenance/turbine) "hOJ" = ( /obj/machinery/economy/vending/chefdrobe, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -60567,10 +57029,7 @@ /area/station/command/bridge) "hRF" = ( /obj/structure/chair/sofa/bench/left, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -60671,7 +57130,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -60689,18 +57148,11 @@ 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" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 28 }, @@ -60736,19 +57188,12 @@ /turf/simulated/floor/plating, /area/station/medical/cryo) "hUm" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo"; pixel_x = -5 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -60787,9 +57232,7 @@ /obj/structure/toilet{ pixel_y = 8 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/item/radio/intercom/locked/prison{ name = "Prison Intercom (General)"; pixel_y = 24 @@ -60848,11 +57291,7 @@ /area/station/maintenance/asmaint) "hWI" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -60916,12 +57355,8 @@ /area/station/hallway/primary/aft) "hXp" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/light, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/light/directional/north, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "hXB" = ( @@ -60983,11 +57418,7 @@ }, /area/station/security/interrogation) "hYs" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -61164,10 +57595,7 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "ibM" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -61179,9 +57607,7 @@ }, /area/station/medical/chemistry) "ibW" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) @@ -61259,11 +57685,7 @@ }, /area/station/hallway/secondary/exit) "iev" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -61286,10 +57708,7 @@ /area/station/medical/surgery/secondary) "ieI" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -61423,9 +57842,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "iip" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -61438,9 +57855,7 @@ /area/station/science/xenobiology) "iis" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -61521,10 +57936,7 @@ /area/station/hallway/secondary/entry) "iki" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/closet/crate, /obj/item/hatchet, /obj/item/hatchet{ @@ -61591,7 +58003,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -61604,9 +58016,7 @@ }, /area/station/public/dorms) "imr" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -61632,11 +58042,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" }, @@ -61682,11 +58088,7 @@ /obj/item/clothing/glasses/hud/health{ pixel_y = -2 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -61733,9 +58135,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "iot" = ( @@ -61915,10 +58315,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ layer = 2 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -61931,11 +58328,7 @@ }, /area/station/engineering/atmos) "ism" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -62054,20 +58447,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "iuO" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/transit_tube/station, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, /area/station/engineering/aitransit) "ivY" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/machinery/camera{ c_tag = "Virology Airlock" }, @@ -62188,10 +58575,7 @@ /area/station/supply/qm) "ixH" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -62258,9 +58642,7 @@ }, /area/station/service/bar) "iyp" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, /obj/item/flag/nt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -62301,11 +58683,7 @@ }, /area/station/service/bar) "izR" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -62377,17 +58755,13 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump Engineering"; - pixel_y = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/south{ + cell_type = 2500 }, /turf/simulated/floor/plating, /area/station/maintenance/portsolar) "iCD" = ( -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /obj/item/trash/chips, /turf/simulated/floor/carpet, /area/station/maintenance/fsmaint) @@ -62423,12 +58797,10 @@ /area/station/maintenance/fore) "iDz" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/machinery/power/apc{ - cell_type = 5000; - name = "south bump Important Area"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 5000 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 10; @@ -62528,12 +58900,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = 5000; - dir = 1; - name = "north bump Atmospherics"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 5000 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -62578,9 +58946,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "iFm" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -62862,7 +59228,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "iLA" = ( @@ -62873,7 +59239,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "iLP" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -62972,27 +59338,16 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/clothing/under/rank/medical/scrubs, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" }, /area/station/maintenance/aft) "iNn" = ( -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/west, /obj/machinery/economy/vending/dinnerware, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -63040,9 +59395,7 @@ /area/station/maintenance/asmaint2) "iOY" = ( /obj/structure/table/wood, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = 5; pixel_y = 6 @@ -63064,7 +59417,7 @@ c_tag = "Port Hallway"; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -63243,11 +59596,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -63323,11 +59672,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "iTW" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/space_heater, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -63370,11 +59715,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "iVr" = ( @@ -63387,9 +59728,7 @@ /obj/structure/chair/comfy/brown{ dir = 4 }, -/obj/machinery/light/small/built{ - dir = 8 - }, +/obj/machinery/light/small/built/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "iVU" = ( @@ -63417,9 +59756,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil/random, /obj/effect/decal/cleanable/shreds, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -63444,10 +59781,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63480,13 +59814,8 @@ /turf/simulated/floor/light, /area/station/maintenance/asmaint) "iXW" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkpurple" @@ -63543,11 +59872,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "iYO" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "iYQ" = ( @@ -63641,11 +59966,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -63698,10 +60019,7 @@ /area/station/public/dorms) "jbO" = ( /obj/machinery/economy/vending/coffee, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -63731,7 +60049,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "jcg" = ( @@ -63798,9 +60116,7 @@ /area/station/command/office/rd) "jeb" = ( /obj/effect/turf_decal/loading_area, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, @@ -63887,10 +60203,7 @@ /area/station/engineering/gravitygenerator) "jfa" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" @@ -63927,11 +60240,7 @@ /turf/simulated/floor/plating, /area/station/security/main) "jfQ" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/camera{ c_tag = "Medbay Treatment East"; dir = 8 @@ -63969,11 +60278,7 @@ /obj/item/screwdriver, /obj/item/wrench, /obj/item/storage/fancy/donut_box, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, @@ -64003,19 +60308,13 @@ icon_state = "0-2" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/station/engineering/smes) "jgY" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; @@ -64025,14 +60324,8 @@ "jhy" = ( /obj/structure/table, /obj/item/radio/beacon, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/machinery/status_display/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -64057,9 +60350,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "jiC" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "rampbottom" }, @@ -64108,11 +60399,7 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "jkP" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -64298,11 +60585,7 @@ }, /area/station/engineering/atmos/storage) "jpb" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -64394,11 +60677,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "jqo" = ( @@ -64445,13 +60724,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "jra" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/east{ id = "vipbar_bolt"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - pixel_y = -6; - specialfunctions = 4 + pixel_y = -6 }, /obj/machinery/button/windowtint{ id = "vipbar"; @@ -64521,10 +60796,7 @@ /area/station/maintenance/aft) "jsn" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -64547,9 +60819,7 @@ /obj/structure/chair/sofa/bench/left{ dir = 4 }, -/obj/machinery/light_construct{ - dir = 8 - }, +/obj/machinery/light_construct/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -64629,11 +60899,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "juZ" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "jva" = ( @@ -64663,9 +60929,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Bar East"; @@ -64711,10 +60975,7 @@ }, /area/station/service/kitchen) "jwu" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -64850,11 +61111,7 @@ /obj/item/storage/belt/medical{ pixel_y = -3 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -64864,10 +61121,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump Engineering"; - pixel_y = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/south{ + cell_type = 2500 }, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" @@ -64948,7 +61203,7 @@ /turf/simulated/floor/carpet, /area/station/medical/psych) "jAz" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -64971,9 +61226,7 @@ /obj/structure/table/wood, /obj/effect/spawner/lootdrop/maintenance/two, /obj/item/lighter/zippo, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jAY" = ( @@ -65061,9 +61314,7 @@ }, /area/station/medical/surgery/secondary) "jCb" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -65075,14 +61326,8 @@ c_tag = "Medbay Paramedic"; dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/item/radio/intercom/directional/west, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -65098,11 +61343,7 @@ /area/station/science/hallway) "jCu" = ( /obj/machinery/economy/vending/scidrobe, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -65347,9 +61588,7 @@ "jJJ" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/green/hollow, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -65594,7 +61833,7 @@ /obj/structure/reagent_dispensers/beerkeg/nuke{ name = "Nanotrasen-brand nuclear fizz-sion explosive" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -65603,10 +61842,7 @@ /obj/machinery/atmospherics/unary/thermomachine/freezer/on/coldroom{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_x = 32; - step_size = 0 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "jPi" = ( @@ -65667,18 +61903,13 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/station/maintenance/asmaint) "jQi" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/icemachine{ dir = 8; pixel_x = -1; @@ -65787,7 +62018,7 @@ /turf/simulated/floor/plating, /area/station/science/toxins/launch) "jRQ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -65840,9 +62071,7 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwestcorner, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -65906,9 +62135,7 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "jUt" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "jUF" = ( @@ -65946,10 +62173,7 @@ "jVf" = ( /obj/vehicle/secway, /obj/item/key/security, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -66008,9 +62232,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "jWV" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -66081,11 +62303,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) "jZx" = ( @@ -66181,11 +62399,10 @@ }, /area/station/legal/courtroom) "kcl" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch for the engineering security doors."; id = "teledoor"; name = "AI Satellite Teleport Shutters Control"; - pixel_y = 25; req_one_access_txt = "17;75" }, /obj/effect/decal/warning_stripes/east, @@ -66194,10 +62411,7 @@ }, /area/station/turret_protected/aisat/interior) "kcr" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/closet/crate, /obj/item/crowbar, /turf/simulated/floor/plasteel{ @@ -66242,7 +62456,7 @@ /area/station/security/permabrig) "kdh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/reagent_containers/food/snacks/grown/cannabis, /turf/simulated/floor/carpet, /area/station/maintenance/asmaint) @@ -66347,9 +62561,7 @@ }, /area/station/science/genetics) "keJ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -66419,11 +62631,7 @@ /area/station/engineering/supermatter_room) "khl" = ( /obj/machinery/hologram/holopad, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; @@ -66482,10 +62690,9 @@ name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Singularity"; - name = "Containment Blast Doors"; - pixel_x = 32 + name = "Containment Blast Doors" }, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" @@ -66515,12 +62722,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "kiq" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/light_switch/south, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/portable/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -66533,30 +62736,25 @@ /area/station/public/dorms) "kiF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kjf" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "representative"; name = "Privacy Shutters Control"; pixel_x = -6; - pixel_y = -24; req_access_txt = "73" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/south{ id = "ntrepofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = 6; - pixel_y = -24; req_access_txt = "73" }, -/obj/machinery/keycard_auth{ - pixel_y = -35 +/obj/machinery/keycard_auth/south{ + pixel_y = -32 }, /obj/effect/landmark/start/nanotrasen_rep, /obj/structure/chair/comfy/corp{ @@ -66679,7 +62877,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "kla" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, @@ -66733,9 +62931,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "klN" = ( @@ -66815,8 +63011,7 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -66831,11 +63026,7 @@ }, /area/station/engineering/equipmentstorage) "kpz" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -66992,9 +63183,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "krw" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -67026,17 +63215,14 @@ /area/station/maintenance/fpmaint2) "krV" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "maintcham2"; - name = "Containment Control"; - pixel_x = -26 + name = "Containment Control" }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ksj" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/item/clothing/mask/cigarette/random, /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/item/reagent_containers/food/drinks/cans/beer, @@ -67118,11 +63304,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "ktw" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Research E.X.P.E.R.I-MENTOR Lab"; dir = 1; @@ -67143,11 +63325,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/effect/landmark{ icon = 'icons/effects/spawner_icons.dmi'; icon_state = "AI"; @@ -67172,11 +63350,7 @@ /area/station/maintenance/fsmaint) "kua" = ( /obj/structure/table/wood, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/item/reagent_containers/food/snacks/baguette, /obj/structure/cable{ d2 = 4; @@ -67213,11 +63387,7 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/mask/muzzle, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -67455,14 +63625,8 @@ "kAS" = ( /obj/structure/bed, /obj/item/bedsheet/hos, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/east, /obj/effect/landmark/start/head_of_security, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -67497,13 +63661,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -67548,11 +63707,7 @@ }, /area/station/maintenance/asmaint) "kBK" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/table/glass, /obj/item/cartridge/medical{ pixel_x = 8; @@ -67590,13 +63745,10 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "kCq" = ( -/obj/structure/sink{ - pixel_y = 18 - }, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_x = -10; - pixel_y = 34 +/obj/structure/sink/directional/north, +/obj/machinery/light_switch/north{ + pixel_x = -11; + pixel_y = 28 }, /obj/structure/mirror{ pixel_y = 32 @@ -67650,17 +63802,13 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, /area/station/security/permabrig) "kDp" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -67678,18 +63826,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "kDW" = ( -/obj/machinery/power/apc{ - cell_type = 5000; - name = "south bump Important Area"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 5000 }, /obj/structure/cable, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "kDY" = ( /obj/item/kirbyplants, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -67766,9 +63912,7 @@ /turf/simulated/floor/carpet, /area/station/service/library) "kFB" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/economy/vending/boozeomat, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -67842,11 +63986,7 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "kGM" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "kGZ" = ( @@ -67861,7 +64001,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "kHi" = ( @@ -68005,11 +64145,7 @@ /turf/simulated/floor/plating, /area/station/supply/miningdock) "kJT" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "kKg" = ( @@ -68051,10 +64187,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "kKV" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) @@ -68121,9 +64254,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "kLp" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ autolink_id = "eng_sm_vent"; dir = 8 @@ -68152,11 +64283,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kMd" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/table, /obj/item/paper_bin{ pixel_x = 1; @@ -68290,9 +64417,7 @@ /area/station/science/robotics/chargebay) "kOa" = ( /obj/structure/closet/emcloset, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) "kOq" = ( @@ -68400,15 +64525,8 @@ /area/station/maintenance/apmaint) "kQs" = ( /obj/structure/dresser, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/light_switch/west, +/obj/machinery/newscaster/security_unit/north, /obj/item/toy/figure/crew/hop{ layer = 4; pixel_x = -4; @@ -68426,14 +64544,8 @@ /obj/item/tank/internals/air{ pixel_x = 7 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -68602,12 +64714,8 @@ }, /area/station/medical/surgery/secondary) "kTo" = ( -/obj/machinery/door_control{ - id = "toilet_unitc"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/east{ + id = "toilet_unitc" }, /obj/structure/toilet{ dir = 1 @@ -68617,7 +64725,7 @@ }, /area/station/public/toilet) "kTA" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -68700,7 +64808,7 @@ c_tag = "Medbay Morgue South"; dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -68804,9 +64912,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -68873,9 +64979,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "kYC" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /obj/structure/mirror{ layer = 2.8; pixel_y = 34 @@ -68964,14 +65068,8 @@ /area/station/engineering/solar/auxport) "lbb" = ( /obj/structure/closet/firecloset, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -69016,9 +65114,7 @@ /obj/item/clothing/mask/breath, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -69091,9 +65187,7 @@ /obj/machinery/door/window{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -69123,27 +65217,20 @@ /obj/machinery/atmospherics/binary/valve{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ldl" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/clothing/shoes/sandal, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lee" = ( /obj/structure/filingcabinet/chestdrawer, /obj/item/folder/white, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -69435,9 +65522,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "lkw" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/public/dorms) "llj" = ( @@ -69529,7 +65614,7 @@ /area/station/science/rnd) "lmU" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "lnh" = ( @@ -69728,7 +65813,7 @@ /area/station/engineering/atmos/storage) "lrL" = ( /obj/structure/closet/emcloset, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "lrO" = ( @@ -69757,11 +65842,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "lrY" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -69830,9 +65911,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "lte" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/papershredder, /turf/simulated/floor/wood, /area/station/command/office/ntrep) @@ -69899,9 +65978,7 @@ }, /area/station/maintenance/fsmaint) "luV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -70153,9 +66230,7 @@ /area/station/maintenance/apmaint) "lAb" = ( /obj/effect/landmark/damageturf, -/obj/machinery/light_construct/small{ - dir = 8 - }, +/obj/machinery/light_construct/small/east, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -70187,9 +66262,7 @@ }, /area/station/engineering/atmos) "lAt" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/closet/secure_closet/freezer/meat, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -70237,16 +66310,11 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "lBr" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/aft) "lBQ" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "lCk" = ( @@ -70282,9 +66350,7 @@ /area/station/maintenance/starboardsolar) "lCQ" = ( /obj/structure/closet/emcloset, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -70304,10 +66370,7 @@ }, /area/station/security/brig) "lDi" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; @@ -70345,10 +66408,7 @@ dir = 4 }, /obj/structure/closet/firecloset, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) @@ -70655,9 +66715,7 @@ pixel_x = -8; initialized = 1 }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -70671,7 +66729,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "lJV" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -70751,11 +66809,7 @@ }, /area/station/engineering/break_room) "lLH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -70819,9 +66873,7 @@ /turf/simulated/floor/engine/vacuum, /area/station/maintenance/turbine) "lMP" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/wood, /area/station/maintenance/aft) "lNb" = ( @@ -70856,7 +66908,7 @@ pixel_x = 6; pixel_y = 2 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/storage/box/monkeycubes/farwacubes{ pixel_x = -6; pixel_y = 2 @@ -70887,16 +66939,12 @@ /area/station/science/toxins/test) "lNS" = ( /obj/machinery/disposal, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "testlab"; name = "Test Lab Privacy Shutters"; - pixel_x = -28; pixel_y = 5 }, -/obj/machinery/light_switch{ - dir = 4; - name = "custom placement"; - pixel_x = -24; +/obj/machinery/light_switch/west{ pixel_y = -6 }, /obj/structure/disposalpipe/trunk, @@ -70930,12 +66978,8 @@ /area/station/engineering/atmos) "lPp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -70990,7 +67034,7 @@ }, /area/station/command/bridge) "lPR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -71028,9 +67072,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -71225,11 +67267,10 @@ /area/station/security/permabrig) "lTU" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch for the SM Radiation Security Shutters"; id = "engsm2"; name = "SM Door Radiation Shutters Control"; - pixel_x = -27; pixel_y = 5 }, /turf/simulated/floor/plasteel{ @@ -71324,10 +67365,7 @@ /obj/structure/table, /obj/item/aicard, /obj/item/aiModule/reset, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "lVr" = ( @@ -71398,11 +67436,7 @@ }, /area/station/hallway/secondary/exit) "lVX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -71474,10 +67508,7 @@ /area/station/hallway/primary/aft) "lXi" = ( /obj/machinery/chem_master, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/engine, /area/station/science/misc_lab) "lXA" = ( @@ -71599,11 +67630,7 @@ }, /area/station/maintenance/aft) "lZu" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -71859,9 +67886,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/deathsposal{ pixel_y = 32 }, @@ -71894,11 +67919,7 @@ }, /area/station/engineering/smes) "mdr" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/curtain/open/shower, /obj/machinery/shower{ dir = 8; @@ -72112,16 +68133,10 @@ name = "Mr. Deempisi portrait"; pixel_y = 32 }, -/obj/machinery/door_control{ - id = "vipbar_bolt"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -24; - specialfunctions = 4 - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/door_control/bolt_control/west{ + id = "vipbar_bolt" }, +/obj/machinery/light/directional/south, /obj/item/book/manual/wiki/sop_service{ pixel_x = -5; pixel_y = 3 @@ -72170,10 +68185,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -72354,11 +68366,7 @@ dir = 4 }, /obj/structure/closet/wardrobe/coroner, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -72381,26 +68389,19 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "mlv" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/closet, /obj/item/restraints/legcuffs/beartrap, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "mlz" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/item/radio/intercom/directional/south, +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 4; @@ -72423,10 +68424,7 @@ pixel_x = 5; pixel_y = -6 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "mlF" = ( @@ -72443,10 +68441,7 @@ /obj/machinery/camera{ c_tag = "Brig Head of Security's Bedroom" }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -72551,11 +68546,7 @@ /turf/simulated/floor/plating, /area/station/science/toxins/launch) "mpt" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -72689,7 +68680,7 @@ "msm" = ( /obj/machinery/constructable_frame/machine_frame, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "msr" = ( @@ -72721,10 +68712,9 @@ /area/station/medical/reception) "msR" = ( /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "Disposal Exit"; name = "Disposal Vent Control"; - pixel_x = -24; pixel_y = 8; req_one_access_txt = "12" }, @@ -72952,11 +68942,7 @@ /area/station/maintenance/asmaint) "mxH" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "mxJ" = ( @@ -73100,7 +69086,7 @@ /area/station/command/office/captain) "mAX" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/mapping_helpers/machinery/destroyed, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73112,11 +69098,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel{ dir = 4; @@ -73144,9 +69126,7 @@ "mBE" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "mBZ" = ( @@ -73206,18 +69186,12 @@ }, /area/station/maintenance/apmaint) "mCO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -73239,9 +69213,7 @@ /turf/simulated/floor/plasteel, /area/station/science/hallway) "mDs" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -73319,10 +69291,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) "mEk" = ( @@ -73494,9 +69463,7 @@ /turf/simulated/floor/plating, /area/station/command/office/hos) "mHA" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -73548,9 +69515,7 @@ /area/station/security/permabrig) "mIU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/mapping_helpers/machinery/destroyed, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -73664,11 +69629,7 @@ pixel_y = 6 }, /obj/item/storage/toolbox/electrical, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) @@ -73709,11 +69670,7 @@ }, /area/station/medical/medbay) "mMB" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -73821,10 +69778,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "mOH" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/economy/vending/hydrodrobe, /turf/simulated/floor/plasteel{ @@ -73880,10 +69834,7 @@ "mRf" = ( /obj/item/bedsheet/hop, /obj/structure/bed, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet, /area/station/command/office/hop) "mRJ" = ( @@ -73921,11 +69872,7 @@ }, /area/station/maintenance/fsmaint) "mSJ" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -73992,7 +69939,7 @@ /obj/item/reagent_containers/syringe/epinephrine{ pixel_y = -1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -74019,9 +69966,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -74061,11 +70006,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "mVh" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -74189,9 +70130,7 @@ /area/station/maintenance/asmaint2) "mXS" = ( /obj/item/reagent_containers/glass/bucket, -/obj/structure/sink/kitchen{ - pixel_y = 18 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -74310,18 +70249,16 @@ /area/station/command/office/captain) "mZI" = ( /obj/machinery/computer/secure_data, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "hopqueue"; name = "Queue Privacy Shutters Control"; pixel_x = -6; - pixel_y = 25; req_one_access_txt = "57" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "hop"; name = "Privacy Shutters Control"; pixel_x = 6; - pixel_y = 25; req_one_access_txt = "57" }, /obj/machinery/flasher_button{ @@ -74439,23 +70376,18 @@ "nbW" = ( /obj/structure/table/wood, /obj/item/radio/intercom/command, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "heads_meeting"; name = "Privacy Shutters Control"; - pixel_x = -6; - pixel_y = 24 + pixel_x = -6 }, /obj/machinery/button/windowtint{ id = "conference"; pixel_x = 6; pixel_y = 24 }, -/obj/machinery/door_control{ - id = "conference"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 34; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/north{ + id = "conference" }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -74480,11 +70412,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "ndr" = ( @@ -74498,9 +70426,7 @@ /turf/simulated/floor/plating, /area/station/engineering/gravitygenerator) "nds" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/table, /obj/item/hand_tele, /turf/simulated/floor/plasteel{ @@ -74519,9 +70445,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -74726,9 +70650,7 @@ /turf/simulated/floor/light/purple, /area/station/service/bar/atrium) "nin" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -74802,10 +70724,7 @@ }, /area/station/engineering/controlroom) "niT" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/table, /obj/item/paper_bin{ pixel_x = -5; @@ -74816,18 +70735,12 @@ pixel_y = 5 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/command/office/hop) "niW" = ( /obj/machinery/atmospherics/binary/valve, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral2) "njM" = ( @@ -74915,18 +70828,17 @@ id = "incineratorturbine" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = -8; pixel_y = -38; req_access_txt = "12" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; pixel_x = -8; - pixel_y = -26; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -75012,9 +70924,7 @@ }, /area/station/maintenance/fsmaint) "nlK" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -75125,9 +71035,7 @@ dir = 1; id = "QMLoad" }, -/obj/machinery/status_display/supply_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/supply_display/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "noy" = ( @@ -75178,11 +71086,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/effect/landmark{ icon = 'icons/effects/spawner_icons.dmi'; icon_state = "AI"; @@ -75299,10 +71203,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "nqX" = ( @@ -75458,9 +71359,7 @@ /area/station/security/brig) "ntr" = ( /obj/machinery/cooker/deepfryer, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood, /area/station/maintenance/aft) "ntt" = ( @@ -75505,9 +71404,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nuM" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -75566,7 +71463,7 @@ /area/station/engineering/aitransit) "nvO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -75667,7 +71564,7 @@ }, /area/station/supply/qm) "nxm" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "nxy" = ( @@ -75765,11 +71662,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "nzF" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -75789,10 +71682,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "nAq" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -75816,10 +71706,9 @@ /area/station/maintenance/aft) "nAE" = ( /obj/machinery/smartfridge, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "HydroHallway"; name = "Hydroponics Privacy Shutters Control"; - pixel_x = 24; req_one_access_txt = "35" }, /turf/simulated/floor/plasteel{ @@ -75853,10 +71742,8 @@ "nBc" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/obj/machinery/light, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" @@ -75864,11 +71751,7 @@ /area/station/science/toxins/mixing) "nBq" = ( /obj/structure/table, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/book/manual/wiki/engineering_guide, /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/meson/engine{ @@ -75934,7 +71817,7 @@ "nBN" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "nBZ" = ( @@ -75984,7 +71867,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio3"; name = "Chamber 3 Containment Blast Doors"; pixel_y = 4; @@ -76058,9 +71941,7 @@ }, /area/station/medical/patients_rooms) "nEC" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -76074,7 +71955,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenobio5"; name = "Chamber 5 Containment Blast Doors"; pixel_y = 4; @@ -76131,9 +72012,7 @@ /area/station/science/xenobiology) "nGq" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "nGG" = ( @@ -76192,18 +72071,14 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellow" }, /area/station/engineering/supermatter_room) "nIF" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/engine, /area/station/science/xenobiology) "nIM" = ( @@ -76242,27 +72117,16 @@ /turf/simulated/floor/catwalk, /area/station/maintenance/storage) "nJf" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/closet/radiation, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" }, /area/station/medical/storage) "nJl" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/sign/nosmoking_1{ pixel_y = 32 }, @@ -76346,9 +72210,7 @@ pixel_x = -2; pixel_y = -2 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -76357,14 +72219,8 @@ "nLf" = ( /obj/effect/decal/warning_stripes/blue/hollow, /obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -76395,9 +72251,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "nLC" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ dir = 8; @@ -76457,10 +72311,7 @@ /area/station/maintenance/asmaint) "nMT" = ( /obj/structure/closet/secure_closet/personal, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -76471,9 +72322,7 @@ pixel_y = 6 }, /obj/item/paper_bin, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nNf" = ( @@ -76520,10 +72369,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcorners" @@ -76544,10 +72390,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -76752,11 +72595,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -76800,7 +72639,7 @@ /turf/simulated/floor/transparent/glass, /area/station/service/bar/atrium) "nTQ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/storage) "nTZ" = ( @@ -76849,9 +72688,7 @@ /turf/simulated/wall, /area/station/engineering/atmos) "nVq" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/table, /obj/item/cultivator, /obj/item/shovel/spade, @@ -76859,11 +72696,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -76926,11 +72759,7 @@ pixel_x = -3; pixel_y = 8 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -76966,10 +72795,7 @@ }, /area/station/science/hallway) "nXr" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel, /area/station/public/dorms) "nXu" = ( @@ -77073,10 +72899,9 @@ /area/station/hallway/secondary/exit) "nYX" = ( /obj/structure/table/wood, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "hopofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = -6; pixel_y = 3; req_one_access_txt = "57" @@ -77375,10 +73200,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; @@ -77402,11 +73224,7 @@ /turf/simulated/wall, /area/station/service/bar/atrium) "ofy" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "ofP" = ( @@ -77416,9 +73234,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ofW" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/bookcase, /turf/simulated/floor/wood, /area/station/security/permabrig) @@ -77555,10 +73371,7 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "ois" = ( -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -77657,14 +73470,8 @@ /turf/simulated/floor/engine, /area/station/science/misc_lab) "ojj" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/small/directional/east, +/obj/machinery/alarm/directional/west, /obj/machinery/space_heater, /obj/machinery/camera{ c_tag = "AI Satellite Atmospherics"; @@ -77689,9 +73496,7 @@ /turf/simulated/floor/plating, /area/station/engineering/aitransit) "ojz" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ icon_state = "wood-broken5" @@ -77838,9 +73643,7 @@ }, /area/station/public/construction) "olG" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/rack, /obj/item/stack/sheet/plasteel, /turf/simulated/floor/plasteel{ @@ -77875,7 +73678,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "omI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -77922,7 +73725,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "yellow" }, @@ -78010,11 +73813,7 @@ /area/station/supply/qm) "oqc" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -78167,10 +73966,7 @@ }, /area/station/service/hydroponics) "oto" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -78185,9 +73981,7 @@ /area/station/maintenance/storage) "otv" = ( /obj/structure/mecha_wreckage/ripley, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "otH" = ( @@ -78220,9 +74014,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "otL" = ( -/obj/machinery/keycard_auth{ - pixel_x = -24 - }, +/obj/machinery/keycard_auth/west, /obj/machinery/computer/security/mining{ dir = 4 }, @@ -78232,10 +74024,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -78340,11 +74129,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint2) "owa" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32; - pixel_y = 32; - step_size = 0 - }, +/obj/machinery/ai_status_display/north, /obj/machinery/camera{ c_tag = "Departure Lounge Security" }, @@ -78458,9 +74243,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -78472,11 +74255,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "oyG" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/carpet, /area/station/public/vacant_office) "oyH" = ( @@ -78517,7 +74296,7 @@ }, /area/station/supply/storage) "ozI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -78666,10 +74445,7 @@ amount = 50 }, /obj/item/stack/tape_roll, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -78695,10 +74471,7 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -78786,10 +74559,8 @@ /area/station/science/test_chamber) "oER" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/directional/east{ + cell_type = 15000 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -78798,7 +74569,7 @@ /area/station/aisat/hall) "oFj" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "oFk" = ( @@ -79038,22 +74809,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "oIB" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/south, +/obj/machinery/firealarm/directional/east, /obj/machinery/computer/message_monitor{ dir = 8 }, @@ -79085,11 +74846,7 @@ /area/station/maintenance/aft) "oJo" = ( /obj/structure/closet/secure_closet/scientist, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -79105,10 +74862,7 @@ /turf/simulated/floor/transparent/glass, /area/station/service/bar/atrium) "oJu" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/vehicle/janicart, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -79136,16 +74890,12 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "oJO" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, /area/station/maintenance/port) "oKl" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -79234,7 +74984,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "oLS" = ( @@ -79249,11 +74999,7 @@ /area/station/science/xenobiology) "oLW" = ( /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/machinery/atmospherics/binary/valve/open{ dir = 4; name = "Filter to Space" @@ -79312,19 +75058,9 @@ }, /area/station/command/office/captain) "oND" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/power/apc/directional/north, +/obj/machinery/firealarm/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -79336,9 +75072,7 @@ dir = 8; id_tag = "trash" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "oOe" = ( @@ -79440,20 +75174,13 @@ /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) "oPX" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "oPY" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/camera{ c_tag = "Aft Primary Hallway 1"; dir = 4; @@ -79526,9 +75253,7 @@ }, /area/station/maintenance/fsmaint) "oRn" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/economy/atm{ pixel_x = 32 }, @@ -79653,11 +75378,7 @@ /area/station/medical/sleeper) "oTk" = ( /obj/effect/spawner/random_spawners/oil_maybe, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -79665,9 +75386,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oTy" = ( -/obj/machinery/ai_status_display{ - layer = 4 - }, +/obj/machinery/ai_status_display, /turf/simulated/wall/r_wall, /area/station/medical/storage) "oTG" = ( @@ -79726,11 +75445,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/book/manual/wiki/sop_general{ pixel_x = -6; pixel_y = 2 @@ -79791,7 +75506,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "oVH" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "oVJ" = ( @@ -79830,17 +75545,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/item/reagent_containers/spray/waterflower, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "oWe" = ( @@ -79900,10 +75607,7 @@ /obj/item/clothing/shoes/orange, /obj/item/clothing/shoes/orange, /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/item/crowbar/large, /obj/item/clothing/under/misc/pj/red, /obj/item/clothing/under/misc/pj/red, @@ -80003,10 +75707,7 @@ "oYC" = ( /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -80048,9 +75749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "oZr" = ( @@ -80077,9 +75776,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "pao" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80113,10 +75810,7 @@ /obj/effect/turf_decal/woodsiding/end{ dir = 1 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "paW" = ( @@ -80124,11 +75818,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -80152,9 +75842,7 @@ /turf/simulated/floor/plating, /area/station/security/warden) "pbx" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/computer/area_atmos/area{ dir = 4 }, @@ -80217,9 +75905,7 @@ "pdE" = ( /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80259,9 +75945,7 @@ "pfB" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/space_heater, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -80454,11 +76138,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "piL" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plating, /area/station/service/janitor) @@ -80671,11 +76351,7 @@ }, /area/station/medical/morgue) "plW" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/sign/vacuum/external{ pixel_x = -32 }, @@ -80712,11 +76388,7 @@ /area/station/service/clown) "pmH" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -80815,10 +76487,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -80880,9 +76549,7 @@ /area/station/service/hydroponics) "poC" = ( /obj/structure/closet/secure_closet/research_reagents, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /obj/structure/disaster_counter/scichem{ pixel_y = 32 }, @@ -80972,9 +76639,7 @@ }, /area/station/aisat/hall) "pql" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -81184,10 +76849,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -81242,28 +76904,19 @@ /area/station/command/bridge) "pwf" = ( /obj/machinery/chem_dispenser, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/engine, /area/station/science/misc_lab) "pwk" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/station/science/hallway) "pwm" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -81361,9 +77014,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "pxG" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -81382,9 +77033,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -81527,9 +77176,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pAx" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" @@ -81543,11 +77190,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "pAU" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/table/reinforced, /obj/item/book/manual/wiki/sop_legal{ pixel_x = 5; @@ -81604,11 +77247,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -81624,11 +77263,7 @@ /area/station/maintenance/asmaint) "pCx" = ( /obj/machinery/chem_heater, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/engine, /area/station/science/misc_lab) "pCy" = ( @@ -81687,9 +77322,7 @@ /turf/simulated/floor/carpet/black, /area/station/maintenance/fsmaint) "pDZ" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -81730,12 +77363,8 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "blue" @@ -81946,17 +77575,11 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Captain's Office" }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "pKv" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -81987,9 +77610,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "pLy" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blue" @@ -82009,13 +77630,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/west{ id = "psych_bolt"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -16; - pixel_y = 7; - specialfunctions = 4 + pixel_y = 7 }, /turf/simulated/floor/carpet, /area/station/medical/psych) @@ -82119,18 +77736,12 @@ }, /area/station/engineering/break_room) "pNG" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/wood, /area/station/command/office/hop) "pNL" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -82311,13 +77922,8 @@ /area/station/maintenance/abandonedbar) "pRD" = ( /obj/machinery/computer/supplycomp, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/carpet, /area/station/supply/qm) "pRE" = ( @@ -82426,7 +78032,7 @@ /area/station/engineering/engine/supermatter) "pTs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "pTJ" = ( @@ -82547,16 +78153,9 @@ }, /area/station/hallway/primary/central/south) "pVw" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/glass/bucket, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82581,11 +78180,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "pWT" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/item/flag/nt, /obj/structure/cable{ d2 = 8; @@ -82695,14 +78290,8 @@ }, /area/station/medical/morgue) "pZK" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /obj/machinery/camera{ c_tag = "Xenobiology Module West"; dir = 4; @@ -82935,20 +78524,14 @@ /obj/item/flashlight/lamp/green{ pixel_y = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "qef" = ( /turf/simulated/floor/wood, /area/station/service/clown) "qei" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -82981,9 +78564,7 @@ name = "Prison Intercom (General)"; pixel_y = 22 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /turf/simulated/floor/grass, /area/station/security/permabrig) @@ -83032,9 +78613,7 @@ }, /obj/item/clothing/under/color/grey, /obj/item/clothing/under/color/grey, -/obj/machinery/light_construct/small{ - dir = 1 - }, +/obj/machinery/light_construct/small/south, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "qgz" = ( @@ -83062,15 +78641,8 @@ }, /area/station/science/xenobiology) "qgF" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/structure/sink/directional/west, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -83106,9 +78678,7 @@ /area/station/maintenance/port) "qhC" = ( /obj/structure/chair/sofa/bench, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "qhK" = ( @@ -83236,9 +78806,7 @@ }, /area/station/medical/sleeper) "qjZ" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/decal/warning_stripes/blue/hollow, /turf/simulated/floor/plasteel{ @@ -83279,11 +78847,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "qkB" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -83415,16 +78979,9 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "qmW" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/structure/dresser, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -83443,20 +79000,17 @@ autolink_sensors = list("burn_sensor"="Burn Mix"); name = "Bomb Mix Monitor" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "ToxinsVenting"; name = "Toxin Venting Control"; - pixel_x = -8; - pixel_y = 26 + pixel_x = -8 }, /obj/machinery/ignition_switch{ id = "toxinsigniter"; pixel_x = 6; pixel_y = 25 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -83524,9 +79078,7 @@ /area/station/security/permabrig) "qom" = ( /obj/structure/table/wood, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/item/storage/fancy/donut_box{ pixel_y = 2 }, @@ -83542,15 +79094,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "qot" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/storage) "qov" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "qoQ" = ( @@ -83637,9 +79185,7 @@ /area/station/engineering/hallway) "qqB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/largecrate, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -83673,11 +79219,7 @@ /area/station/legal/lawoffice) "qrr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, @@ -83733,9 +79275,7 @@ /area/station/hallway/primary/starboard/east) "qsl" = ( /obj/structure/table/wood, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/item/flashlight/lamp/green{ pixel_y = 8 }, @@ -83778,11 +79318,7 @@ /area/space/nearstation) "qsV" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -83808,7 +79344,7 @@ /obj/item/reagent_containers/spray/cleaner{ pixel_x = -5 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -83838,9 +79374,7 @@ }, /area/station/engineering/supermatter_room) "qth" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "qtm" = ( @@ -83946,18 +79480,15 @@ "qvf" = ( /obj/structure/table, /obj/item/melee/baton/cattleprod, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/maintenance/asmaint) "qvo" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "stationawaygate"; name = "Gateway Shutters Control"; - pixel_x = 24; req_one_access_txt = "62" }, /turf/simulated/floor/plasteel{ @@ -84005,9 +79536,7 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/random_spawners/cobweb_right_frequent, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "qwU" = ( @@ -84053,9 +79582,7 @@ }, /area/station/security/execution) "qyf" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/machinery/shower{ dir = 8 }, @@ -84067,11 +79594,7 @@ /area/station/science/xenobiology) "qyq" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -84117,14 +79640,8 @@ "qzn" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/green/hollow, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -84267,9 +79784,7 @@ pixel_x = -3; pixel_y = -3 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -84325,9 +79840,7 @@ }, /area/station/maintenance/fsmaint) "qCZ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, @@ -84346,12 +79859,11 @@ pixel_x = -22; pixel_y = 22 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -32; - pixel_y = 22; req_one_access_txt = "2" }, /obj/machinery/flasher_button{ @@ -84424,11 +79936,7 @@ pixel_x = 7; pixel_y = 3 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -84651,9 +80159,7 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -84690,9 +80196,7 @@ /turf/simulated/floor/wood, /area/station/command/office/blueshield) "qIu" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -84777,9 +80281,7 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "qJB" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" @@ -84796,7 +80298,7 @@ /area/station/engineering/supermatter_room) "qJK" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "qJN" = ( @@ -84815,11 +80317,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, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -84862,10 +80360,7 @@ /area/station/public/toilet/lockerroom) "qKG" = ( /obj/effect/turf_decal/loading_area, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -84905,10 +80400,7 @@ /area/station/science/xenobiology) "qLc" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -84965,9 +80457,7 @@ /area/station/hallway/primary/central/south) "qLD" = ( /obj/effect/spawner/random_spawners/blood_often, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/shard{ icon_state = "small" }, @@ -85101,11 +80591,7 @@ /area/station/medical/ward) "qNB" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -85224,10 +80710,9 @@ /obj/structure/table, /obj/item/pen, /obj/item/paper/crumpled, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "oldshop"; - name = "Old Shop Shutters Control"; - pixel_x = 24 + name = "Old Shop Shutters Control" }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -85242,9 +80727,7 @@ /area/station/science/robotics/chargebay) "qQx" = ( /obj/machinery/power/port_gen/pacman, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Engineering Equipment Storage Hardsuits"; dir = 4; @@ -85296,27 +80779,19 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "qRs" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/service/hydroponics) "qRu" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "qRS" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -85387,7 +80862,7 @@ /obj/structure/chair/comfy/brown{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/c_tube, /turf/simulated/floor/carpet/orange, /area/station/maintenance/fsmaint) @@ -85443,11 +80918,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "qUu" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -85655,7 +81126,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "qYK" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -85762,10 +81233,7 @@ }, /area/station/medical/medbay2) "rbb" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85784,9 +81252,7 @@ /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) "rbx" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/camera{ c_tag = "AI Satellite Antechamber South"; dir = 4 @@ -85902,10 +81368,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rcZ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -85957,9 +81420,7 @@ }, /area/station/medical/paramedic) "ree" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "reu" = ( @@ -86002,11 +81463,7 @@ icon_state = "0-4" }, /obj/machinery/atmospherics/portable/scrubber, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -86055,9 +81512,7 @@ /turf/simulated/wall, /area/station/maintenance/apmaint) "rgv" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -86143,10 +81598,7 @@ pixel_x = 4; pixel_y = 6 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "rix" = ( @@ -86257,11 +81709,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = -24; - pixel_y = -24; req_access_txt = "24" }, /turf/simulated/floor/plasteel{ @@ -86367,9 +81818,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rnu" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; @@ -86509,12 +81958,8 @@ /obj/item/paper/gravity_gen, /obj/item/pen/blue, /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -86618,11 +82063,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - cell_type = 15000; - dir = 1; - name = "Cryo and Arrivals Super APC"; - pixel_y = 24 +/obj/machinery/power/apc/engie/north{ + cell_type = 5000 }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" @@ -86641,9 +82083,7 @@ /area/station/maintenance/fsmaint) "rvH" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "rwc" = ( @@ -86691,7 +82131,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "rwI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -86763,20 +82203,14 @@ dir = 4; pixel_x = -36 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "ryo" = ( /obj/structure/sign/electricshock{ pixel_x = -32 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -86804,13 +82238,11 @@ "rzy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold4w/visible, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "rzA" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -86924,19 +82356,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/service/hydroponics) "rCT" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -87047,11 +82474,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "rEx" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -87213,10 +82636,7 @@ }, /area/station/engineering/supermatter_room) "rHF" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -87261,11 +82681,7 @@ }, /area/station/supply/miningdock) "rJp" = ( -/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" @@ -87304,9 +82720,7 @@ /area/station/security/prison/cell_block/A) "rKD" = ( /obj/item/reagent_containers/glass/bucket, -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -87333,9 +82747,7 @@ }, /area/station/hallway/secondary/exit) "rLs" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -87347,15 +82759,8 @@ }, /area/station/command/office/captain) "rLK" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/machinery/newscaster/directional/west, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 28 }, @@ -87438,10 +82843,9 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Singularity"; - name = "Containment Blast Doors"; - pixel_x = 32 + name = "Containment Blast Doors" }, /obj/machinery/door/airlock/engineering/glass{ name = "Engine Room" @@ -87467,7 +82871,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "rOg" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "rPa" = ( @@ -87639,9 +83043,7 @@ /obj/structure/toilet{ pixel_y = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/locked/prison{ name = "Prison Intercom (General)"; @@ -87762,10 +83164,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/computer/message_monitor, /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) @@ -88090,7 +83489,7 @@ }, /area/station/medical/psych) "sar" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -88164,9 +83563,7 @@ }, /area/station/engineering/supermatter_room) "sbP" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -88174,10 +83571,7 @@ /area/station/command/teleporter) "sbR" = ( /obj/structure/table/wood, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/item/flashlight/lamp/bananalamp{ layer = 3.4; pixel_x = 4; @@ -88390,9 +83784,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -88507,9 +83899,7 @@ "sji" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -88566,10 +83956,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) "skf" = ( @@ -88583,9 +83970,7 @@ }, /area/station/hallway/secondary/exit) "skh" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/storage) "ski" = ( @@ -88642,16 +84027,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "slC" = ( -/obj/machinery/holosign_switch{ - dir = 4; - id = "surgery1"; - pixel_x = -24; - pixel_y = 8 +/obj/machinery/holosign_switch/west{ + pixel_y = 8; + id = "surgery1" }, -/obj/machinery/light_switch{ - dir = 4; - name = "custom placement"; - pixel_x = -24; +/obj/machinery/light_switch/west{ pixel_y = -8 }, /obj/machinery/button/windowtint{ @@ -88735,10 +84115,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -88746,9 +84123,7 @@ /obj/structure/closet/crate, /obj/effect/spawner/random_spawners/cobweb_right_rare, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "smW" = ( @@ -88826,20 +84201,14 @@ dir = 1; network = list("Singularity","SS13","Engineering") }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, /area/station/engineering/control) "snV" = ( /obj/machinery/atmospherics/trinary/tvalve/digital/flipped, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -88867,7 +84236,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "sou" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/closet/secure_closet/miner, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -88906,9 +84275,7 @@ }, /area/station/command/office/captain/bedroom) "soX" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/structure/chair/stool{ dir = 8 }, @@ -88918,9 +84285,7 @@ /obj/machinery/camera{ c_tag = "Bar North" }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89051,9 +84416,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "ssf" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -89264,7 +84627,7 @@ pixel_x = 4; pixel_y = 2 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "sve" = ( @@ -89322,9 +84685,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -89337,9 +84698,7 @@ /area/station/engineering/atmos) "swk" = ( /obj/structure/chair, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -89349,10 +84708,7 @@ /obj/machinery/sleeper{ pixel_x = 3 }, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/decal/warning_stripes/blue/hollow, /turf/simulated/floor/plasteel{ dir = 6; @@ -89361,9 +84717,7 @@ /area/station/medical/sleeper) "sxh" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/command/office/hop) "sxn" = ( @@ -89472,7 +84826,7 @@ }, /area/station/science/hallway) "szS" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -89522,10 +84876,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "sAl" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) @@ -89613,11 +84964,7 @@ "sBx" = ( /obj/structure/closet/wardrobe/black, /obj/effect/decal/warning_stripes/north, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/structure/window/reinforced{ dir = 1 }, @@ -90048,9 +85395,7 @@ /area/holodeck/alphadeck) "sHC" = ( /obj/machinery/economy/vending/coffee, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -90087,10 +85432,7 @@ }, /area/station/engineering/gravitygenerator) "sIO" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90139,10 +85481,9 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "engsm"; name = "Radiation Shutters Control"; - pixel_y = -24; req_access_txt = "10" }, /turf/simulated/floor/plasteel{ @@ -90190,10 +85531,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "sLy" = ( -/obj/machinery/power/apc{ - name = "south bump Engineering"; - pixel_y = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/south{ + cell_type = 2500 }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -90356,10 +85695,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "sPb" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -90441,9 +85777,7 @@ /area/station/security/main) "sPF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -90460,11 +85794,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -90491,9 +85821,7 @@ /area/station/engineering/supermatter_room) "sRi" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "sRm" = ( @@ -90520,9 +85848,7 @@ /turf/simulated/floor/carpet, /area/station/service/chapel) "sRJ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -90588,9 +85914,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) "sSP" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/portable/pump, /turf/simulated/floor/engine, /area/station/science/test_chamber) @@ -90609,12 +85933,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "sSX" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 - }, +/obj/structure/sink/kitchen/west, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/grass, /area/station/security/permabrig) @@ -90693,7 +86012,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -90758,9 +86077,7 @@ /obj/item/clothing/glasses/hud/health{ pixel_y = 6 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -90822,10 +86139,7 @@ }, /area/station/medical/morgue) "sVz" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -90911,9 +86225,7 @@ name = "Robotics Operating Computer"; stat = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -90925,10 +86237,7 @@ }, /obj/effect/decal/cleanable/dust, /mob/living/simple_animal/mouse/gray, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91005,9 +86314,7 @@ "tab" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/green/hollow, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91021,7 +86328,7 @@ /area/station/security/brig) "tai" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "taM" = ( @@ -91146,11 +86453,7 @@ /area/station/maintenance/apmaint) "tcX" = ( /obj/machinery/photocopier, -/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) "tdb" = ( @@ -91273,9 +86576,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) "tfH" = ( @@ -91394,9 +86695,7 @@ }, /area/station/engineering/supermatter_room) "thb" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91408,12 +86707,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "thl" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/alarm/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "thq" = ( @@ -91516,31 +86811,25 @@ "tia" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sink/kitchen{ - dir = 8; - name = "old sink"; - pixel_x = 12 - }, +/obj/structure/sink/kitchen/east, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/station/security/permabrig) "tiR" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "kitchenhall"; name = "Kitchen Hallway Shutters Control"; pixel_x = 6; - pixel_y = -24; req_one_access_txt = "28" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "kitchenbar"; name = "Kitchen Bar Shutters Control"; pixel_x = -6; - pixel_y = -24; req_one_access_txt = "28" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/processor, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -91584,9 +86873,7 @@ }, /area/station/public/construction) "tkb" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91598,9 +86885,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "tkc" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91679,9 +86964,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) "tlj" = ( @@ -91724,10 +87007,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "tlC" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -91742,18 +87022,14 @@ }, /area/station/public/toilet/lockerroom) "tlI" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/economy/vending/snack, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "tlP" = ( /obj/effect/landmark/spawner/rev, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/toilet/material/captain{ dir = 4 }, @@ -91846,7 +87122,7 @@ /turf/simulated/floor/beach/sand, /area/station/hallway/secondary/exit) "tnR" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /mob/living/simple_animal/hostile/retaliate/carp/koi, /turf/simulated/floor/beach/water{ icon_state = "seadeep" @@ -92062,7 +87338,7 @@ pixel_y = 3 }, /obj/item/gun/syringe, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -92132,9 +87408,7 @@ /turf/simulated/floor/plating, /area/station/science/explab) "tuJ" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -92153,7 +87427,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" @@ -92215,15 +87489,8 @@ /area/station/security/permabrig) "twv" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -92258,11 +87525,7 @@ }, /area/station/security/permabrig) "twT" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -92281,10 +87544,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -92375,11 +87635,7 @@ /area/station/maintenance/fsmaint) "tzE" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "tzW" = ( @@ -92421,9 +87677,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/portsolar) "tAp" = ( @@ -92433,11 +87687,7 @@ pixel_y = 4 }, /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -92502,11 +87752,7 @@ "tCl" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -92524,7 +87770,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "tCS" = ( @@ -92536,11 +87782,7 @@ /area/station/maintenance/apmaint) "tCY" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -92597,9 +87839,7 @@ "tEu" = ( /obj/structure/table/wood/fancy/blue, /obj/item/aiModule/reset, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -92767,11 +88007,7 @@ /obj/machinery/computer/rdservercontrol{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -93035,11 +88271,7 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "tNc" = ( @@ -93104,7 +88336,7 @@ /obj/structure/sign/poster/random{ pixel_x = 32 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -93144,9 +88376,7 @@ }, /area/station/medical/paramedic) "tPD" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -93240,9 +88470,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -93491,9 +88719,7 @@ "tVd" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/engine, /area/station/science/misc_lab) "tVi" = ( @@ -93618,11 +88844,7 @@ "tXx" = ( /obj/structure/grille/broken, /obj/item/book/manual/wiki/sop_engineering, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "tXE" = ( @@ -93742,25 +88964,22 @@ }, /area/station/engineering/supermatter_room) "tYr" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Engineering Secure Storage"; - pixel_x = -24; req_access_txt = "11" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ desc = "A remote control-switch for the engineering security doors."; id = "Engineering"; name = "Engineering Lockdown"; - pixel_x = -24; pixel_y = 10; req_access_txt = "10" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "atmos"; name = "Atmospherics Lockdown"; - pixel_x = -24; pixel_y = -10; req_access_txt = "24" }, @@ -93772,20 +88991,14 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellow" }, /area/station/command/office/ce) "tYP" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/structure/table, /obj/item/clothing/gloves/color/latex, /turf/simulated/floor/plasteel{ @@ -93807,12 +89020,8 @@ /obj/machinery/photocopier/faxmachine{ department = "Quartermaster's Office" }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -93846,11 +89055,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "tZY" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel/stairs/right, /area/station/command/bridge) "uac" = ( @@ -93916,10 +89121,7 @@ pixel_y = 2 }, /obj/item/clothing/gloves/boxing/yellow, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ubE" = ( @@ -93997,10 +89199,7 @@ /turf/space, /area/space/nearstation) "udc" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -94216,10 +89415,7 @@ /area/station/public/dorms) "uhh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -94256,11 +89452,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "uhU" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -94291,10 +89483,7 @@ /turf/simulated/floor/engine, /area/station/science/explab/chamber) "uiw" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkyellow" @@ -94464,10 +89653,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "ulC" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/economy/vending/cigarette, /obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/oak, @@ -94618,11 +89804,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) "uoH" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) @@ -94638,11 +89820,7 @@ }, /area/station/command/office/rd) "uoR" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -94650,11 +89828,8 @@ /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "uph" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump Engineering"; - pixel_y = 24; - shock_proof = 1 +/obj/machinery/power/apc/engie/north{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 2; @@ -94739,11 +89914,7 @@ /area/station/engineering/atmos) "ure" = ( /obj/machinery/disposal, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -94823,7 +89994,7 @@ }, /area/station/engineering/emergency) "usZ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "uti" = ( @@ -94867,7 +90038,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) "utC" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -94881,11 +90052,7 @@ /obj/item/reagent_containers/food/snacks/pie{ pixel_y = 2 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -94894,7 +90061,7 @@ /area/station/service/clown) "uuh" = ( /obj/machinery/disposal, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -95411,9 +90578,7 @@ }, /area/station/engineering/atmos) "uCJ" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -95496,9 +90661,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "uES" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/stairs/right, /area/station/engineering/control) "uEU" = ( @@ -95529,9 +90692,7 @@ }, /area/station/security/permabrig) "uFe" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -95764,10 +90925,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hallway) "uKL" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -95834,9 +90992,7 @@ c_tag = "Hydroponics Pasture"; dir = 9 }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -95878,9 +91034,7 @@ }, /area/station/engineering/emergency) "uMu" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) "uMy" = ( @@ -96004,9 +91158,7 @@ "uPn" = ( /obj/effect/decal/cleanable/dirt, /obj/item/tank/internals/oxygen, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/aft) "uPs" = ( @@ -96278,7 +91430,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -96562,11 +91714,7 @@ }, /area/station/science/xenobiology) "vaz" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "vaH" = ( @@ -96651,11 +91799,7 @@ "vbD" = ( /obj/structure/bed/psych, /obj/random/therapy, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood{ icon_state = "fancy-wood-cherry" }, @@ -96803,9 +91947,7 @@ }, /area/station/service/kitchen) "veF" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "rampbottom" @@ -96897,7 +92039,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "vfJ" = ( @@ -97006,16 +92148,8 @@ "vhs" = ( /obj/structure/table/wood, /obj/item/melee/chainofcommand, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch/south, /obj/machinery/button/windowtint{ id = "hos_room"; pixel_x = 10; @@ -97048,9 +92182,7 @@ "vic" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/aft) "vih" = ( @@ -97075,11 +92207,7 @@ "viP" = ( /obj/structure/table/glass, /obj/item/hand_labeler, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -97093,10 +92221,8 @@ range = 18 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_x = -7; - pixel_y = 24 +/obj/machinery/light_switch/north{ + pixel_x = -7 }, /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) @@ -97123,9 +92249,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "vkC" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/apmaint) "vkV" = ( @@ -97138,9 +92262,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "vlF" = ( -/obj/machinery/light_construct/small{ - dir = 4 - }, +/obj/machinery/light_construct/small/west, /obj/structure/table/wood, /obj/item/storage/fancy/candle_box/full, /obj/item/storage/fancy/candle_box, @@ -97303,7 +92425,7 @@ /area/station/supply/qm) "voo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/dispenser, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -97346,11 +92468,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/economy/vending/bardrobe, /turf/simulated/floor/wood/fancy/oak, /area/station/service/bar) @@ -97574,9 +92692,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkyellow" @@ -97584,14 +92700,8 @@ /area/station/engineering/control) "vuN" = ( /obj/structure/closet/firecloset, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "purple" @@ -97628,11 +92738,10 @@ /area/station/hallway/secondary/exit) "vvV" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "maint3"; name = "Blast Door Control C"; - pixel_x = 4; - pixel_y = -24 + pixel_x = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -97677,14 +92786,8 @@ /area/station/hallway/secondary/exit) "vwC" = ( /obj/structure/closet/secure_closet/RD, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/keycard_auth{ - pixel_y = -26 - }, +/obj/machinery/light_switch/west, +/obj/machinery/keycard_auth/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkpurple" @@ -97706,7 +92809,7 @@ }, /area/station/science/robotics/chargebay) "vxf" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -97743,10 +92846,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "vxB" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/economy/slot_machine, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -97815,11 +92915,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "vze" = ( @@ -97871,7 +92967,7 @@ /area/station/science/xenobiology) "vzq" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "vzE" = ( @@ -97936,9 +93032,7 @@ }, /area/station/engineering/supermatter_room) "vAZ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -98073,9 +93167,7 @@ }, /area/station/hallway/secondary/exit) "vBX" = ( -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_y = 27 - }, +/obj/structure/reagent_dispensers/spacecleanertank/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "vCe" = ( @@ -98088,11 +93180,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "vCM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -98125,9 +93213,7 @@ "vDR" = ( /obj/structure/table, /obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -98167,11 +93253,7 @@ layer = 2.9 }, /obj/item/storage/box/bodybags, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -98195,11 +93277,7 @@ /turf/simulated/floor/plating, /area/station/medical/paramedic) "vEA" = ( -/obj/structure/sink/kitchen{ - dir = 8; - name = "old sink"; - pixel_x = 12 - }, +/obj/structure/sink/kitchen/east, /obj/item/reagent_containers/glass/bucket, /obj/item/radio/intercom/locked/prison{ dir = 8; @@ -98243,7 +93321,7 @@ /area/station/maintenance/asmaint2) "vFk" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "vFw" = ( @@ -98264,10 +93342,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -98307,12 +93382,8 @@ c_tag = "Holodeck East"; dir = 1 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light/small, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -98329,11 +93400,7 @@ /obj/item/stack/sheet/cardboard{ amount = 10 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -98346,11 +93413,7 @@ /obj/item/bedsheet/captain{ dir = 1 }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "vHd" = ( @@ -98707,10 +93770,7 @@ /area/station/maintenance/aft) "vNX" = ( /obj/machinery/cryopod/robot, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plating, /area/station/aisat/service) "vOb" = ( @@ -98857,10 +93917,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "vQw" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -98966,9 +94023,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/closet/crate/freezer, /obj/item/storage/firstaid/aquatic_kit/full, /obj/item/reagent_containers/glass/bucket, @@ -99035,16 +94090,13 @@ /turf/simulated/floor/bluegrid, /area/station/aisat/hall) "vTU" = ( -/obj/machinery/power/apc{ - cell_type = 5000; - dir = 1; - name = "north bump Important Area"; - pixel_y = 24 - }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, +/obj/machinery/power/apc/directional/north{ + cell_type = 5000 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "vUq" = ( @@ -99081,9 +94133,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "vUK" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/table/wood, /obj/item/trash/candle, /turf/simulated/floor/plating, @@ -99119,20 +94169,14 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "vWr" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" }, /area/station/command/bridge) "vWt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -99149,11 +94193,7 @@ /area/station/security/permabrig) "vWz" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/clipboard, /obj/item/hand_labeler, /obj/structure/window/reinforced{ @@ -99192,11 +94232,7 @@ }, /area/station/maintenance/abandonedbar) "vXb" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -99214,11 +94250,7 @@ }, /area/station/science/toxins/mixing) "vXp" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -99285,11 +94317,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "vYh" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "vYv" = ( @@ -99304,7 +94332,7 @@ pixel_y = 3 }, /obj/item/storage/toolbox, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; @@ -99371,10 +94399,7 @@ }, /area/station/hallway/primary/central/se) "vZl" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -99412,16 +94437,13 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "wap" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/service/clown) "waY" = ( /obj/structure/bed/dogbed/ian, /mob/living/simple_animal/pet/dog/corgi/Ian, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "wbl" = ( @@ -99610,7 +94632,7 @@ /area/station/maintenance/fsmaint) "weV" = ( /obj/machinery/economy/vending/genedrobe, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkpurple" @@ -99685,7 +94707,7 @@ "why" = ( /obj/effect/decal/warning_stripes/southeastcorner, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wie" = ( @@ -99702,9 +94724,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "wii" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/sign/fire{ pixel_x = -32 }, @@ -99739,9 +94759,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "wjh" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -99791,7 +94809,7 @@ cover_color = "#85130b"; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -99803,9 +94821,7 @@ using_irrigation = 1 }, /obj/item/seeds/wheat/rice, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/grass, /area/station/security/permabrig) "wkB" = ( @@ -99818,9 +94834,7 @@ /area/station/maintenance/aft) "wkM" = ( /obj/machinery/photocopier, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "wkQ" = ( @@ -99969,11 +94983,7 @@ "wnQ" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkyellowcorners" }, @@ -99987,11 +94997,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "wnU" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -100042,11 +95048,7 @@ }, /area/station/science/hallway) "woD" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "woK" = ( @@ -100173,11 +95175,7 @@ pixel_x = -2; pixel_y = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkpurple" @@ -100240,9 +95238,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wrl" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blue" @@ -100329,11 +95325,7 @@ "wsY" = ( /obj/structure/table, /obj/item/storage/box/prisoner, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -100421,9 +95413,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "wve" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -100448,9 +95438,7 @@ anchored = 1 }, /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plating/airless, /area/station/engineering/control) "wvz" = ( @@ -100530,13 +95518,8 @@ }, /area/station/security/lobby) "wxp" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -100689,9 +95672,7 @@ /area/station/command/office/hop) "wAG" = ( /obj/machinery/chem_master, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/engine, /area/station/science/misc_lab) "wAP" = ( @@ -100702,10 +95683,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "wAW" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -100723,9 +95701,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "wBy" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -100791,9 +95767,7 @@ }, /area/station/science/xenobiology) "wCk" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/porta_turret{ dir = 4; installation = /obj/item/gun/energy/gun; @@ -100839,11 +95813,7 @@ }, /area/station/service/kitchen) "wCQ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -100861,19 +95831,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "wCZ" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, /area/station/public/dorms) "wDe" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance/two, @@ -100902,15 +95868,8 @@ /turf/simulated/wall/r_wall, /area/station/science/test_chamber) "wEP" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/machinery/newscaster/directional/east, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -28 }, @@ -100953,9 +95912,7 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/carpet, /area/station/command/office/captain) "wGI" = ( @@ -101038,17 +95995,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_x = -26; - pixel_y = 26 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/binary/pump{ name = "Fuel Pipe to Incinerator" }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "wHF" = ( @@ -101065,11 +96018,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "wHW" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -101131,9 +96080,7 @@ /area/station/maintenance/fore) "wII" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -101242,9 +96189,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "wLm" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -101256,9 +96201,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -101504,9 +96447,7 @@ /area/station/supply/miningdock) "wQi" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -101516,9 +96457,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -101544,9 +96483,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "wQI" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ autolink_id = "eng_n_tesla_vent"; dir = 4 @@ -101626,7 +96563,7 @@ /area/station/medical/medbay2) "wSs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "wSU" = ( @@ -101682,11 +96619,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -101763,10 +96696,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/machinery/light, +/obj/structure/sign/poster/official/random/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -101774,7 +96705,7 @@ /area/station/engineering/hallway) "wWp" = ( /obj/effect/decal/cleanable/blood/xeno, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/cooker/deepfryer, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -101876,9 +96807,7 @@ /area/station/command/office/hop) "wYs" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "wYL" = ( @@ -101937,9 +96866,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -102009,12 +96936,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -102074,11 +96997,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/hydroponics/soil, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/grass, /area/station/service/hydroponics) "xcO" = ( @@ -102125,26 +97044,18 @@ dir = 1; network = list("Research","SS13") }, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, /area/station/science/hallway) "xdA" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "xdJ" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -102176,11 +97087,7 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/effect/landmark/start/geneticist, /turf/simulated/floor/plasteel{ dir = 8; @@ -102278,7 +97185,7 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "xfi" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -102308,31 +97215,22 @@ pixel_x = 14; pixel_y = 2 }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/interrogation) "xfQ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/plasteel, /area/station/public/dorms) "xgm" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -102458,11 +97356,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "xhM" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -102473,7 +97367,7 @@ }, /area/station/public/toilet) "xhR" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plating, /area/station/science/toxins/launch) "xhW" = ( @@ -102554,9 +97448,7 @@ /obj/structure/chair/comfy/brown{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/carpet, /area/station/command/office/captain) "xjj" = ( @@ -102739,19 +97631,14 @@ /area/station/maintenance/fore) "xnT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/station/security/permabrig) "xol" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/closet/secure_closet/roboticist, /obj/structure/cable, /turf/simulated/floor/plasteel{ @@ -102767,11 +97654,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ dir = 9; @@ -102866,9 +97749,7 @@ /turf/simulated/floor/plasteel, /area/station/science/hallway) "xqv" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -103090,9 +97971,7 @@ /area/station/security/prisonlockers) "xun" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "xuG" = ( @@ -103186,9 +98065,7 @@ /obj/machinery/door/window{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -103266,9 +98143,7 @@ }, /area/station/hallway/primary/fore) "xyr" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -103467,11 +98342,7 @@ /area/station/medical/medbay) "xCt" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/wood, /area/station/command/office/hop) "xCz" = ( @@ -103490,18 +98361,11 @@ }, /obj/item/flash, /obj/item/flash, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "xDc" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -103691,11 +98555,8 @@ }, /area/station/maintenance/apmaint) "xHz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump Engineering"; - pixel_x = -24; - shock_proof = 1 +/obj/machinery/power/apc/engie/west{ + cell_type = 2500 }, /obj/structure/cable{ d2 = 2; @@ -103730,16 +98591,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/east, +/obj/machinery/firealarm/directional/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -103777,9 +98630,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "xIm" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -103837,7 +98688,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -103957,10 +98808,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) "xKT" = ( @@ -104093,9 +98941,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "xMP" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, +/obj/machinery/keycard_auth/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -104131,7 +98977,7 @@ /area/station/public/storage/tools) "xNV" = ( /obj/machinery/biogenerator, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "xOn" = ( @@ -104266,10 +99112,7 @@ }, /obj/item/pen, /obj/structure/table, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "xQd" = ( @@ -104322,16 +99165,14 @@ /turf/simulated/floor/plasteel, /area/station/service/chapel) "xRy" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "maint2"; name = "Blast Control Door B"; - pixel_x = -28; pixel_y = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "maint1"; name = "Blast Control Door A"; - pixel_x = -28; pixel_y = -6 }, /turf/simulated/floor/plating, @@ -104464,18 +99305,14 @@ /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{ dir = 6; icon_state = "darkred" }, /area/station/security/interrogation) "xSH" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/supply/storage) "xSV" = ( @@ -104489,11 +99326,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -104501,11 +99334,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "xTc" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -104540,19 +99369,13 @@ /obj/structure/urinal{ pixel_y = 32 }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, /area/station/public/toilet) "xTZ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -104581,11 +99404,7 @@ /area/station/service/chapel) "xUK" = ( /obj/structure/table/glass, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/item/slime_scanner, /obj/item/slime_scanner, /turf/simulated/floor/plasteel{ @@ -104617,11 +99436,7 @@ /area/station/legal/lawoffice) "xVC" = ( /obj/structure/closet/secure_closet/injection, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -104641,13 +99456,8 @@ /area/station/security/prisonlockers) "xVM" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -104676,10 +99486,7 @@ /turf/space, /area/space/nearstation) "xWg" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -104691,18 +99498,12 @@ /area/station/maintenance/asmaint2) "xWJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "xWL" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 - }, +/obj/machinery/light_switch/west, +/obj/structure/reagent_dispensers/peppertank/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -104791,7 +99592,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "xXO" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/storage/toolbox/mechanical, @@ -104876,9 +99677,7 @@ pixel_y = -3 }, /obj/item/reagent_containers/food/drinks/trophy/bronze_cup, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/aft) "xYK" = ( @@ -104995,9 +99794,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/rack{ dir = 1 }, @@ -105006,9 +99803,7 @@ /area/station/maintenance/fsmaint) "ybE" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/green/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -105134,11 +99929,7 @@ /turf/simulated/floor/plating, /area/station/medical/morgue) "yeL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 4; @@ -105299,9 +100090,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/space, /area/space/nearstation) "yhF" = ( @@ -105312,11 +100101,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "yhP" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/computer/security/engineering{ dir = 1; network = list("Power Alarms","Atmosphere Alarms","Fire Alarms","Engineering") @@ -105467,10 +100252,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "yjV" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -105520,9 +100302,7 @@ /obj/item/cartridge/atmos, /obj/item/t_scanner, /obj/item/wrench, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -105579,9 +100359,7 @@ /obj/structure/chair/stool{ dir = 8 }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "yme" = ( @@ -133476,7 +128254,7 @@ yfR bee aRw aRw -bgU +bdD erp bbr blU diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index e56d007ecbc0..22e281f84098 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -264,11 +264,7 @@ /turf/space, /area/space/nearstation) "ado" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -306,12 +302,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "adx" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -339,11 +331,7 @@ /turf/simulated/wall/r_wall, /area/station/hallway/secondary/entry) "adO" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -454,9 +442,7 @@ /turf/space, /area/space/nearstation) "aey" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) @@ -465,16 +451,12 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "aeA" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "aeC" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "aeI" = ( @@ -512,11 +494,7 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/effect/decal/warning_stripes/east, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "aeP" = ( @@ -547,10 +525,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/library) "afa" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, @@ -568,10 +543,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "afd" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, @@ -583,11 +556,7 @@ /area/shuttle/pod_4) "aff" = ( /obj/structure/closet/emcloset, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "afg" = ( @@ -604,11 +573,7 @@ "afj" = ( /obj/item/kirbyplants, /obj/effect/decal/warning_stripes/northeast, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "afk" = ( @@ -631,10 +596,7 @@ }, /area/station/hallway/secondary/entry) "afn" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/warning_stripes/northwest, /obj/structure/cable{ d1 = 2; @@ -645,9 +607,7 @@ /area/station/maintenance/auxsolarstarboard) "afx" = ( /obj/machinery/power/smes, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/north, /obj/structure/cable{ d2 = 8; @@ -686,9 +646,7 @@ }, /area/station/hallway/secondary/entry) "afJ" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -753,9 +711,7 @@ }, /area/station/security/checkpoint/south) "agd" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -770,22 +726,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "agg" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/status_display/directional/west, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "agh" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Arrivals Center Fore"; dir = 8 @@ -804,9 +752,7 @@ "agp" = ( /obj/structure/table/reinforced, /obj/item/clipboard, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Starboard Arrivals Storage"; dir = 4; @@ -1016,14 +962,12 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ahW" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/hologram/holopad, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aik" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -1043,9 +987,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aio" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -1249,15 +1191,11 @@ /turf/space, /area/space) "aka" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akb" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -1343,9 +1281,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "alv" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "alw" = ( @@ -1353,12 +1289,8 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aly" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Arrivals Center Aft"; dir = 8 @@ -1372,21 +1304,14 @@ c_tag = "Chief Engineer's Quarters"; network = list("Engineering","SS13") }, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/effect/decal/warning_stripes/northwest, /obj/item/rpd/bluespace, /turf/simulated/floor/plasteel, /area/station/command/office/ce) "alG" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/status_display/directional/west, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Arrivals Aft Starboard"; dir = 4; @@ -1419,20 +1344,15 @@ /area/station/maintenance/fore2) "alR" = ( /obj/structure/chair/stool, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/alarm/directional/north, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/fore2) "alW" = ( /obj/machinery/bodyscanner{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -1499,7 +1419,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "amC" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -1580,7 +1500,7 @@ }, /area/station/maintenance/fore2) "amT" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -1607,20 +1527,14 @@ }, /area/station/hallway/secondary/entry) "ann" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" }, /area/station/hallway/secondary/entry) "anp" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/machinery/camera{ c_tag = "Arrivals Hall Center" }, @@ -1634,13 +1548,8 @@ }, /area/station/hallway/secondary/entry) "ans" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -1659,11 +1568,7 @@ }, /area/station/hallway/secondary/entry) "any" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -1675,9 +1580,7 @@ /area/station/hallway/primary/central/nw) "anz" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -1757,10 +1660,7 @@ }, /area/station/hallway/secondary/entry) "anX" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -1772,11 +1672,7 @@ }, /area/station/hallway/secondary/entry) "anY" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -1809,11 +1705,7 @@ "aoe" = ( /obj/structure/table, /obj/random/toolbox, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -1822,34 +1714,20 @@ /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/fore2) "aog" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/structure/sink/kitchen/north, +/obj/machinery/newscaster/directional/east, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/station/maintenance/fore2) "aoh" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/fore2) "aoi" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/fore2) @@ -1967,9 +1845,7 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "aoR" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -1989,9 +1865,7 @@ /area/station/public/vacant_office) "aoV" = ( /obj/machinery/photocopier, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "aoX" = ( @@ -2004,18 +1878,11 @@ /area/station/public/vacant_office) "aoY" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood, /area/station/public/vacant_office) "aoZ" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -2024,21 +1891,14 @@ "apa" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/wood, /area/station/public/vacant_office) "apb" = ( /obj/structure/table/wood, /obj/item/taperecorder, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/public/vacant_office) "apc" = ( @@ -2064,19 +1924,9 @@ /area/station/command/customs) "apg" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/keycard_auth{ - pixel_x = 24; - pixel_y = 24 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/keycard_auth/north, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "blue" @@ -2108,15 +1958,8 @@ /area/station/hallway/secondary/entry) "apl" = ( /obj/structure/filingcabinet, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -2156,9 +1999,7 @@ }, /area/station/maintenance/fore2) "apq" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -2325,9 +2166,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "apT" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/structure/computerframe, /turf/simulated/floor/wood, /area/station/public/vacant_office) @@ -2339,11 +2178,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/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -2358,11 +2193,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/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -2419,11 +2250,7 @@ /turf/simulated/floor/plasteel, /area/station/command/customs) "aqj" = ( -/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" @@ -2512,12 +2339,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) "aqy" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "aqz" = ( @@ -2553,12 +2376,8 @@ /area/station/maintenance/electrical_shop) "aqD" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "aqE" = ( @@ -2623,9 +2442,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "aqR" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /obj/machinery/computer/crew{ dir = 4 }, @@ -2669,11 +2486,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "aqZ" = ( @@ -2702,9 +2515,7 @@ c_tag = "Arrivals Checkpoint"; dir = 8 }, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/machinery/computer/prisoner{ dir = 8 }, @@ -2751,12 +2562,8 @@ /area/station/maintenance/fore2) "arj" = ( /obj/item/kirbyplants, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/sign/poster/contraband/random/north, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -2831,11 +2638,7 @@ c_tag = "Journalist Office"; dir = 1 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "ary" = ( @@ -2866,16 +2669,12 @@ "arB" = ( /obj/structure/table/wood, /obj/item/phone, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "arC" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "arE" = ( @@ -2893,15 +2692,13 @@ "arG" = ( /obj/structure/table/wood, /obj/item/camera, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/camera_film, /obj/item/camera_film, /turf/simulated/floor/wood, /area/station/public/vacant_office) "arH" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -2913,14 +2710,8 @@ dir = 4; pixel_y = -22 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /obj/machinery/computer/card{ dir = 4 }, @@ -3033,14 +2824,8 @@ }, /area/station/security/checkpoint/secondary) "arT" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /obj/machinery/computer/security{ dir = 8 }, @@ -3074,12 +2859,8 @@ "arY" = ( /obj/structure/table/wood, /obj/item/toy/minimeteor, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/sign/poster/contraband/random/north, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/fore2) "asa" = ( @@ -3135,9 +2916,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "asp" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -3147,9 +2926,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "asr" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -3161,9 +2938,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "asw" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/machinery/computer/med_data{ dir = 4 }, @@ -3245,9 +3020,7 @@ }, /area/station/security/checkpoint/secondary) "asH" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /obj/machinery/computer/secure_data{ dir = 8 }, @@ -3327,9 +3100,7 @@ dir = 4; id = "garbage" }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/machinery/door/poddoor/preopen{ id_tag = "innerdisposal" }, @@ -3338,9 +3109,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "asS" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/mass_driver{ dir = 4; id_tag = "trash" @@ -3510,9 +3279,7 @@ /area/station/maintenance/electrical_shop) "atn" = ( /obj/structure/computerframe, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "atp" = ( @@ -3572,28 +3339,18 @@ /area/station/maintenance/fore) "atx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fore) "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, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -3611,22 +3368,14 @@ /area/station/command/customs) "atB" = ( /obj/structure/filingcabinet, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "blue" }, /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 }, @@ -3635,22 +3384,14 @@ /area/station/hallway/secondary/entry) "atD" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/hallway/secondary/entry) "atE" = ( /obj/structure/chair/comfy/brown{ dir = 1 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/hallway/secondary/entry) "atF" = ( @@ -3661,11 +3402,7 @@ /area/station/hallway/secondary/entry) "atG" = ( /obj/structure/closet/wardrobe/red, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -3683,11 +3420,7 @@ /area/station/security/checkpoint/secondary) "atI" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -3776,9 +3509,7 @@ name = "Trash Ejector Button"; pixel_x = -26 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) @@ -3809,11 +3540,7 @@ /area/station/medical/storage) "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; @@ -3828,12 +3555,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) "aui" = ( -/obj/machinery/light/small, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/light/small/directional/north, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) @@ -3854,24 +3577,17 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) "auk" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/chair/stool, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "aum" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "auo" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -3882,11 +3598,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter/zippo, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "aus" = ( @@ -3921,9 +3633,7 @@ /area/station/maintenance/fore2) "auw" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "aux" = ( @@ -3935,9 +3645,7 @@ "auy" = ( /obj/structure/table/wood, /obj/item/toy/AI, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "auz" = ( @@ -3953,19 +3661,16 @@ dir = 1; id = "garbage" }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "auB" = ( /obj/structure/window/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "innerdisposal"; - name = "Disposal Blast door control"; - pixel_x = -26 + name = "Disposal Blast door control" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -4027,9 +3732,7 @@ /area/station/maintenance/fore2) "auP" = ( /obj/structure/rack, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -4056,9 +3759,7 @@ /area/station/maintenance/disposal) "avc" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -4091,9 +3792,7 @@ /area/station/hallway/secondary/entry) "avg" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -4117,9 +3816,7 @@ /area/station/maintenance/fore2) "avk" = ( /obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -4141,10 +3838,7 @@ "avp" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/regular/hipster, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -4153,11 +3847,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) @@ -4203,9 +3893,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "avC" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -4229,9 +3917,7 @@ }, /area/station/maintenance/fore) "avM" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -4348,9 +4034,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "awB" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) "awC" = ( @@ -4644,11 +4328,7 @@ }, /area/station/maintenance/disposal) "axC" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -4678,13 +4358,8 @@ }, /area/station/maintenance/disposal) "axE" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/power/apc/directional/south, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d2 = 8; @@ -4732,7 +4407,7 @@ }, /area/station/engineering/controlroom) "axL" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -4747,11 +4422,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "axN" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -5036,9 +4707,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aze" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood, /area/station/maintenance/fore) "azf" = ( @@ -5086,11 +4755,7 @@ dir = 1 }, /obj/machinery/disposal, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -5103,9 +4768,7 @@ }, /area/station/service/janitor) "azs" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/item/mop, /obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -5123,18 +4786,12 @@ 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, /area/station/service/janitor) "azw" = ( /obj/structure/table/glass, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/storage/firstaid/regular{ pixel_y = 2 }, @@ -5152,11 +4809,7 @@ "azy" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -5164,9 +4817,7 @@ /turf/simulated/floor/plating, /area/station/supply/sorting) "azB" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -5182,10 +4833,7 @@ /turf/simulated/floor/plating, /area/station/supply/sorting) "azD" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -5200,10 +4848,9 @@ }, /area/station/supply/sorting) "azF" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "qm_warehouse"; name = "Warehouse Door Control"; - pixel_x = 24; pixel_y = -3; req_access_txt = "31" }, @@ -5214,10 +4861,9 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "qm_warehouse"; name = "Warehouse Door Control"; - pixel_x = -24; pixel_y = -3; req_access_txt = "31" }, @@ -5229,10 +4875,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/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 1; @@ -5248,9 +4891,7 @@ }, /area/station/supply/storage) "azJ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -5283,10 +4924,7 @@ "azN" = ( /obj/structure/table/reinforced, /obj/item/storage/box/lights/mixed, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -5300,9 +4938,7 @@ }, /area/station/supply/storage) "azP" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ dir = 1; @@ -5481,11 +5117,7 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 4; @@ -5573,11 +5205,7 @@ /obj/item/crowbar, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -5617,11 +5245,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aBp" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light/small, +/obj/machinery/power/apc/directional/south, +/obj/machinery/light/small/directional/north, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -5672,11 +5297,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "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; @@ -5893,14 +5514,8 @@ /area/station/supply/storage) "aCL" = ( /obj/machinery/economy/vending/hydrodrobe, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "greenblue" @@ -5923,10 +5538,7 @@ /area/station/supply/storage) "aCP" = ( /mob/living/simple_animal/bot/cleanbot, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purple" @@ -6015,9 +5627,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aDh" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6164,9 +5774,7 @@ }, /area/station/engineering/controlroom) "aEe" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6296,10 +5904,7 @@ }, /area/station/service/clown) "aED" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/effect/decal/warning_stripes/southwest, /obj/structure/cable, /turf/simulated/floor/plating, @@ -6520,9 +6125,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aFp" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; dir = 4; @@ -6566,9 +6169,7 @@ /turf/simulated/wall, /area/station/service/bar) "aFB" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -6580,10 +6181,7 @@ }, /area/station/hallway/secondary/entry) "aFC" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -6607,7 +6205,7 @@ }, /area/station/security/brig) "aFI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/supply/sorting) @@ -6679,11 +6277,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aGc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -6698,11 +6292,8 @@ /area/station/engineering/controlroom) "aGd" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/small/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, /obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -6796,10 +6387,7 @@ /area/station/service/bar/atrium) "aGD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/table/wood, /obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel{ @@ -6810,13 +6398,8 @@ "aGE" = ( /obj/structure/table/wood, /obj/machinery/bottler, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -6921,9 +6504,7 @@ /area/station/engineering/controlroom) "aHk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -7047,22 +6628,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "aHR" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/sink/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7086,7 +6657,7 @@ /area/station/supply/sorting) "aHX" = ( /obj/structure/closet/l3closet/janitor, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -7099,9 +6670,7 @@ /turf/simulated/floor/plating, /area/station/supply/sorting) "aIa" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/chair/sofa/right, /turf/simulated/floor/plasteel{ dir = 9; @@ -7109,13 +6678,8 @@ }, /area/station/supply/office) "aIb" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/north, /obj/structure/chair/sofa, /turf/simulated/floor/plasteel{ dir = 1; @@ -7123,14 +6687,8 @@ }, /area/station/supply/office) "aIc" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/ai_status_display/north, /obj/structure/chair/sofa/left, /turf/simulated/floor/plasteel{ dir = 5; @@ -7138,11 +6696,7 @@ }, /area/station/supply/office) "aId" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -7157,18 +6711,16 @@ }, /area/station/supply/storage) "aIf" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "QMLoaddoor"; layer = 4; name = "Loading Doors"; - pixel_x = 24; pixel_y = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; - pixel_x = 24; pixel_y = -8 }, /obj/machinery/camera{ @@ -7257,9 +6809,7 @@ /area/station/maintenance/auxsolarport) "aIr" = ( /obj/machinery/power/smes, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -7272,10 +6822,7 @@ c_tag = "Port Fore Solars"; network = list("SS13","Engineering") }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -7293,11 +6840,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIu" = ( @@ -7318,13 +6861,8 @@ "aIw" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIx" = ( @@ -7334,10 +6872,7 @@ c_tag = "Turbine"; network = list("SS13","Engineering") }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) "aIy" = ( @@ -7376,19 +6911,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIE" = ( -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/directional/south, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aIF" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -7493,8 +7022,7 @@ /area/station/supply/office) "aJg" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -7531,10 +7059,7 @@ }, /area/station/supply/office) "aJm" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -7549,10 +7074,9 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "aJs" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "engsm"; name = "Radiation Shutters Control"; - pixel_y = 24; req_access_txt = "24" }, /obj/machinery/atmospherics/pipe/manifold/visible, @@ -7609,17 +7133,13 @@ /area/station/supply/storage) "aJF" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aJG" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/multitool, /obj/item/multitool{ pixel_x = 4; @@ -7698,14 +7218,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aJS" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -7718,11 +7232,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) @@ -7783,9 +7293,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aKi" = ( @@ -7799,11 +7307,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = 15000; - name = "Cryo and Arrivals Super APC"; - pixel_y = -24 - }, +/obj/machinery/power/apc/engie/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -7910,11 +7414,8 @@ "aKF" = ( /obj/effect/decal/warning_stripes/north, /obj/structure/closet/emcloset, -/obj/machinery/light, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "aKI" = ( @@ -7941,9 +7442,7 @@ }, /area/station/supply/storage) "aKR" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/table, /obj/machinery/computer/library, /obj/effect/decal/cleanable/dirt, @@ -7982,9 +7481,7 @@ }, /area/station/security/permabrig) "aKV" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/table, /obj/structure/bedsheetbin, /turf/simulated/floor/plasteel{ @@ -8020,11 +7517,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/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) @@ -8039,10 +7532,7 @@ }, /area/station/maintenance/turbine) "aLc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plating, @@ -8099,11 +7589,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aLv" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -8126,7 +7612,7 @@ "aLx" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -8158,11 +7644,7 @@ /obj/structure/chair/stool{ dir = 8 }, -/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) "aLM" = ( @@ -8257,9 +7739,7 @@ name = "Hydroponics Desk" }, /obj/structure/window/reinforced, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/mapping_helpers/airlock/windoor/access/any/supply{ dir = 4 }, @@ -8323,9 +7803,7 @@ "aMA" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -8348,15 +7826,9 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aML" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/southwest, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "aMM" = ( @@ -8475,14 +7947,8 @@ }, /area/station/supply/office) "aNs" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/alarm/directional/east, /obj/machinery/camera{ c_tag = "Cargo Break Room"; dir = 8 @@ -8573,11 +8039,7 @@ dir = 5; color = "lightblue" }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -8596,9 +8058,7 @@ }, /area/station/security/permabrig) "aNP" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/chair/stool{ dir = 8 }, @@ -8764,23 +8224,15 @@ dir = 8 }, /obj/effect/landmark/spawner/rev, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/station/medical/morgue) "aOJ" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/filingcabinet/filingcabinet, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -8828,7 +8280,7 @@ }, /area/station/supply/office) "aOR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "aOS" = ( @@ -8900,11 +8352,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; @@ -9009,35 +8457,21 @@ }, /area/station/security/permabrig) "aPy" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "aPz" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "aPC" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "aPG" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "aPH" = ( @@ -9093,9 +8527,7 @@ /turf/simulated/floor/wood, /area/station/service/theatre) "aPW" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet, /area/station/service/theatre) "aQb" = ( @@ -9188,23 +8620,15 @@ }, /area/station/supply/storage) "aQs" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/conveyor/southwest{ id = "QMLoad2" }, /turf/simulated/floor/plating, /area/station/supply/storage) "aQu" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -9306,7 +8730,7 @@ /obj/machinery/atmospherics/binary/pump{ dir = 8 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/engine, /area/station/maintenance/turbine) "aQQ" = ( @@ -9327,11 +8751,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, @@ -9574,9 +8994,7 @@ }, /area/station/hallway/primary/fore) "aRK" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -9584,21 +9002,13 @@ /area/station/hallway/primary/fore) "aRL" = ( /obj/structure/table, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/storage/box, /obj/item/storage/box/lights/mixed{ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -9789,11 +9199,9 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "aSr" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/kirbyplants, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -9979,11 +9387,7 @@ }, /area/station/medical/cloning) "aTb" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -10078,11 +9482,7 @@ }, /area/station/supply/qm) "aTB" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -10111,9 +9511,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aTF" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/computer/area_atmos/area{ dir = 4 }, @@ -10398,11 +9796,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/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) @@ -10479,9 +9873,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "aUN" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/stack/sheet/metal{ @@ -10492,11 +9884,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -10524,9 +9912,7 @@ /area/station/engineering/atmos) "aUR" = ( /obj/machinery/photocopier, -/obj/machinery/status_display/supply_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/supply_display/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -10551,11 +9937,7 @@ /area/station/supply/office) "aUT" = ( /obj/structure/table, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/item/paper_bin, /obj/structure/cable{ d2 = 2; @@ -10573,27 +9955,17 @@ }, /area/station/supply/office) "aUW" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/kirbyplants, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" }, /area/station/supply/office) "aUX" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10667,11 +10039,7 @@ }, /area/station/supply/qm) "aVk" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -10712,9 +10080,7 @@ }, /area/station/security/permabrig) "aVo" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Perma-Brig Cell 1"; network = list("SS13","Security","Prison") @@ -10729,9 +10095,7 @@ }, /area/station/security/permabrig) "aVq" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Perma-Brig Cell 2"; network = list("SS13","Security","Prison") @@ -10756,9 +10120,7 @@ }, /area/station/security/permabrig) "aVt" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Perma-Brig Cell 3"; network = list("SS13","Security","Prison") @@ -10774,9 +10136,7 @@ }, /area/station/security/permabrig) "aVu" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -10832,9 +10192,7 @@ }, /area/station/security/permasolitary) "aVA" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -10844,9 +10202,7 @@ }, /area/station/security/permasolitary) "aVC" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) @@ -10902,11 +10258,7 @@ }, /area/station/engineering/atmos) "aVJ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/camera{ c_tag = "Atmospherics North"; dir = 1; @@ -10981,9 +10333,7 @@ /turf/simulated/floor/engine/air, /area/station/engineering/atmos) "aVU" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/engine/air, /area/station/engineering/atmos) "aVV" = ( @@ -11088,17 +10438,11 @@ /turf/space, /area/space) "aWD" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ @@ -11107,7 +10451,7 @@ }, /area/station/supply/qm) "aWG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Cargo Dock South"; dir = 1 @@ -11135,9 +10479,7 @@ /area/station/supply/qm) "aWJ" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -11174,11 +10516,7 @@ }, /area/station/security/permabrig) "aWN" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -11291,9 +10629,7 @@ /obj/machinery/camera{ c_tag = "Animal Garden" }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/grass, /area/station/service/hydroponics) "aXg" = ( @@ -11350,9 +10686,7 @@ }, /area/station/engineering/atmos) "aXm" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, @@ -11385,9 +10719,7 @@ /turf/simulated/wall, /area/station/engineering/atmos) "aXr" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -11479,10 +10811,7 @@ }, /area/station/engineering/atmos) "aXH" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/wood, /area/station/command/meeting_room) "aXJ" = ( @@ -11748,9 +11077,7 @@ }, /area/station/engineering/atmos) "aYu" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) "aYv" = ( @@ -11789,14 +11116,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "aYF" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -11856,9 +11177,7 @@ }, /area/station/engineering/atmos) "aYN" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Atmospherics East"; dir = 8; @@ -11997,11 +11316,7 @@ pixel_x = -26; pixel_y = -26 }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -12051,11 +11366,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "aZt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/machinery/camera{ c_tag = "Cargo Dock SouthWest"; dir = 4 @@ -12096,16 +11407,12 @@ }, /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 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -12114,11 +11421,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -12129,9 +11432,7 @@ }, /area/station/supply/qm) "aZD" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/bed/dogbed, /turf/simulated/floor/plasteel{ dir = 6; @@ -12164,10 +11465,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" }, @@ -12178,11 +11476,10 @@ }, /area/station/security/permabrig) "aZK" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "cell1lockdown"; name = "Cell Lockdown"; - pixel_y = 32; req_access_txt = "2" }, /obj/machinery/flasher_button{ @@ -12194,9 +11491,7 @@ }, /area/station/security/permabrig) "aZL" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -12206,11 +11501,10 @@ id = "Cell 2"; pixel_y = 25 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "cell2lockdown"; name = "Cell Lockdown"; - pixel_y = 32; req_access_txt = "2" }, /turf/simulated/floor/plasteel{ @@ -12218,9 +11512,7 @@ }, /area/station/security/permabrig) "aZR" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/camera{ c_tag = "Perma-Brig Hallway"; network = list("SS13","Security") @@ -12230,10 +11522,7 @@ }, /area/station/security/permabrig) "aZT" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -12245,12 +11534,7 @@ c_tag = "Perma-Brig Hallway Starboard"; network = list("SS13","Security") }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump Engineering"; - pixel_y = 24 - }, +/obj/machinery/power/apc/engie/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -12271,11 +11555,7 @@ /area/space/nearstation) "aZZ" = ( /obj/machinery/economy/vending/cigarette, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -12292,9 +11572,7 @@ /turf/space, /area/space/nearstation) "bac" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -12473,9 +11751,7 @@ /area/station/engineering/atmos) "baC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -12542,39 +11818,22 @@ icon_state = "1-2" }, /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "baU" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/station/hallway/primary/fore) "baV" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/alarm/directional/south, /obj/machinery/autolathe, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/firealarm{ dir = 1; name = "custom placement"; @@ -12651,9 +11910,7 @@ /area/station/supply/office) "bbd" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/stamp/granted{ pixel_x = 3; pixel_y = -4 @@ -12662,11 +11919,7 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -12741,12 +11994,8 @@ }, /area/station/security/permabrig) "bbq" = ( -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -12764,9 +12013,7 @@ }, /area/station/security/permabrig) "bbs" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -12794,12 +12041,8 @@ }, /area/station/security/permabrig) "bbz" = ( -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/warning_stripes/east, /obj/structure/cable{ d1 = 4; @@ -12853,7 +12096,7 @@ }, /area/station/hallway/primary/fore) "bbD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/sign/securearea{ pixel_y = -32 }, @@ -12874,9 +12117,7 @@ }, /area/station/security/permasolitary) "bbE" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -12898,10 +12139,7 @@ /turf/space, /area/station/engineering/atmos) "bbH" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -12920,21 +12158,15 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbJ" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbK" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle{ dir = 4 }, @@ -12945,9 +12177,7 @@ /turf/simulated/floor/plating, /area/shuttle/pod_3) "bbM" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/camera{ c_tag = "Atmospherics West"; dir = 4; @@ -13017,9 +12247,7 @@ /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) "bca" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) "bcb" = ( @@ -13028,15 +12256,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "bcd" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/structure/sink/directional/east, +/obj/machinery/firealarm/directional/west, /obj/effect/landmark/start/chef, /turf/simulated/floor/plasteel, /area/station/service/kitchen) @@ -13232,14 +12453,8 @@ }, /area/station/hallway/primary/fore) "bcD" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /obj/structure/closet/secure_closet/miner, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -13283,9 +12498,7 @@ }, /area/station/supply/storage) "bcM" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/computer/supplycomp/public, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -13322,9 +12535,7 @@ }, /area/station/maintenance/starboard2) "bcY" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 - }, +/obj/structure/reagent_dispensers/peppertank/south, /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel{ dir = 8; @@ -13342,9 +12553,7 @@ }, /area/station/maintenance/starboard2) "bdb" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel{ dir = 8; @@ -13375,7 +12584,7 @@ }, /area/station/maintenance/starboard2) "bdh" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -13473,10 +12682,7 @@ /area/station/engineering/atmos) "bdv" = ( /obj/structure/dresser, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/item/toy/figure/crew/cmo{ pixel_x = 4; pixel_y = 14; @@ -13500,7 +12706,7 @@ /turf/simulated/floor/plasteel, /area/station/service/kitchen) "bdy" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/economy/vending/dinnerware, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -13525,40 +12731,28 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "bdL" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Kitchen East"; dir = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Kitchen Windows"; name = "Kitchen Privacy Shutters Control"; - pixel_x = 24; pixel_y = 5 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Kitchen Dinner Windows"; name = "Kitchen Dinner Shutters Control"; - pixel_x = 24; pixel_y = -5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bdO" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "east bump Engineering"; - pixel_x = 24; - shock_proof = 1 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "bdP" = ( @@ -13603,14 +12797,8 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -13812,7 +13000,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "beC" = ( @@ -13835,9 +13023,7 @@ }, /area/station/security/execution) "beE" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) "beF" = ( @@ -13881,9 +13067,7 @@ }, /area/station/engineering/atmos) "beR" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, @@ -13985,14 +13169,8 @@ }, /area/station/hallway/primary/fore) "bfw" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/west, /obj/machinery/mineral/equipment_vendor, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -14109,14 +13287,9 @@ }, /area/station/maintenance/starboard2) "bfT" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/closet/secure_closet/brig, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -14198,9 +13371,7 @@ dir = 1; name = "Port Mix to Starboard Ports" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -14430,9 +13601,7 @@ }, /area/station/supply/miningdock) "bgU" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -14440,9 +13609,7 @@ /area/station/maintenance/fsmaint) "bgW" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bhf" = ( @@ -14455,20 +13622,14 @@ }, /area/station/legal/magistrate) "bhh" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" }, /area/station/security/brig) "bhi" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/grenade/barrier, /obj/item/grenade/barrier, /obj/item/grenade/barrier, @@ -14492,12 +13653,7 @@ }, /area/station/engineering/atmos) "bhl" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump Engineering"; - pixel_y = 24 - }, +/obj/machinery/power/apc/engie/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -14515,10 +13671,7 @@ }, /area/station/engineering/atmos) "bho" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/camera{ c_tag = "Atmospherics South"; network = list("SS13","Engineering") @@ -14543,9 +13696,7 @@ /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) "bhu" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) "bhv" = ( @@ -14647,11 +13798,7 @@ /area/station/service/hydroponics) "bhC" = ( /obj/machinery/suit_storage_unit/cmo/secure/sec_storage, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -14681,9 +13828,7 @@ dir = 4 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/control) "bhN" = ( @@ -14723,7 +13868,7 @@ /turf/simulated/floor/greengrid, /area/station/turret_protected/ai) "bhX" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -14834,9 +13979,7 @@ /turf/simulated/floor/greengrid, /area/station/turret_protected/ai) "biw" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -14846,23 +13989,14 @@ }, /area/station/security/brig) "bix" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Brig - Interrogation Room"; dir = 4; network = list("Interrogation") }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14881,18 +14015,13 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/interrogation) "biB" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -14968,12 +14097,8 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -15184,11 +14309,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "bjb" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "stationawaygate"; name = "Gateway Shutters Control"; - req_access_txt = "62"; - pixel_y = 24 + req_access_txt = "62" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15196,11 +14320,7 @@ }, /area/station/hallway/primary/central) "bjc" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -15483,17 +14603,11 @@ /area/station/science/robotics/showroom) "bkg" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plating, /area/station/maintenance/fore) "bki" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -15526,13 +14640,8 @@ "bkn" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/power/apc/directional/south, +/obj/machinery/light/small/directional/west, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -15576,9 +14685,7 @@ /area/station/command/office/hos) "bks" = ( /obj/machinery/photocopier, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/requests_console{ announcementConsole = 1; department = "Head of Security's Desk"; @@ -15601,9 +14708,7 @@ /turf/space, /area/space/nearstation) "bkv" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) "bkw" = ( @@ -15681,9 +14786,7 @@ }, /area/station/engineering/atmos) "bkP" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/binary/pump{ dir = 0; name = "Pure to SM" @@ -15750,24 +14853,16 @@ /turf/simulated/floor/wood, /area/station/service/bar/atrium) "blo" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/alarm/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "blp" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/south, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "yellow" @@ -15777,9 +14872,7 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -15812,7 +14905,7 @@ /area/station/aisat) "blw" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -15849,16 +14942,8 @@ /area/station/hallway/primary/fore) "blB" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 10; @@ -15885,7 +14970,7 @@ "blF" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -15934,11 +15019,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/aisat) "blR" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /obj/machinery/camera{ c_tag = "Perma-Brig Garden"; network = list("SS13","Security","Prison") @@ -15963,14 +15044,8 @@ /obj/structure/table, /obj/item/taperecorder, /obj/item/restraints/handcuffs, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -16062,13 +15137,9 @@ /area/station/command/office/hos) "bmj" = ( /obj/structure/table/wood, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/item/folder/red, -/obj/machinery/keycard_auth{ - pixel_x = 24 - }, +/obj/machinery/keycard_auth/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -16345,10 +15416,9 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/economy/vending/hydronutrients, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Hydroponics Shutters"; name = "Hydroponics Privacy Shutters Control"; - pixel_x = 24; pixel_y = -5 }, /turf/simulated/floor/plasteel/dark, @@ -16440,10 +15510,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bni" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/rack, /obj/item/storage/toolbox/emergency{ pixel_x = 3; @@ -16526,11 +15593,7 @@ "bnt" = ( /obj/structure/table, /obj/item/flashlight/lamp, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -16540,11 +15603,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -16580,11 +15639,7 @@ id = "HoS"; pixel_x = -24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -16668,9 +15723,7 @@ /obj/machinery/computer/secure_data{ dir = 1 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -16803,14 +15856,8 @@ }, /area/station/engineering/atmos) "boc" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) @@ -16918,9 +15965,7 @@ /obj/machinery/camera{ c_tag = "Central Ring Hallway North" }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -16973,10 +16018,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "boz" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" }, @@ -17057,11 +16099,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "boL" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; @@ -17069,29 +16107,18 @@ }, /area/station/security/brig) "boM" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/command/office/hos) "boN" = ( -/obj/structure/extinguisher_cabinet{ - name = "custom placement"; - pixel_x = 30; - pixel_y = -30 - }, /obj/structure/table/wood, /obj/machinery/computer/med_data/laptop{ dir = 8 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -17198,10 +16225,7 @@ pixel_x = 32 }, /obj/item/flashlight/lamp, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "bpm" = ( @@ -17397,9 +16421,7 @@ }, /area/station/hallway/primary/port) "bpV" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -17512,15 +16534,8 @@ /area/station/hallway/primary/central/north) "bqo" = ( /obj/structure/table/glass, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -32 - }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, +/obj/machinery/newscaster/directional/west, /obj/machinery/photocopier/faxmachine{ department = "Chief Medical Officer's Office"; pixel_y = 4 @@ -17592,9 +16607,7 @@ c_tag = "Brig - Prisoner Processing"; dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -17605,11 +16618,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bqL" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/flasher/portable, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) @@ -17700,11 +16709,7 @@ /area/station/security/brig) "brc" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) "brd" = ( @@ -17760,13 +16765,8 @@ /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "brn" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/structure/reagent_dispensers/peppertank/east, +/obj/machinery/power/apc/directional/south, /obj/vehicle/secway, /obj/item/key/security, /obj/structure/cable{ @@ -17833,9 +16833,7 @@ /turf/space, /area/space/nearstation) "brx" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/engine/vacuum, /area/station/engineering/atmos) "brA" = ( @@ -18035,10 +17033,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "bse" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "bridge blast north"; name = "North Bridge Blast Door Control"; - pixel_y = 32; req_access_txt = "19" }, /turf/simulated/floor/plasteel/dark, @@ -18056,9 +17053,7 @@ }, /area/station/public/locker) "bsi" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -18082,7 +17077,7 @@ c_tag = "Central Ring Hallway North"; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -18104,12 +17099,8 @@ }, /area/station/service/bar) "bsr" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -18143,13 +17134,9 @@ /turf/space, /area/space) "bsC" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/closet/wardrobe/miner, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -18164,10 +17151,7 @@ }, /area/station/hallway/primary/starboard) "bsE" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -18188,11 +17172,7 @@ }, /area/station/security/prison/cell_block) "bsF" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/suit_storage_unit/security/hos, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -18335,23 +17315,15 @@ name = "Waste to Filter"; on = 1 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, /area/station/engineering/atmos) "btm" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -18383,11 +17355,7 @@ }, /area/station/hallway/primary/port) "btA" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -18398,10 +17366,7 @@ }, /area/station/hallway/primary/port) "btD" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) @@ -18479,9 +17444,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -18502,10 +17465,7 @@ /area/station/security/prisonershuttle) "btY" = ( /obj/machinery/computer/prisoner, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -18567,11 +17527,7 @@ /area/station/security/brig) "buj" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -18606,18 +17562,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" }, /area/station/command/office/hos) "buo" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; initialize_directions = 11 @@ -18664,11 +17616,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -18695,11 +17643,7 @@ c_tag = "Atmospherics Storage"; dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -18717,11 +17661,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel{ icon_state = "escape" @@ -18765,9 +17705,7 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "buR" = ( @@ -18809,9 +17747,7 @@ }, /area/station/engineering/equipmentstorage) "bvd" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/closet/crate, /obj/item/coin/silver, /obj/item/coin/silver, @@ -18824,17 +17760,13 @@ }, /area/station/command/vault) "bve" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/structure/closet/secure_closet/freezer/money, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/greengrid, /area/station/command/vault) "bvf" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/closet/fireaxecabinet{ pixel_y = 32 }, @@ -18846,10 +17778,7 @@ /area/station/command/vault) "bvl" = ( /obj/machinery/computer/shuttle/labor, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -18867,14 +17796,8 @@ "bvr" = ( /obj/structure/table, /obj/item/storage/box/evidence, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -18919,11 +17842,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/aisat) "bvx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/machinery/computer/prisoner{ dir = 8 }, @@ -18933,19 +17852,17 @@ }, /area/station/security/warden) "bvy" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -7; - pixel_y = -28; req_access_txt = "2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; - pixel_y = -28; req_access_txt = "2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -19006,11 +17923,7 @@ }, /area/station/engineering/atmos) "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; @@ -19230,11 +18143,7 @@ /area/station/maintenance/fsmaint) "bwD" = ( /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/machinery/computer/prisoner{ dir = 8 }, @@ -19274,9 +18183,7 @@ }, /area/station/turret_protected/ai) "bwH" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bwJ" = ( @@ -19331,19 +18238,11 @@ }, /area/station/medical/medbay2) "bwY" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/closet/firecloset, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bwZ" = ( @@ -19376,12 +18275,8 @@ /area/station/medical/break_room) "bxe" = ( /obj/machinery/washing_machine, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Medbay Staff Room"; network = list("Medbay","SS13") @@ -19403,9 +18298,7 @@ /area/station/hallway/primary/port) "bxg" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/wrench, /obj/item/clothing/mask/gas, /turf/simulated/floor/plasteel{ @@ -19422,16 +18315,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) "bxj" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) "bxk" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/camera{ c_tag = "Secure Technical Storage"; dir = 8 @@ -19440,10 +18329,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) "bxl" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -19479,9 +18365,7 @@ /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, /obj/item/flash, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxq" = ( @@ -19512,9 +18396,7 @@ /area/station/command/bridge) "bxt" = ( /obj/structure/table/reinforced, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxu" = ( @@ -19562,13 +18444,9 @@ /area/station/service/hydroponics) "bxy" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bxA" = ( @@ -19627,11 +18505,7 @@ /turf/simulated/floor/greengrid, /area/station/command/vault) "bxG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -19683,9 +18557,7 @@ "bxN" = ( /obj/structure/table, /obj/item/flashlight/lamp, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/button/windowtint{ dir = 1; id = "Processing"; @@ -19697,9 +18569,7 @@ }, /area/station/security/processing) "bxP" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bxQ" = ( @@ -19801,14 +18671,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "byk" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/yellow, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "byl" = ( @@ -19825,7 +18690,7 @@ /area/station/engineering/hardsuitstorage) "byu" = ( /obj/item/kirbyplants, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -19833,11 +18698,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "byv" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -19961,9 +18822,7 @@ }, /area/station/hallway/primary/fore) "byQ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Central Ring Hallway West"; dir = 8 @@ -19975,14 +18834,8 @@ "byR" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byS" = ( @@ -20004,24 +18857,17 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "bridge blast east"; name = "East Bridge Blast Door Control"; - pixel_x = 26; req_access_txt = "19" }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byY" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/west, /obj/item/flash, /obj/item/storage/box/ids, /obj/item/storage/box/PDAs{ @@ -20031,9 +18877,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bza" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -20197,22 +19041,14 @@ /turf/simulated/floor/plating, /area/station/engineering/gravitygenerator) "bzH" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bzI" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -20221,10 +19057,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bzJ" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/warning_stripes/northeast, /obj/structure/cable{ d1 = 4; @@ -20237,10 +19070,7 @@ /obj/machinery/power/smes{ charge = 5e+006 }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/cable{ @@ -20259,10 +19089,7 @@ "bzO" = ( /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/item/crowbar/engineering, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -20332,10 +19159,7 @@ "bAk" = ( /obj/structure/table/reinforced, /obj/item/mmi, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bAm" = ( @@ -20360,9 +19184,7 @@ /area/station/engineering/tech_storage) "bAr" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAs" = ( @@ -20429,23 +19251,13 @@ }, /area/station/command/bridge) "bAF" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/engineering/aitransit) "bAI" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light/small, +/obj/machinery/alarm/directional/south, +/obj/machinery/light/small/directional/north, /obj/structure/closet/crate, /obj/item/storage/belt/champion, /obj/item/stack/sheet/mineral/gold, @@ -20456,9 +19268,7 @@ }, /area/station/command/vault) "bAJ" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -20514,9 +19324,7 @@ /area/station/security/main) "bAT" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -20546,10 +19354,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" @@ -20670,11 +19475,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" @@ -20699,9 +19500,7 @@ /area/station/hallway/primary/port) "bBP" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/item/healthanalyzer, @@ -20728,9 +19527,7 @@ /area/station/engineering/tech_storage) "bBU" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/aicard, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) @@ -20743,9 +19540,7 @@ /area/station/public/storage/tools) "bBX" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/analyzer, /obj/item/analyzer, /obj/item/assembly/signaler, @@ -20815,11 +19610,7 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -20834,9 +19625,7 @@ /area/station/public/storage/tools) "bCg" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/assembly/igniter, /obj/item/assembly/igniter, /obj/item/assembly/igniter, @@ -20845,14 +19634,11 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bCn" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/door_control{ +/obj/machinery/light/directional/south, +/obj/machinery/door_control/shutter/north{ id = "bridge blast west"; name = "West Bridge Blast Door Control"; pixel_x = null; - pixel_y = 24; req_access_txt = "19" }, /obj/structure/cable{ @@ -20952,14 +19738,11 @@ }, /area/station/command/bridge) "bCy" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/door_control{ +/obj/machinery/light/directional/south, +/obj/machinery/door_control/shutter/north{ id = "bridge blast east"; name = "East Bridge Blast Door Control"; pixel_x = null; - pixel_y = 24; req_access_txt = "19" }, /obj/structure/disposalpipe/segment{ @@ -21014,23 +19797,19 @@ }, /area/station/security/prisonershuttle) "bCP" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, /area/station/security/brig) "bCT" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/item/radio/intercom/private{ - pixel_x = -28; - pixel_y = -10 + pixel_x = -22; + dir = 4 }, /obj/item/radio/intercom/custom{ - pixel_y = 28 + pixel_y = 22 }, /obj/effect/landmark{ icon = 'icons/effects/spawner_icons.dmi'; @@ -21061,10 +19840,8 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/directional/north{ + cell_type = 5000 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -21073,11 +19850,7 @@ /area/station/turret_protected/ai) "bCX" = ( /obj/effect/landmark/start/ai, -/obj/item/radio/intercom{ - name = "custom placement"; - pixel_x = -28; - pixel_y = 5 - }, +/obj/item/radio/intercom, /obj/item/radio/intercom/private{ pixel_x = 28; pixel_y = 5 @@ -21090,13 +19863,15 @@ pixel_y = 32 }, /obj/item/radio/intercom/custom{ - pixel_y = 25 + pixel_x = -28; + pixel_y = 6 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 +/obj/machinery/newscaster/security_unit/west{ + pixel_y = 30; + dir = 2; + pixel_x = -32 }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bCY" = ( @@ -21123,17 +19898,13 @@ /turf/simulated/floor/greengrid, /area/station/turret_protected/ai) "bDa" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/item/radio/intercom/private{ - pixel_x = 28; - pixel_y = -10 + pixel_x = 22; + dir = 8 }, /obj/item/radio/intercom/custom{ - pixel_y = 28 + pixel_y = 22 }, /obj/effect/landmark{ icon = 'icons/effects/spawner_icons.dmi'; @@ -21155,13 +19926,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/gravitygenerator) "bDe" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/machinery/light/small/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -21400,9 +20166,7 @@ /area/station/hallway/primary/port) "bDE" = ( /obj/item/kirbyplants, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bDF" = ( @@ -21436,9 +20200,7 @@ /area/station/engineering/tech_storage) "bDI" = ( /obj/item/kirbyplants, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bDJ" = ( @@ -21651,11 +20413,7 @@ }, /area/station/hallway/primary/central/ne) "bEr" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/bombcloset, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -21680,9 +20438,7 @@ /turf/simulated/wall/r_wall, /area/station/security/warden) "bED" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bEE" = ( @@ -21690,11 +20446,10 @@ id = "AI"; pixel_y = -24 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "AI-door"; name = "AI Entrance Blast Doors"; - pixel_x = -24; - pixel_y = 24 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -21702,9 +20457,7 @@ }, /area/station/turret_protected/ai) "bEF" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bEG" = ( @@ -21773,7 +20526,7 @@ }, /area/station/engineering/break_room) "bER" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "caution" }, @@ -21785,11 +20538,7 @@ /area/station/engineering/break_room) "bET" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 10; @@ -21798,16 +20547,8 @@ /area/station/engineering/break_room) "bEU" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/alarm/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 6; @@ -21846,10 +20587,7 @@ }, /area/station/engineering/break_room) "bFa" = ( -/obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -21874,14 +20612,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bFe" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/north, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bFf" = ( @@ -21964,20 +20697,14 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/micro_laser, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bFm" = ( /obj/structure/rack, /obj/item/painter, /obj/item/toner, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -22023,11 +20750,7 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "bFx" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -22038,10 +20761,7 @@ }, /area/station/command/bridge) "bFz" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -22061,10 +20781,7 @@ }, /area/station/command/bridge) "bFC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -22095,7 +20812,7 @@ /area/station/command/bridge) "bFF" = ( /obj/structure/rack, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/aicard, /obj/item/storage/secure/briefcase, /turf/simulated/floor/plasteel{ @@ -22141,7 +20858,7 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/storage/toolbox/mechanical{ pixel_y = -3 }, @@ -22152,11 +20869,7 @@ }, /area/station/command/bridge) "bFN" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -22171,18 +20884,14 @@ }, /area/station/command/bridge) "bFQ" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/station/command/bridge) "bFR" = ( /obj/item/kirbyplants, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFS" = ( @@ -22215,17 +20924,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bGb" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; name = "Cell 1 Locker" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -22243,11 +20947,7 @@ "bGd" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -22277,9 +20977,7 @@ }, /area/station/security/prison/cell_block) "bGp" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -22314,16 +21012,14 @@ /turf/simulated/floor/plating, /area/station/engineering/gravitygenerator) "bGt" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGu" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/south, +/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Gravity Generation"; dir = 1; @@ -22336,26 +21032,18 @@ /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/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGw" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGx" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ nightshift_enabled = 1; nightshift_allowed = 0 }, @@ -22634,9 +21322,7 @@ }, /area/station/hallway/primary/port) "bGR" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -22667,11 +21353,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, @@ -22727,11 +21409,7 @@ }, /area/station/engineering/break_room) "bHi" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -22812,23 +21490,19 @@ /turf/simulated/floor/carpet, /area/station/command/bridge) "bHt" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "stationawaygate"; name = "Expedition Shutters Access Control"; pixel_x = 7; - pixel_y = -26; req_access_txt = "62" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "eva-shutters"; name = "Auxilary E.V.A. Storage"; pixel_x = -7; - pixel_y = -26; req_one_access_txt = "18" }, -/obj/machinery/keycard_auth{ - pixel_y = -38 - }, +/obj/machinery/keycard_auth/south, /turf/simulated/floor/carpet, /area/station/command/bridge) "bHu" = ( @@ -22873,11 +21547,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bHA" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -22910,18 +21580,11 @@ name = "detectives camera"; pictures_left = 30 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) "bHM" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/table/wood, /obj/item/taperecorder, /obj/item/restraints/handcuffs, @@ -22946,12 +21609,8 @@ /area/station/security/detective) "bHP" = ( /obj/machinery/photocopier, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/north, +/obj/structure/reagent_dispensers/peppertank/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22970,10 +21629,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/crew/secofficer, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -23078,10 +21734,8 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/command/ai_upload{ dir = 8 }, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_x = -4; - pixel_y = 24 +/obj/machinery/light_switch/north{ + pixel_x = -4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -23151,10 +21805,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bIr" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel/dark, @@ -23163,26 +21814,19 @@ /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bIu" = ( /obj/structure/rack, /obj/item/crowbar, /obj/item/storage/toolbox/mechanical, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bIv" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bIx" = ( @@ -23306,11 +21950,7 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -23348,9 +21988,7 @@ /area/station/hallway/primary/central/se) "bIY" = ( /obj/structure/table/wood, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/station/command/meeting_room) @@ -23360,24 +21998,15 @@ /area/station/command/meeting_room) "bJa" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bJb" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bJc" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -23385,11 +22014,7 @@ /turf/simulated/floor/wood, /area/station/command/meeting_room) "bJe" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/south, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bJf" = ( @@ -23424,10 +22049,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bJk" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -23435,22 +22057,15 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bJm" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/station/command/office/captain) "bJn" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood, /area/station/command/office/captain) "bJo" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/wood, /area/station/command/office/captain) "bJp" = ( @@ -23460,9 +22075,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bJq" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood, /area/station/command/office/captain) "bJr" = ( @@ -23473,11 +22086,7 @@ /obj/machinery/computer/security/mining{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -23490,11 +22099,7 @@ /area/station/maintenance/starboard2) "bJC" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -23701,22 +22306,15 @@ "bKb" = ( /obj/item/stack/sheet/mineral/sandbags, /obj/effect/landmark/damageturf, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "bKd" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bKe" = ( @@ -23883,9 +22481,7 @@ /area/station/engineering/tech_storage) "bKy" = ( /obj/item/kirbyplants, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bKz" = ( @@ -23899,17 +22495,13 @@ /obj/item/book/manual/wiki/hacking, /obj/item/book/manual/wiki/engineering_guide, /obj/item/book/manual/wiki/engineering_construction, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bKB" = ( /obj/item/kirbyplants, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bKC" = ( @@ -23963,7 +22555,7 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "meetroomshutters"; name = "Privacy Shutters"; pixel_x = 5; @@ -23989,11 +22581,7 @@ /turf/simulated/floor/carpet, /area/station/command/meeting_room) "bKM" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bKN" = ( @@ -24004,16 +22592,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) "bKR" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bKS" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bKU" = ( @@ -24023,9 +22606,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bKV" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bKY" = ( @@ -24074,11 +22655,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" = ( @@ -24105,27 +22682,17 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/door_control{ - id = "toilet2"; - name = "Toilet Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -24; - specialfunctions = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/door_control/bolt_control/west{ + id = "toilet2" }, +/obj/structure/sign/poster/official/random/south, +/obj/machinery/light/small/directional/east, /obj/effect/landmark/start/assistant, /turf/simulated/floor/plasteel, /area/station/service/theatre) "bLl" = ( /obj/structure/closet/toolcloset, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ dir = 4; @@ -24150,14 +22717,8 @@ network = list("Research","SS13"); pixel_y = -22 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) "bLp" = ( @@ -24199,35 +22760,23 @@ }, /area/station/security/checkpoint) "bLx" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" }, /area/station/security/checkpoint) "bLy" = ( -/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" }, /area/station/hallway/primary/starboard) "bLz" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/directional/east, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel{ dir = 4; @@ -24242,9 +22791,7 @@ /area/station/security/prison/cell_block) "bLC" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -24319,11 +22866,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" @@ -24344,11 +22887,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "bLO" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -24364,7 +22903,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bLQ" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "bLR" = ( @@ -24425,11 +22964,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/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -24473,9 +23008,7 @@ }, /area/station/hallway/primary/starboard) "bMg" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/machinery/computer/card/minor/ce{ dir = 4 }, @@ -24542,22 +23075,14 @@ }, /area/station/engineering/break_room) "bMv" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ icon_state = "yellow" }, /area/station/engineering/break_room) "bMA" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/structure/sign/poster/official/random/north, +/obj/item/radio/intercom/directional/east, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 5; @@ -24566,13 +23091,8 @@ /area/station/engineering/break_room) "bMC" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /obj/item/clothing/gloves/color/yellow, /obj/item/storage/toolbox/electrical, /obj/item/multitool, @@ -24580,9 +23100,7 @@ /area/station/engineering/tech_storage) "bME" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/circuitboard/sleeper, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) @@ -24752,13 +23270,8 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bNh" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/wood, /area/station/command/office/captain) "bNi" = ( @@ -24766,10 +23279,7 @@ /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/suit/storage/hazardvest, /obj/item/multitool, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -24860,12 +23370,8 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "bNu" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/directional/east, /obj/machinery/computer/secure_data{ dir = 8 }, @@ -24875,11 +23381,7 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -24941,9 +23443,7 @@ pixel_x = -26; pixel_y = -26 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -25105,9 +23605,7 @@ }, /area/station/command/office/ce) "bOe" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bOf" = ( @@ -25119,11 +23617,7 @@ /turf/simulated/wall, /area/station/engineering/break_room) "bOh" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -25145,9 +23639,7 @@ "bOl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/bar, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -25158,11 +23650,7 @@ pixel_x = -3; pixel_y = 6 }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" @@ -25177,11 +23665,7 @@ /area/station/engineering/tech_storage) "bOr" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) @@ -25196,11 +23680,7 @@ /area/station/engineering/tech_storage) "bOt" = ( /obj/item/kirbyplants, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) @@ -25208,11 +23688,7 @@ /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/crowbar, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) @@ -25238,7 +23714,7 @@ /area/station/engineering/tech_storage) "bOx" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/assembly/timer, /obj/item/assembly/timer, /obj/item/multitool, @@ -25265,9 +23741,7 @@ /turf/simulated/wall, /area/station/public/storage/tools) "bOD" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -25361,20 +23835,12 @@ /obj/structure/bed/dogbed{ name = "fox box" }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /mob/living/simple_animal/pet/dog/fox/Renault, /turf/simulated/floor/plasteel/dark, /area/station/command/office/captain) "bOV" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/wood, /area/station/command/office/captain) "bOX" = ( @@ -25397,10 +23863,7 @@ /turf/simulated/wall, /area/station/command/office/ntrep) "bPa" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -25415,9 +23878,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "bPc" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -25473,16 +23934,8 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/south, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -25494,9 +23947,7 @@ /area/station/public/storage/tools/auxiliary) "bPi" = ( /obj/structure/morgue, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/landmark/spawner/rev, /turf/simulated/floor/plasteel{ dir = 8; @@ -25511,11 +23962,7 @@ /area/station/security/detective) "bPk" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) "bPl" = ( @@ -25551,11 +23998,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" @@ -25631,10 +24074,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; @@ -25673,12 +24113,8 @@ }, /area/station/turret_protected/aisat) "bPO" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/ai_status_display/north, /obj/machinery/power/smes{ charge = 5e+006 }, @@ -25762,22 +24198,12 @@ /area/station/public/storage/tools) "bPZ" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/radio, /obj/item/radio, /obj/item/radio, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -25831,10 +24257,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "ceofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = -5; req_access_txt = "56" }, @@ -25879,25 +24304,19 @@ "bQk" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel/grimy, /area/station/command/office/ce) "bQl" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/bed, /obj/item/bedsheet/ce, /turf/simulated/floor/plasteel/grimy, /area/station/command/office/ce) "bQm" = ( /obj/structure/dresser, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/command/office/ce) "bQn" = ( @@ -25914,9 +24333,7 @@ /area/station/security/brig) "bQp" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Engineering Lobby"; dir = 4; @@ -25929,14 +24346,9 @@ }, /area/station/engineering/break_room) "bQq" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/closet/radiation, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -26005,45 +24417,32 @@ /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/decal/warning_stripes/southwest, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bQD" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/machinery/ai_status_display/north, /obj/machinery/teleport/station, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bQE" = ( /obj/structure/table/wood, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /obj/item/storage/briefcase, /obj/item/storage/secure/briefcase, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bQG" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /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 @@ -26054,11 +24453,7 @@ /turf/simulated/wall, /area/station/command/office/blueshield) "bQK" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/porta_turret{ dir = 4 }, @@ -26092,9 +24487,7 @@ layer = 2.9 }, /obj/item/flashlight/lamp/green, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bQP" = ( @@ -26237,10 +24630,7 @@ }, /area/station/security/prison/cell_block) "bRg" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -26271,7 +24661,7 @@ }, /area/station/security/brig) "bRj" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -26307,14 +24697,8 @@ dir = 1; layer = 2.9 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/aisat) "bRt" = ( @@ -26402,9 +24786,7 @@ dir = 1; layer = 2.9 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/aisat) "bRL" = ( @@ -26467,21 +24849,13 @@ /turf/space, /area/space/nearstation) "bRS" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/northeast, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/control) "bRV" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/machinery/computer/station_alert{ dir = 4 }, @@ -26654,11 +25028,7 @@ }, /area/station/science/explab) "bSk" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -26737,12 +25107,8 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSI" = ( -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) "bSJ" = ( @@ -26756,10 +25122,8 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSK" = ( -/obj/machinery/power/apc{ - cell_type = 5000; - name = "south bump Important Area"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 5000 }, /obj/structure/cable, /turf/simulated/floor/bluegrid, @@ -26774,7 +25138,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSM" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) "bSN" = ( @@ -26782,10 +25146,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSO" = ( -/obj/machinery/keycard_auth{ - pixel_x = -24; - pixel_y = 24 - }, +/obj/machinery/keycard_auth/north, /obj/machinery/computer/card{ dir = 4 }, @@ -26824,9 +25185,7 @@ /obj/structure/table/wood, /obj/item/hand_tele, /obj/item/coin/plasma, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bST" = ( @@ -26837,10 +25196,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "bSW" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -26873,11 +25229,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "bTd" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/camera{ c_tag = "Auxiliary Tool Storage"; dir = 8 @@ -26889,11 +25241,7 @@ dir = 1 }, /obj/machinery/economy/vending/chefdrobe, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "bTg" = ( @@ -26911,11 +25259,7 @@ /area/station/hallway/primary/starboard) "bTm" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -26928,11 +25272,7 @@ "bTn" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Brig - Cell 3"; dir = 1 @@ -26945,11 +25285,7 @@ "bTp" = ( /obj/structure/bed, /obj/item/bedsheet/red, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Brig - Cell 4"; dir = 1 @@ -27452,9 +25788,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) "bUA" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -27540,9 +25874,7 @@ }, /area/station/hallway/primary/central/west) "bUM" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -27568,9 +25900,7 @@ /area/station/command/office/hop) "bUR" = ( /obj/item/kirbyplants, -/obj/machinery/keycard_auth{ - pixel_y = 24 - }, +/obj/machinery/keycard_auth/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "bUT" = ( @@ -27583,20 +25913,14 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "bUV" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /obj/machinery/computer/communications{ dir = 4 }, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bUW" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/machinery/camera{ c_tag = "Captain's Desk"; dir = 1 @@ -27604,11 +25928,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bUY" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bUZ" = ( @@ -27619,9 +25939,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bVa" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/toilet{ dir = 4 }, @@ -27641,9 +25959,7 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/captain/bedroom) "bVc" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Central Ring Hallway East"; dir = 4 @@ -27821,9 +26137,7 @@ /area/station/hallway/primary/starboard) "bVH" = ( /obj/structure/window/reinforced, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/aisat) "bVJ" = ( @@ -27863,11 +26177,7 @@ /area/station/turret_protected/aisat) "bVN" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -27921,11 +26231,7 @@ }, /area/station/turret_protected/aisat) "bVU" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -27935,14 +26241,8 @@ /area/station/turret_protected/aisat) "bVV" = ( /obj/structure/window/reinforced, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/aisat) "bVW" = ( @@ -27952,9 +26252,8 @@ /area/station/aisat) "bVX" = ( /obj/structure/window/reinforced, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 15000 }, /obj/structure/cable, /turf/simulated/floor/plasteel/dark, @@ -28005,17 +26304,15 @@ /turf/space, /area/space/nearstation) "bWl" = ( -/obj/machinery/keycard_auth{ - pixel_x = -24 - }, -/obj/machinery/door_control{ +/obj/machinery/keycard_auth/west, +/obj/machinery/door_control/shutter{ id = "engstorage"; name = "Engineering Secure Storage Control"; pixel_x = -38; pixel_y = 8; req_access_txt = "11" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "transitlock"; name = "Transit Tube Lockdown Control"; pixel_x = -38; @@ -28037,11 +26334,7 @@ /area/station/command/office/ce) "bWn" = ( /obj/machinery/photocopier, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bWo" = ( @@ -28096,9 +26389,7 @@ }, /area/station/engineering/break_room) "bWv" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/structure/chair/comfy/brown{ dir = 4 }, @@ -28110,24 +26401,14 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "yellow" }, /area/station/engineering/break_room) "bWy" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/alarm/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 6; @@ -28167,7 +26448,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bWG" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -28180,22 +26461,14 @@ }, /area/station/hallway/primary/port) "bWI" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/machinery/suit_storage_unit/ce, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/station/command/office/ce) "bWJ" = ( -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -28270,10 +26543,7 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/captain/bedroom) "bWZ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel/white, /area/station/command/office/captain/bedroom) "bXb" = ( @@ -28297,18 +26567,14 @@ }, /area/station/hallway/primary/starboard) "bXf" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/alarm/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/station/hallway/primary/starboard) "bXi" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -28324,14 +26590,8 @@ /area/station/turret_protected/aisat) "bXo" = ( /obj/structure/table/glass, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/machinery/light_switch/north, +/obj/structure/extinguisher_cabinet/directional/east, /obj/item/soap, /turf/simulated/floor/plasteel{ dir = 5; @@ -28339,11 +26599,7 @@ }, /area/station/medical/paramedic) "bXp" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -28441,7 +26697,7 @@ /area/space/nearstation) "bXH" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -28466,23 +26722,15 @@ /area/station/turret_protected/aisat) "bXK" = ( /obj/item/kirbyplants, -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/turret_protected/aisat) "bXL" = ( /obj/machinery/porta_turret, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -28490,9 +26738,7 @@ /area/station/turret_protected/aisat) "bXM" = ( /obj/structure/table/reinforced, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ @@ -28502,7 +26748,7 @@ /area/station/turret_protected/aisat) "bXN" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/clipboard, /obj/item/toy/figure/crew/borg, /turf/simulated/floor/plasteel{ @@ -28512,9 +26758,7 @@ /area/station/turret_protected/aisat) "bXO" = ( /obj/structure/table/reinforced, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/item/folder/blue, /obj/item/folder/yellow, /obj/item/aicard, @@ -28525,10 +26769,7 @@ /area/station/turret_protected/aisat) "bXP" = ( /obj/item/kirbyplants, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -28655,18 +26896,10 @@ /turf/simulated/wall, /area/station/service/library) "bYo" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light/small, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/control) "bYp" = ( @@ -28685,9 +26918,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/hop) "bYu" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/machinery/pdapainter, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -28699,16 +26930,11 @@ /area/station/command/office/blueshield) "bYy" = ( /obj/machinery/photocopier, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "bYA" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "bYB" = ( @@ -28966,9 +27192,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "bZp" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -29086,10 +27310,7 @@ /area/station/maintenance/port) "bZJ" = ( /obj/structure/table/wood, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/machinery/computer/library, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -29112,22 +27333,14 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "bZP" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "bZR" = ( @@ -29138,13 +27351,8 @@ "bZS" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -29161,9 +27369,7 @@ /turf/simulated/wall/r_wall, /area/station/command/office/hop) "bZX" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/computer/secure_data{ dir = 4 }, @@ -29171,13 +27377,11 @@ /area/station/command/office/hop) "caa" = ( /obj/structure/table/wood, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/photocopier/faxmachine/longrange{ department = "Head of Personnel's Office" }, -/obj/machinery/keycard_auth{ - pixel_x = 24 - }, +/obj/machinery/keycard_auth/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "cab" = ( @@ -29204,9 +27408,7 @@ /area/station/command/office/ntrep) "caf" = ( /obj/structure/chair/sofa/right, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "cag" = ( @@ -29224,10 +27426,7 @@ "caj" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "cak" = ( @@ -29256,11 +27455,7 @@ /obj/structure/table/wood, /obj/item/pinpointer, /obj/item/disk/nuclear, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "car" = ( @@ -29274,11 +27469,7 @@ /area/station/command/office/captain/bedroom) "cat" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/east, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "cax" = ( @@ -29305,22 +27496,15 @@ }, /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" }, /area/station/legal/courtroom) "caD" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/structure/reagent_dispensers/peppertank/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -29338,10 +27522,7 @@ /obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/item/clothing/glasses/sunglasses, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/item/clipboard, /obj/item/toy/figure/crew/lawyer, /turf/simulated/floor/wood, @@ -29360,16 +27541,9 @@ /turf/simulated/floor/wood, /area/station/legal/lawoffice) "caK" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /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, /obj/structure/disposalpipe/segment{ @@ -29400,32 +27574,22 @@ /area/station/supply/office) "caQ" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/flasher_button{ id = "hopflash"; pixel_x = -38; pixel_y = -6 }, -/obj/machinery/light_switch{ - dir = 4; - name = "custom placement"; - pixel_x = -36; - pixel_y = 8 - }, -/obj/machinery/door_control{ +/obj/machinery/light_switch, +/obj/machinery/door_control/shutter/west{ id = "hop"; name = "Privacy Shutters"; - pixel_x = -24; pixel_y = -8; req_one_access_txt = "18" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "hopqueueshutters"; name = "Queue Shutters"; - pixel_x = -24; req_one_access_txt = "18" }, /obj/machinery/door_control/ticket_machine_button{ @@ -29437,9 +27601,7 @@ /area/station/command/office/hop) "caV" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -29628,10 +27790,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/smes) "cbx" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/power/terminal{ dir = 1 }, @@ -29640,10 +27799,7 @@ icon_state = "0-2" }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/light_switch{ - dir = 8; - name = "custom placement"; - pixel_x = 24; +/obj/machinery/light_switch/east{ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29661,22 +27817,16 @@ /area/station/maintenance/port) "cbz" = ( /obj/machinery/suit_storage_unit/captain, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "cbB" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /area/station/maintenance/port) "cbE" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -29687,9 +27837,7 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cbG" = ( @@ -29731,9 +27879,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cbN" = ( @@ -29749,11 +27895,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cbQ" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -29784,11 +27926,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/hop) "cbU" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/machinery/camera{ c_tag = "Head of Personnel's Office"; dir = 8 @@ -29802,28 +27940,20 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "cbW" = ( -/obj/machinery/keycard_auth{ - pixel_x = -24; - pixel_y = 4 - }, +/obj/machinery/keycard_auth/west, /obj/machinery/button/windowtint{ dir = 4; id = "NT"; pixel_x = -24; pixel_y = 24 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/west{ id = "ntrepofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; - pixel_x = -24; pixel_y = -8; req_access_txt = "73" }, -/obj/machinery/light_switch{ - dir = 4; - name = "custom placement"; - pixel_x = -24; +/obj/machinery/light_switch/west{ pixel_y = 32 }, /turf/simulated/floor/wood, @@ -29878,12 +28008,8 @@ /obj/structure/chair/sofa{ dir = 8 }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "ccd" = ( @@ -29904,12 +28030,10 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "ccg" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/south{ id = "blueshieldofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = 24; - pixel_y = -24; req_access_txt = "67" }, /turf/simulated/floor/wood, @@ -29987,23 +28111,15 @@ "cco" = ( /obj/structure/bed, /obj/item/bedsheet/captain, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/landmark/start/captain, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "ccp" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/newscaster/directional/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "ccq" = ( @@ -30036,18 +28152,15 @@ /area/station/legal/courtroom) "ccx" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 10000 }, /obj/structure/cable, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "ccC" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/station/legal/lawoffice) @@ -30056,11 +28169,7 @@ pixel_x = -28; pixel_y = -7 }, -/obj/item/radio/intercom{ - name = "custom placement"; - pixel_x = -28; - pixel_y = 5 - }, +/obj/item/radio/intercom, /obj/machinery/camera{ c_tag = "Magistrate's Office"; dir = 4 @@ -30069,20 +28178,14 @@ /area/station/legal/magistrate) "ccL" = ( /obj/structure/closet, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/evidence) "ccM" = ( /obj/structure/closet, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -30111,20 +28214,14 @@ c_tag = "Brig - Evidence Storage"; dir = 8 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/evidence) "ccR" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -30134,10 +28231,7 @@ }, /area/station/security/prison/cell_block) "ccU" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -30188,12 +28282,8 @@ /turf/simulated/wall/r_wall, /area/station/engineering/control) "cde" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/directional/west, /obj/effect/decal/warning_stripes/southwest, /obj/structure/cable/yellow{ d1 = 1; @@ -30337,16 +28427,12 @@ /area/station/medical/cryo) "cdx" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "cdA" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "cdB" = ( @@ -30375,9 +28461,7 @@ /area/station/command/office/hop) "cdH" = ( /obj/structure/table/wood, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/clipboard, /obj/item/toy/figure/crew/hop, /obj/item/megaphone, @@ -30390,9 +28474,7 @@ name = "Desk Door" }, /obj/effect/mapping_helpers/airlock/access/all/command/ntrep, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "cdJ" = ( @@ -30419,17 +28501,11 @@ /obj/structure/chair/sofa/left{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "cdP" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -30469,10 +28545,7 @@ name = "Desk Door" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/command/blueshield, -/obj/machinery/keycard_auth{ - pixel_x = 24; - pixel_y = -2 - }, +/obj/machinery/keycard_auth/east, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "cdT" = ( @@ -30483,16 +28556,12 @@ /area/station/command/office/captain/bedroom) "cdU" = ( /obj/structure/table/wood, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/computer/security/wooden_tv, /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, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -30502,11 +28571,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "cdX" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/item/kirbyplants, /obj/machinery/camera{ c_tag = "Captain's Quarters"; @@ -30516,10 +28581,7 @@ /area/station/command/office/captain/bedroom) "cdY" = ( /obj/structure/table/wood, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/window/reinforced{ dir = 8 }, @@ -30559,9 +28621,7 @@ /area/station/legal/courtroom) "ceg" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "custom placement" - }, +/obj/item/radio/intercom, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -30590,10 +28650,7 @@ }, /area/station/legal/courtroom) "cem" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "custom placement"; - pixel_x = -24; +/obj/machinery/light_switch/west{ pixel_y = -6 }, /obj/machinery/button/windowtint{ @@ -30631,11 +28688,7 @@ dir = 4 }, /obj/effect/landmark/start/magistrate, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -30703,11 +28756,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -30721,9 +28770,7 @@ }, /area/station/hallway/primary/starboard) "ceH" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -30734,9 +28781,7 @@ }, /area/station/security/prison/cell_block) "ceL" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "ceM" = ( @@ -30896,12 +28941,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/smes) "cfh" = ( -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /obj/machinery/computer/station_alert{ dir = 1 }, @@ -30920,11 +28961,7 @@ /obj/machinery/computer/atmos_alert{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump Engineering"; - pixel_y = -24; - shock_proof = 1 - }, +/obj/machinery/power/apc/engie/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -30953,11 +28990,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" = ( @@ -30974,9 +29007,7 @@ /area/station/service/library) "cfu" = ( /obj/structure/bookcase, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/station/service/library) "cfv" = ( @@ -30986,17 +29017,12 @@ /area/station/service/library) "cfx" = ( /obj/machinery/photocopier, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/wood, /area/station/service/library) "cfy" = ( /obj/structure/bookcase, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Library Starboard" }, @@ -31004,14 +29030,11 @@ /area/station/service/library) "cfz" = ( /obj/structure/chair/comfy/red, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/wood, /area/station/service/library) "cfB" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -31063,9 +29086,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "cfM" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31084,9 +29105,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "cfP" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "cfQ" = ( @@ -31163,22 +29182,17 @@ pixel_x = -6; pixel_y = -24 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/south{ id = "magistrateofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = 6; - pixel_y = -24; req_access_txt = "74" }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgg" = ( /obj/structure/closet, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/window/reinforced{ dir = 8 }, @@ -31187,32 +29201,21 @@ }, /area/station/security/evidence) "cgh" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgi" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cgj" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/disposal, /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 = "cult" }, @@ -31225,11 +29228,7 @@ /area/station/legal/magistrate) "cgo" = ( /obj/structure/closet, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31240,11 +29239,7 @@ /obj/item/storage/box/evidence, /obj/item/storage/box/evidence, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31254,11 +29249,7 @@ dir = 8 }, /obj/structure/closet, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31285,11 +29276,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/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -31311,9 +29298,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "cgI" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/machinery/recharge_station, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -31376,11 +29361,7 @@ "cgW" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "cgX" = ( @@ -31439,10 +29420,9 @@ "chh" = ( /obj/structure/table/wood, /obj/item/paper_bin/nanotrasen, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "hopofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = -8; req_access_txt = "57" }, @@ -31460,11 +29440,7 @@ /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "chm" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31475,11 +29451,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "chq" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/machinery/button/windowtint{ dir = 4; id = "BS"; @@ -31509,7 +29481,7 @@ /turf/simulated/wall/r_wall, /area/station/command/teleporter) "chu" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/computer/monitor{ dir = 1 }, @@ -31550,15 +29522,11 @@ /area/station/command/teleporter) "chA" = ( /obj/structure/closet/emcloset, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "chE" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/cryopod/robot, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -31599,7 +29567,7 @@ /obj/structure/table/reinforced, /obj/item/pen/multi/gold, /obj/item/book/manual/wiki/security_space_law, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/gavelhammer, /obj/item/gavelblock, /turf/simulated/floor/carpet, @@ -31690,11 +29658,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31888,11 +29852,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/wood, /area/station/command/office/hop) "ciD" = ( @@ -31903,32 +29863,18 @@ /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) "ciF" = ( /obj/machinery/photocopier, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/structure/sign/poster/official/random/west, +/obj/machinery/firealarm/directional/south, /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 @@ -31940,9 +29886,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "ciL" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -31963,11 +29907,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 @@ -31980,14 +29920,8 @@ /area/station/command/office/blueshield) "ciR" = ( /obj/machinery/photocopier, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/structure/sign/poster/official/random/east, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "ciS" = ( @@ -32010,18 +29944,14 @@ /obj/structure/sign/securearea{ pixel_x = -32 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/station/hallway/primary/central/east) "ciX" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/camera{ c_tag = "Engine SMES"; dir = 1; @@ -32078,9 +30008,7 @@ /area/station/service/chapel/office) "cjg" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "custom placement" - }, +/obj/item/radio/intercom, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -32137,9 +30065,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cjp" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cjq" = ( @@ -32153,13 +30079,8 @@ /turf/simulated/wall, /area/station/security/range) "cjs" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/closet/crate, /obj/item/target/syndicate, /obj/item/target/syndicate, @@ -32214,9 +30135,7 @@ /turf/simulated/floor/plating, /area/station/security/range) "cjx" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating, /area/station/security/range) "cjy" = ( @@ -32336,13 +30255,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cjO" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "east bump Engineering"; - pixel_x = 24; - shock_proof = 1 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -32471,10 +30384,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "ckm" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -32484,19 +30394,12 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "ckp" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/wood, /area/station/command/office/hop) "cks" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /obj/structure/filingcabinet, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -32552,9 +30455,7 @@ /turf/simulated/floor/plating, /area/station/command/office/blueshield) "cky" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "ckz" = ( @@ -32564,18 +30465,11 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "ckB" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/table, /obj/item/hand_tele, /obj/structure/cable{ @@ -32592,19 +30486,16 @@ /area/station/command/teleporter) "ckD" = ( /obj/machinery/bluespace_beacon, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "teleaccessshutter"; name = "Teleporter Shutters Access Control"; - pixel_y = 24; req_access_txt = "17" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "ckE" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/station/security/range) @@ -32646,9 +30537,7 @@ /area/station/legal/courtroom) "ckN" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "custom placement" - }, +/obj/item/radio/intercom, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -32675,11 +30564,7 @@ }, /area/station/legal/courtroom) "ckR" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -32806,10 +30691,9 @@ id_tag = "Singularity"; name = "Singularity Blast Doors" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Singularity"; - name = "Containment Blast Doors"; - pixel_x = 32 + name = "Containment Blast Doors" }, /obj/structure/cable/yellow{ d1 = 1; @@ -32832,9 +30716,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/equipmentstorage) "clx" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -32894,11 +30776,7 @@ /obj/structure/table/wood, /obj/item/camera_film, /obj/item/camera_film, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/window/reinforced{ dir = 1 }, @@ -32907,11 +30785,7 @@ "clI" = ( /obj/structure/bed, /obj/item/bedsheet/hop, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/carpet, /area/station/command/office/hop) "clJ" = ( @@ -32935,11 +30809,7 @@ /obj/structure/table/wood, /obj/item/clipboard, /obj/item/toy/figure/crew/ian, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "clU" = ( @@ -32956,11 +30826,7 @@ /obj/item/storage/toolbox/emergency, /obj/item/crowbar, /obj/item/wrench, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "clZ" = ( @@ -32977,18 +30843,12 @@ /area/station/command/teleporter) "cmd" = ( /obj/machinery/teleport/station, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plating, /area/station/command/teleporter) "cmf" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "cmh" = ( @@ -33034,11 +30894,7 @@ }, /area/station/hallway/primary/aft) "cmo" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /mob/living/simple_animal/pet/sloth/paperwork, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) @@ -33060,11 +30916,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "cmy" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /obj/structure/cable{ @@ -33113,11 +30965,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, @@ -33129,12 +30977,8 @@ /turf/simulated/floor/plasteel, /area/station/security/range) "cmG" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light_construct/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) @@ -33152,11 +30996,7 @@ /area/station/engineering/control) "cmM" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -33172,16 +31012,10 @@ /area/station/engineering/control) "cmP" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 4; @@ -33242,11 +31076,7 @@ /obj/structure/rack, /obj/item/tank/internals/oxygen, /obj/item/radio, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel, /area/station/command/teleporter) "cmY" = ( @@ -33278,10 +31108,7 @@ /area/station/engineering/equipmentstorage) "cne" = ( /obj/structure/dispenser, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) @@ -33291,11 +31118,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cnh" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -33327,21 +31150,13 @@ "cnn" = ( /obj/structure/table/wood, /obj/machinery/computer/library, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "cno" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/hop) "cnp" = ( @@ -33356,11 +31171,7 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "cnr" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -33368,11 +31179,7 @@ /area/station/command/office/hop) "cnt" = ( /obj/item/kirbyplants, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/wood, /area/station/command/office/hop) "cnv" = ( @@ -33399,11 +31206,7 @@ c_tag = "Teleporter"; dir = 1 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -33423,12 +31226,8 @@ }, /area/station/service/bar/atrium) "cnD" = ( -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -33440,9 +31239,7 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "cnF" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/station/security/range) @@ -33478,11 +31275,7 @@ }, /area/station/legal/courtroom) "cnN" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -33549,11 +31342,7 @@ pixel_x = 8; pixel_y = 24 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -33687,9 +31476,7 @@ /area/station/engineering/equipmentstorage) "cow" = ( /obj/structure/bookcase, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "cox" = ( @@ -33707,9 +31494,7 @@ /turf/simulated/floor/carpet, /area/station/service/library) "coz" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "coA" = ( @@ -33751,10 +31536,9 @@ }, /area/station/hallway/primary/central/sw) "coF" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "teleportershutter"; name = "Teleporter Shutters Access Control"; - pixel_x = -24; req_access_txt = "17" }, /obj/machinery/door/poddoor/shutters{ @@ -33783,14 +31567,8 @@ "coI" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "coL" = ( @@ -33801,9 +31579,7 @@ /area/station/legal/courtroom) "coM" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "custom placement" - }, +/obj/item/radio/intercom, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "coN" = ( @@ -33863,9 +31639,7 @@ }, /area/station/public/locker) "coY" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -34018,11 +31792,7 @@ }, /area/station/science/xenobiology) "cpH" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood, /area/station/service/library) @@ -34255,10 +32025,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "cqv" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -34271,15 +32038,11 @@ }, /area/station/public/locker) "cqx" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Locker Room North" }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, @@ -34322,9 +32085,7 @@ "cqJ" = ( /obj/machinery/atmospherics/unary/tank/toxins, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "cqK" = ( @@ -34445,7 +32206,7 @@ c_tag = "Library South"; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/service/library) "crl" = ( @@ -34454,19 +32215,13 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "crm" = ( /obj/item/kirbyplants, -/obj/machinery/light, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "crn" = ( @@ -34478,17 +32233,13 @@ /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, /area/station/service/library) "crv" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -34587,13 +32338,11 @@ }, /area/station/public/locker) "crK" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "crO" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Central Ring Hallway Center"; dir = 1 @@ -34665,10 +32414,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cse" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/table, /obj/structure/cable, /turf/simulated/floor/plating, @@ -34681,9 +32427,7 @@ /area/station/maintenance/starboard2) "csh" = ( /obj/structure/rack, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 - }, +/obj/structure/reagent_dispensers/peppertank/south, /obj/item/reagent_containers/spray/pepper, /obj/item/reagent_containers/spray/pepper, /obj/item/reagent_containers/spray/pepper, @@ -34751,9 +32495,7 @@ /area/station/engineering/control) "cst" = ( /obj/machinery/atmospherics/portable/canister/toxins, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) @@ -34785,11 +32527,7 @@ /obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "csx" = ( @@ -34814,11 +32552,7 @@ name = "solar pack crate" }, /obj/effect/decal/warning_stripes/yellow/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) "csG" = ( @@ -34857,9 +32591,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/bridge) "csO" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -34916,9 +32648,7 @@ }, /area/station/hallway/secondary/bridge) "csU" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -35025,9 +32755,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "ctA" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/public/fitness) "ctB" = ( @@ -35060,9 +32788,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "ctG" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -35103,9 +32829,7 @@ /area/station/service/library) "ctL" = ( /obj/structure/table/wood, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, /obj/item/storage/fancy/candle_box/full, /obj/item/storage/fancy/candle_box/full, /turf/simulated/floor/plasteel/dark, @@ -35115,10 +32839,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "ctN" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "ctO" = ( @@ -35129,14 +32850,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "ctQ" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -35168,9 +32883,7 @@ c_tag = "Courtroom East"; dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -35250,11 +32963,7 @@ }, /area/station/service/expedition) "cul" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -35264,14 +32973,8 @@ }, /area/station/service/expedition) "cun" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -35291,7 +32994,7 @@ /turf/simulated/floor/plating, /area/station/medical/virology/lab) "cut" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/sign/securearea{ pixel_y = -32 }, @@ -35497,29 +33200,20 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cuV" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cuX" = ( /obj/item/kirbyplants, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/service/expedition) "cuY" = ( /obj/machinery/suit_storage_unit/engine, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -35529,9 +33223,7 @@ /area/station/maintenance/virology_maint) "cvh" = ( /obj/structure/table/wood, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /obj/item/clipboard, /obj/item/folder, /turf/simulated/floor/plasteel/dark, @@ -35573,11 +33265,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cvr" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cvs" = ( @@ -35592,11 +33280,7 @@ /area/station/hallway/primary/central/sw) "cvt" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/item/stack/sheet/plasteel{ amount = 10 }, @@ -35619,11 +33303,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "cvx" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -35632,9 +33312,7 @@ /area/station/ai_monitored/storage/eva) "cvz" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cvB" = ( @@ -35650,10 +33328,7 @@ }, /area/station/hallway/secondary/bridge) "cvF" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -35670,10 +33345,7 @@ /obj/item/stack/rods{ amount = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/item/storage/toolbox/emergency, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -35704,18 +33376,14 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "cvW" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/station/hallway/primary/central/north) "cvX" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -35757,17 +33425,13 @@ /area/station/public/locker) "cwf" = ( /obj/structure/closet/wardrobe/grey, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/station/public/locker) "cwk" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "cwq" = ( @@ -35809,9 +33473,7 @@ }, /area/station/engineering/hardsuitstorage) "cwE" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Library Backroom"; dir = 4 @@ -35873,9 +33535,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cwL" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/kirbyplants, /obj/structure/disposalpipe/segment{ dir = 2; @@ -35884,11 +33544,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) @@ -35896,36 +33552,24 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cwO" = ( /obj/structure/table/wood, -/obj/machinery/light, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/south, /obj/item/folder, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cwP" = ( /obj/structure/table/wood, /obj/item/camera, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cwQ" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -36062,14 +33706,8 @@ /turf/simulated/floor/plasteel, /area/station/public/toilet) "cxp" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -36209,10 +33847,7 @@ /area/station/maintenance/starboard2) "cxV" = ( /obj/item/kirbyplants, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -36269,11 +33904,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cyb" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -36330,9 +33961,7 @@ /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "cyl" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/machinery/camera{ c_tag = "Public Meeting Room" }, @@ -36347,9 +33976,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "cyn" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "cyp" = ( @@ -36377,9 +34004,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/personal, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -36436,11 +34061,7 @@ }, /area/station/service/expedition) "cyz" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -36476,14 +34097,8 @@ }, /area/station/medical/virology/lab) "cyI" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /obj/structure/table, /obj/item/radio/alternative{ pixel_y = 7; @@ -36513,9 +34128,7 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -36562,11 +34175,7 @@ }, /area/station/public/locker) "cyS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/closet/wardrobe/pink, /obj/structure/cable{ d2 = 8; @@ -36588,15 +34197,11 @@ /area/station/hallway/primary/fore) "cyU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "cyV" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "cyW" = ( @@ -36606,10 +34211,7 @@ /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "cyX" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -36632,9 +34234,7 @@ /area/station/public/sleep) "cza" = ( /obj/machinery/cryopod, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -36745,9 +34345,7 @@ /area/station/maintenance/port) "czy" = ( /obj/structure/table/wood, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/item/newspaper, /obj/item/newspaper, /turf/simulated/floor/plasteel/dark, @@ -36762,11 +34360,7 @@ pixel_x = 9; pixel_y = 2 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36801,11 +34395,7 @@ }, /area/station/ai_monitored/storage/eva) "czJ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -36829,11 +34419,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood, /area/station/service/theatre) "czM" = ( @@ -36865,11 +34451,7 @@ /turf/simulated/floor/carpet, /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; @@ -36928,10 +34510,7 @@ /area/station/public/toilet) "cAf" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /obj/structure/mirror{ pixel_y = -32 }, @@ -36953,11 +34532,7 @@ /area/station/public/locker) "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 = "whitegreenfull" }, @@ -37019,12 +34594,8 @@ }, /area/station/engineering/control) "cAD" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/directional/west, /obj/effect/decal/warning_stripes/northwest, /obj/structure/cable/yellow{ d1 = 2; @@ -37088,28 +34659,18 @@ /area/station/engineering/hardsuitstorage) "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) "cAU" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cAV" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/machinery/light, +/obj/machinery/status_display/directional/south, +/obj/machinery/light/directional/north, /obj/structure/dresser, /turf/simulated/floor/plasteel/dark, /area/station/service/library) @@ -37117,9 +34678,7 @@ /obj/structure/table/wood, /obj/item/dice/d10, /obj/item/dice/d20, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cAX" = ( @@ -37139,15 +34698,8 @@ /area/station/maintenance/port) "cBc" = ( /obj/structure/closet/secure_closet/bar, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37172,10 +34724,7 @@ }, /obj/item/wrench, /obj/item/grenade/chem_grenade/metalfoam, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cBg" = ( @@ -37197,9 +34746,7 @@ /area/station/public/locker) "cBi" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "EVA West" }, @@ -37240,11 +34787,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 }, @@ -37316,11 +34859,7 @@ }, /area/station/service/expedition) "cBw" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/closet/secure_closet/personal, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -37392,10 +34931,8 @@ }, /area/station/public/locker) "cBQ" = ( -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/directional/south, /obj/machinery/camera{ c_tag = "Locker Room South"; dir = 1 @@ -37557,7 +35094,7 @@ /obj/item/folder/yellow, /obj/item/gps, /obj/item/gps, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cCE" = ( @@ -37582,7 +35119,7 @@ /area/station/ai_monitored/storage/eva) "cCK" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/storage/belt/utility, /obj/item/radio, /turf/simulated/floor/plasteel/dark, @@ -37604,12 +35141,8 @@ /area/station/science/robotics/showroom) "cCN" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "cCO" = ( @@ -37630,7 +35163,7 @@ /area/station/science/robotics/showroom) "cCR" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "cCS" = ( @@ -37640,11 +35173,7 @@ /area/station/science/robotics/showroom) "cCT" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/item/folder/red, /obj/structure/cable{ d1 = 1; @@ -37697,11 +35226,7 @@ name = "protective hat"; pixel_y = 8 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37777,10 +35302,9 @@ }, /area/station/hallway/primary/central/nw) "cDf" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "stationawaygate"; name = "Gateway Shutters Control"; - pixel_x = 24; req_access_txt = "62" }, /obj/effect/decal/warning_stripes/south, @@ -37800,11 +35324,7 @@ /obj/item/paper_bin, /obj/structure/table, /obj/item/pen, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/public/locker) "cDo" = ( @@ -37817,11 +35337,7 @@ /area/station/public/locker) "cDq" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "cDr" = ( @@ -37834,11 +35350,7 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cDt" = ( @@ -37890,7 +35402,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "cDz" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -37948,9 +35460,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cDO" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cDR" = ( @@ -37965,9 +35475,7 @@ }, /area/station/maintenance/port) "cDV" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -38013,11 +35521,7 @@ /area/station/maintenance/port) "cEb" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cEe" = ( @@ -38145,11 +35649,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "cEI" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, @@ -38165,19 +35665,14 @@ }, /area/station/hallway/primary/central) "cEM" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/station/hallway/primary/central) "cEN" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cEO" = ( @@ -38195,10 +35690,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cER" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "eva-shutters"; name = "Auxilary E.V.A. Storage"; - pixel_x = 26; req_one_access_txt = "18" }, /obj/machinery/door/poddoor/shutters{ @@ -38210,29 +35704,21 @@ /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cES" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/station/hallway/primary/central) "cET" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/station/hallway/primary/central) "cEU" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -38245,19 +35731,14 @@ }, /area/station/public/locker) "cEY" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/station/hallway/primary/central) "cEZ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Central Ring Hallway South" }, @@ -38297,11 +35778,7 @@ /area/station/hallway/primary/central/sw) "cFr" = ( /obj/structure/table/wood, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -38333,7 +35810,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "cFF" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38341,9 +35818,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "cFJ" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/camera{ c_tag = "Holodeck Control Room" }, @@ -38686,7 +36161,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "cHk" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/port) "cHo" = ( @@ -38743,7 +36218,7 @@ }, /area/station/hallway/primary/central) "cHH" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Central Ring Hallway South"; dir = 1 @@ -38762,7 +36237,7 @@ }, /area/station/hallway/primary/central) "cHL" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -38913,9 +36388,7 @@ /area/station/science/xenobiology) "cIJ" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/portable/canister/air, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -39060,9 +36533,7 @@ }, /area/station/medical/reception) "cJl" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" @@ -39121,9 +36592,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "cJF" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -39131,9 +36600,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "cJJ" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -39153,9 +36620,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cJO" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -39182,17 +36647,12 @@ /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/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cJV" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/power/port_gen/pacman, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -39211,9 +36671,7 @@ }, /area/station/hallway/primary/aft) "cJZ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/rack, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -39224,9 +36682,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cKc" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -39364,9 +36820,7 @@ }, /area/station/science/research) "cKB" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/chair/sofa/corp, /turf/simulated/floor/plasteel{ dir = 1; @@ -39457,17 +36911,8 @@ /area/station/medical/medbay) "cKP" = ( /obj/structure/chair/comfy/teal, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -39480,10 +36925,7 @@ /area/station/medical/reception) "cKR" = ( /obj/structure/closet/secure_closet/reagents, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteyellow" @@ -39504,26 +36946,21 @@ /area/station/medical/medbay) "cKW" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "chemdesk"; - name = "Primary Chemistry Shutters"; - pixel_y = 24 + name = "Primary Chemistry Shutters" }, /obj/structure/chair/stool{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/landmark/start/chemist, /turf/simulated/floor/engine, /area/station/medical/chemistry) "cKX" = ( /obj/effect/decal/warning_stripes/northeast, /obj/machinery/chem_dispenser, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/east, /obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -39550,23 +36987,15 @@ }, /area/station/medical/chemistry) "cLo" = ( -/obj/machinery/door_control{ - id = "PrivateRoom2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 24; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/north{ + id = "PrivateRoom2" }, /obj/structure/chair/sofa/right, /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "cLp" = ( /obj/item/flag/mime, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -39659,11 +37088,7 @@ /area/station/maintenance/electrical) "cLO" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -39685,10 +37110,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cLT" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; @@ -39786,9 +37208,7 @@ "cMG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/iv_drip, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -39838,9 +37258,7 @@ /area/station/maintenance/electrical) "cMX" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -39871,9 +37289,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cNj" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/blood/xeno, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) @@ -39890,16 +37306,14 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "custom placement"; - pixel_x = 25; - pixel_y = 30 - }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/extinguisher_cabinet/directional/north{ + pixel_x = 24 + }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "cNn" = ( @@ -40070,9 +37484,7 @@ /area/station/science/robotics) "cNT" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -40160,9 +37572,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cOy" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -40171,9 +37581,7 @@ /area/station/maintenance/electrical) "cOz" = ( /obj/item/kirbyplants, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -40239,20 +37647,11 @@ /area/station/science/xenobiology) "cOL" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light_switch/north, +/obj/item/radio/intercom/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) @@ -40276,7 +37675,7 @@ /area/station/science/xenobiology) "cOR" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xeno6"; name = "Containment Control"; req_access_txt = "55" @@ -40284,21 +37683,16 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - name = "custom placement"; - pixel_x = -25; - pixel_y = 30 - }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/extinguisher_cabinet/directional/north{ + pixel_x = -24 + }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "cOS" = ( /obj/machinery/monkey_recycler, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -40495,13 +37889,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "cQf" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "cQh" = ( @@ -40514,9 +37906,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cQj" = ( @@ -40524,9 +37914,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cQk" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/poolcontroller{ pixel_x = -25; srange = 7 @@ -40599,7 +37987,7 @@ /area/station/maintenance/electrical) "cQF" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xeno4"; name = "Containment Control"; req_access_txt = "55" @@ -40636,17 +38024,11 @@ /area/station/science/xenobiology) "cQJ" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/stack/sheet/mineral/plasma, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/dropper, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) @@ -40685,7 +38067,7 @@ /area/station/science/xenobiology) "cQL" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xeno5"; name = "Containment Control"; req_access_txt = "55" @@ -40705,9 +38087,7 @@ /area/station/science/xenobiology) "cQO" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -40771,10 +38151,7 @@ network = list("Medbay","SS13"); dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -25 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -40792,11 +38169,7 @@ /turf/simulated/floor/engine, /area/station/science/toxins/mixing) "cRA" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -40810,9 +38183,7 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "cRE" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6; @@ -40913,7 +38284,7 @@ "cRQ" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xenosecure"; name = "Containment Control"; pixel_y = -3; @@ -41023,18 +38394,14 @@ /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "cSh" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/machinery/computer/camera_advanced/xenobio{ dir = 8 }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "cSi" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Xeno Containment 4"; network = list("Research","SS13") @@ -41047,9 +38414,7 @@ /turf/simulated/floor/plating, /area/station/engineering/break_room) "cSl" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Xeno Containment 5"; network = list("Research","SS13") @@ -41063,11 +38428,7 @@ /obj/item/stack/sheet/glass, /obj/item/assembly/signaler, /obj/item/assembly/infra, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -41089,16 +38450,14 @@ /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "cSp" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/station/science/research) "cSq" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Xeno Containment 6"; network = list("Research","SS13") @@ -41129,7 +38488,7 @@ /area/station/science/research) "cSv" = ( /obj/structure/table, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty{ pixel_x = -5; @@ -41193,9 +38552,7 @@ }, /area/station/medical/medbay) "cSC" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/camera{ c_tag = "Xeno Kill Room"; network = list("Research","SS13") @@ -41269,19 +38626,15 @@ /area/station/maintenance/electrical) "cTl" = ( /obj/machinery/power/smes, -/obj/machinery/light/small, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/light/small/directional/north, +/obj/machinery/status_display/directional/south, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cTm" = ( /obj/machinery/power/smes, -/obj/machinery/light/small, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/light/small/directional/north, +/obj/machinery/status_display/directional/south, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/station/maintenance/electrical) @@ -41332,9 +38685,7 @@ c_tag = "Xenobio West"; network = list("Research","SS13") }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/decal/warning_stripes/yellow, /obj/structure/cable{ d1 = 4; @@ -41345,7 +38696,7 @@ /area/station/science/xenobiology) "cTy" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -41407,7 +38758,7 @@ /area/station/science/rnd) "cTG" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xeno2"; name = "Containment Control"; req_access_txt = "55" @@ -41420,7 +38771,7 @@ /area/station/science/xenobiology) "cTH" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xeno3"; name = "Containment Control"; req_access_txt = "55" @@ -41483,9 +38834,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "cTV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 }, @@ -41495,10 +38844,7 @@ }, /area/station/hallway/primary/aft) "cTW" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -41609,12 +38955,8 @@ /turf/simulated/floor/plating, /area/shuttle/pod_2) "cUQ" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -41703,9 +39045,7 @@ /area/station/science/research) "cUZ" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/science/research) "cVb" = ( @@ -41766,11 +39106,7 @@ /area/station/science/xenobiology) "cVm" = ( /obj/machinery/smartfridge/secure/extract, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; @@ -41787,15 +39123,9 @@ /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "cVo" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/folder/white, /obj/item/pen, /obj/effect/decal/warning_stripes/south, @@ -41821,12 +39151,8 @@ /area/station/science/rnd) "cVu" = ( /obj/item/kirbyplants, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -41957,10 +39283,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -42010,10 +39333,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "cWl" = ( @@ -42054,9 +39374,7 @@ }, /area/station/maintenance/port) "cWr" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -42070,11 +39388,7 @@ }, /area/station/maintenance/port) "cWs" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d2 = 4; @@ -42113,7 +39427,7 @@ }, /area/station/hallway/secondary/entry) "cWy" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cWz" = ( @@ -42237,9 +39551,7 @@ }, /area/station/science/xenobiology) "cWL" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/camera{ c_tag = "Research Lobby"; dir = 1; @@ -42251,11 +39563,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 @@ -42279,13 +39587,9 @@ /turf/simulated/floor/plasteel, /area/station/science/rnd) "cWS" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /obj/machinery/r_n_d/protolathe, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/station/science/rnd) @@ -42295,11 +39599,7 @@ /obj/item/pen, /obj/item/storage/bag/bio, /obj/item/storage/bag/bio, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 10; @@ -42321,9 +39621,7 @@ /area/station/science/xenobiology) "cWW" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -42337,22 +39635,14 @@ /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/latex, /obj/item/slime_scanner, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, /area/station/science/xenobiology) "cXb" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, @@ -42439,9 +39729,7 @@ c_tag = "Medbay Storage"; network = list("Medbay","SS13") }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -42499,9 +39787,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -42543,7 +39829,7 @@ /area/station/science/xenobiology) "cYj" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/science/research) "cYl" = ( @@ -42553,11 +39839,7 @@ /area/station/science/research) "cYm" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/item/stock_parts/scanning_module, @@ -42643,9 +39925,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/abandonedbar) "cZm" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -42674,11 +39954,7 @@ /area/station/science/research) "cZs" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/item/folder/white, /obj/item/stock_parts/cell/high, /obj/item/stack/sheet/glass, @@ -42752,9 +40028,7 @@ "cZF" = ( /obj/effect/decal/warning_stripes/blue, /obj/effect/decal/warning_stripes/southwest, -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "cZG" = ( @@ -42795,11 +40069,7 @@ pixel_x = -8; pixel_y = -24 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -42834,11 +40104,7 @@ /obj/structure/table/wood, /obj/item/clothing/gloves/color/fyellow, /obj/item/storage/toolbox/electrical, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -42852,18 +40118,14 @@ }, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/barsign{ pixel_y = 32 }, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "daj" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/abandonedbar) "dak" = ( @@ -42889,9 +40151,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "dan" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dau" = ( @@ -42915,9 +40175,7 @@ /turf/simulated/wall, /area/station/science/xenobiology) "daF" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -43135,9 +40393,7 @@ /area/station/maintenance/apmaint) "dbJ" = ( /obj/item/kirbyplants, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dbK" = ( @@ -43201,9 +40457,7 @@ /area/station/science/research) "dbZ" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/clipboard, /obj/item/reagent_containers/glass/beaker/sulphuric, /obj/item/reagent_containers/dropper, @@ -43244,9 +40498,7 @@ /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) @@ -43361,9 +40613,7 @@ }, /area/station/maintenance/old_kitchen) "dcM" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dcN" = ( @@ -43375,9 +40625,7 @@ /area/station/maintenance/starboard) "dcO" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/grass, /area/station/service/hydroponics) "dcQ" = ( @@ -43439,9 +40687,7 @@ /area/station/maintenance/port2) "ddc" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port2) "dde" = ( @@ -43449,9 +40695,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "ddg" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port) "ddh" = ( @@ -43462,13 +40706,9 @@ /area/station/science/explab) "ddj" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/cell_charger, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ dir = 8; @@ -43485,7 +40725,7 @@ }, /area/station/public/locker) "ddm" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -43584,9 +40824,7 @@ /area/station/science/rnd) "ddE" = ( /obj/structure/table/reinforced, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/mechanical, /obj/item/stack/cable_coil/random, @@ -43599,10 +40837,7 @@ /area/station/science/rnd) "ddF" = ( /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/item/folder/white, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker, @@ -43625,18 +40860,16 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light, -/obj/machinery/door_control{ +/obj/machinery/light/directional/north, +/obj/machinery/door_control/shutter/south{ id = "researchdesk2"; name = "Secondary Research Shutters"; - pixel_x = 8; - pixel_y = -26 + pixel_x = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "researchdesk1"; name = "Primary Research Shutters"; - pixel_x = -8; - pixel_y = -26 + pixel_x = -8 }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ @@ -43690,7 +40923,7 @@ /obj/item/storage/firstaid/regular{ pixel_y = 2 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -43718,11 +40951,7 @@ }, /area/station/medical/cloning) "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" = ( @@ -43814,10 +41043,7 @@ /turf/simulated/wall/r_wall, /area/station/command/office/rd) "dfm" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -43832,9 +41058,7 @@ "dfr" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -43873,9 +41097,7 @@ "dfA" = ( /obj/effect/decal/warning_stripes/blue, /obj/effect/decal/warning_stripes/southeast, -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "dfB" = ( @@ -43958,10 +41180,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "dgs" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/computer/aifixer{ dir = 4 @@ -43988,9 +41207,7 @@ }, /area/station/hallway/primary/aft) "dgC" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -44101,10 +41318,7 @@ pixel_y = 2 }, /obj/item/clothing/glasses/hud/health, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -44126,12 +41340,8 @@ /turf/simulated/floor/plating, /area/station/command/office/cmo) "dhu" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/plasteel/grimy, /area/station/maintenance/abandonedbar) "dhv" = ( @@ -44155,11 +41365,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/random, /obj/item/stock_parts/scanning_module, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) "dhz" = ( @@ -44180,10 +41386,9 @@ /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) "dhE" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "maintrobotics"; - name = "Decrepit Control"; - pixel_x = 26 + name = "Decrepit Control" }, /turf/simulated/floor/plating, /area/station/maintenance/port2) @@ -44196,9 +41401,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port2) "dhN" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/displaycase/labcage, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/computer/security/telescreen/rd{ @@ -44242,11 +41445,7 @@ /obj/item/aicard, /obj/item/circuitboard/aicore, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "dif" = ( @@ -44274,18 +41473,9 @@ /area/station/maintenance/apmaint) "dim" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/north, +/obj/machinery/alarm/directional/west, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, @@ -44314,9 +41504,7 @@ /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dit" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -44521,11 +41709,7 @@ /area/station/maintenance/port2) "djh" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "dji" = ( @@ -44560,11 +41744,7 @@ "djv" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "djA" = ( @@ -44740,25 +41920,19 @@ /area/station/maintenance/apmaint) "dkv" = ( /obj/structure/table/wood, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /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, /area/station/maintenance/port2) "dky" = ( /obj/item/kirbyplants, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) @@ -44776,10 +41950,7 @@ }, /area/station/maintenance/port2) "dkB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/effect/decal/warning_stripes/yellow, /obj/structure/cable, /turf/simulated/floor/plasteel/white, @@ -44854,20 +42025,14 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "dkV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/station/science/research) "dkY" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/simulated/floor/plasteel{ @@ -44917,15 +42082,8 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/machinery/light_switch/south, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteyellow" @@ -45016,16 +42174,15 @@ /area/station/medical/surgery/secondary) "dmb" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "rdtest"; name = "Test Range Shutters"; pixel_x = -6; pixel_y = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ id = "rdofficedoor"; name = "Office Door"; - normaldoorcontrol = 1; pixel_x = -6; pixel_y = -2; req_access_txt = "30" @@ -45041,22 +42198,14 @@ /area/station/command/office/rd) "dmf" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) "dmg" = ( /turf/simulated/floor/greengrid, /area/station/science/robotics/chargebay) "dmh" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -45089,11 +42238,7 @@ /area/station/medical/chemistry) "dmk" = ( /obj/effect/decal/warning_stripes/west, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "Dark" @@ -45132,18 +42277,12 @@ /area/station/maintenance/abandonedbar) "dmR" = ( /obj/item/kirbyplants, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) "dmS" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port2) "dmT" = ( @@ -45173,9 +42312,7 @@ /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) "dmX" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/mecha_part_fabricator, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/white, @@ -45215,11 +42352,7 @@ }, /area/station/security/brig) "dne" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -45271,9 +42404,7 @@ }, /area/station/maintenance/starboard) "dnn" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /obj/machinery/computer/card/minor/rd{ dir = 8 }, @@ -45332,10 +42463,9 @@ id_tag = "roboticsshutters"; name = "Mech Bay Shutters" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "roboticsshutters"; name = "Mech Bay Door Control"; - pixel_y = 24; req_access_txt = "29" }, /obj/effect/decal/warning_stripes/east, @@ -45419,9 +42549,7 @@ /area/station/hallway/primary/central/north) "dou" = ( /obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/abandonedbar) "dov" = ( @@ -45486,9 +42614,7 @@ /obj/item/hand_labeler{ pixel_y = 2 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/storage/box/rxglasses{ pixel_y = 2; pixel_x = 16 @@ -45502,16 +42628,8 @@ }, /area/station/medical/reception) "doN" = ( -/obj/machinery/keycard_auth{ - pixel_x = 38; - pixel_y = -24 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "custom placement"; - pixel_x = 24; - pixel_y = -24 - }, +/obj/machinery/keycard_auth/south, +/obj/machinery/light_switch, /obj/machinery/button/windowtint{ dir = 1; id = "RD"; @@ -45529,7 +42647,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "doQ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/camera{ c_tag = "Xeno Containment 1"; dir = 1; @@ -45555,11 +42673,7 @@ /area/station/hallway/primary/aft) "doT" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) @@ -45592,9 +42706,7 @@ }, /area/station/hallway/primary/aft) "doZ" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/item/wrench, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 @@ -45617,11 +42729,7 @@ /area/station/science/robotics/chargebay) "dpf" = ( /obj/structure/closet/paramedic, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -45651,10 +42759,7 @@ "dpt" = ( /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/wood{ icon_state = "wood-broken5" }, @@ -45671,7 +42776,7 @@ }, /area/station/command/office/cmo) "dpP" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/camera{ c_tag = "Xeno Containment 2"; dir = 1; @@ -45681,21 +42786,13 @@ /area/station/science/xenobiology) "dpQ" = ( /obj/structure/table/reinforced, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/photocopier/faxmachine{ department = "Research Director's Office" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -45741,7 +42838,7 @@ }, /area/station/maintenance/port) "dpZ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/camera{ c_tag = "Xeno Containment 3"; dir = 1; @@ -45750,10 +42847,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "dqc" = ( -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/status_display/directional/east, /obj/machinery/computer/robotics{ dir = 8 }, @@ -45774,13 +42869,8 @@ /area/station/command/office/rd) "dqj" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -45906,13 +42996,10 @@ pixel_y = 4; pixel_x = -4 }, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = -32 - }, -/obj/machinery/door_control{ +/obj/structure/reagent_dispensers/virusfood/west, +/obj/machinery/door_control/shutter/south{ id = "Virology1"; - name = "Virology Window Shutters Control"; - pixel_y = -24 + name = "Virology Window Shutters Control" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -45958,7 +43045,7 @@ /area/station/engineering/control) "dqZ" = ( /obj/structure/table/wood, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/abandonedbar) "dra" = ( @@ -45987,19 +43074,11 @@ /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" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) @@ -46112,15 +43191,9 @@ /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "drF" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) @@ -46155,11 +43228,7 @@ /area/station/hallway/primary/aft) "drM" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -46316,14 +43385,10 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "dsG" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/bed, /obj/item/bedsheet/rd, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -46368,11 +43433,7 @@ pixel_y = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /obj/item/stack/sheet/plasteel{ amount = 10 }, @@ -46416,9 +43477,7 @@ /area/station/science/robotics) "dsM" = ( /obj/structure/rack, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/book/manual/wiki/robotics_cyborgs, /obj/item/book/manual/ripley_build_and_repair, /obj/item/storage/belt/utility/full, @@ -46463,7 +43522,7 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteyellow" }, @@ -46487,21 +43546,14 @@ /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{ icon_state = "dark" }, /area/station/service/expedition) "dtf" = ( /obj/machinery/iv_drip, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -46571,10 +43623,8 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "dtJ" = ( -/obj/machinery/light/small, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dtK" = ( @@ -46586,11 +43636,7 @@ /obj/item/wrench, /obj/item/crowbar, /obj/item/clothing/mask/gas, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/port2) "dtN" = ( @@ -46611,7 +43657,7 @@ }, /area/station/maintenance/port) "dtQ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) @@ -46630,20 +43676,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "dtY" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/station/command/office/rd) "dtZ" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 1; @@ -46657,17 +43697,9 @@ /area/station/command/office/rd) "dub" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/item/flashlight/lamp, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -46676,17 +43708,12 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/crew/roboticist, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "robodesk"; name = "Robotics Desk Shutters"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_x = 24; - pixel_y = 36 + pixel_x = 24 }, +/obj/machinery/light_switch, /obj/item/flash, /obj/item/flash, /obj/item/flash, @@ -46708,14 +43735,8 @@ /area/station/science/robotics) "duj" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/west, /obj/item/stack/sheet/plasteel{ amount = 10 }, @@ -46748,9 +43769,7 @@ }, /area/station/medical/surgery/secondary) "duC" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/stack/cable_coil/random{ pixel_x = 2 }, @@ -46772,11 +43791,7 @@ pixel_y = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -46823,12 +43838,8 @@ /area/station/maintenance/port2) "duV" = ( /obj/machinery/constructable_frame/machine_frame, -/obj/machinery/light/small, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/small/directional/north, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/port2) "duX" = ( @@ -46866,14 +43877,8 @@ /turf/simulated/floor/plating, /area/station/command/office/rd) "dvh" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -46920,10 +43925,7 @@ /obj/structure/mirror{ pixel_x = 32 }, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "dvr" = ( @@ -46990,18 +43992,11 @@ /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 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/science/server) "dwk" = ( @@ -47096,11 +44091,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/medical/virology/lab) "dwP" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -47145,11 +44136,7 @@ /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) "dxs" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, @@ -47313,9 +44300,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "dzb" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/library) "dzn" = ( @@ -47394,11 +44379,7 @@ dir = 8; network = list("Research","SS13") }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/item/cartridge/signal/toxins{ pixel_x = -6 }, @@ -47418,11 +44399,7 @@ }, /area/station/command/office/rd) "dzU" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -47467,9 +44444,7 @@ /obj/machinery/optable{ name = "Robotics Operating Table" }, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/item/storage/firstaid/machine, /obj/item/storage/firstaid/machine, /turf/simulated/floor/plasteel/white, @@ -47550,10 +44525,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -47582,7 +44554,7 @@ }, /area/station/science/server) "dBe" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, @@ -47608,11 +44580,7 @@ }, /area/station/science/server) "dBj" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -47733,11 +44701,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dBX" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -47774,13 +44738,10 @@ pixel_y = 4; pixel_x = 4 }, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = 32 - }, -/obj/machinery/door_control{ +/obj/structure/reagent_dispensers/virusfood/east, +/obj/machinery/door_control/shutter/south{ id = "Virology1"; - name = "Virology Window Shutters Control"; - pixel_y = -24 + name = "Virology Window Shutters Control" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -47849,9 +44810,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) "dCJ" = ( @@ -47893,7 +44852,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dCW" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -47909,7 +44868,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dCX" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -47926,24 +44885,18 @@ /area/station/hallway/primary/aft) "dCZ" = ( /obj/structure/rack, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/electrical, /obj/item/screwdriver, /obj/item/multitool, /obj/item/clothing/head/welding, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "dDa" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48031,7 +44984,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "dDj" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48269,11 +45222,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "dEH" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -48297,9 +45246,7 @@ /area/station/maintenance/apmaint) "dET" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/crowbar{ pixel_y = 5 }, @@ -48310,10 +45257,7 @@ /area/station/bridge/checkpoint/south) "dEU" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/item/radio{ pixel_x = -14; pixel_y = 7 @@ -48337,16 +45281,10 @@ }, /area/station/bridge/checkpoint/south) "dEW" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/closet/secure_closet, /obj/item/storage/secure/briefcase, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "blue" @@ -48404,10 +45342,7 @@ pixel_x = 5; pixel_y = 6 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/bridge/checkpoint/south) @@ -48421,9 +45356,7 @@ }, /area/station/medical/medbay) "dFe" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -48454,9 +45387,7 @@ }, /area/station/security/permabrig) "dFi" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/engine, /area/station/engineering/controlroom) "dFm" = ( @@ -48478,9 +45409,7 @@ /obj/machinery/computer/med_data{ dir = 4 }, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" @@ -48510,36 +45439,30 @@ /area/station/science/robotics) "dFx" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "ShuttleKPP"; name = "Privacy Shuttes Control"; pixel_x = 6; pixel_y = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control{ id = "KPPNorth"; - name = "North Checkpoint Bolts"; - normaldoorcontrol = 1; pixel_x = -6; pixel_y = 8; - req_one_access_txt = "19"; - specialfunctions = 4 + req_one_access_txt = "19" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "EscapeLockdown"; name = "Escape Shuttle Lockdown Control"; pixel_x = 6; pixel_y = -2; req_one_access_txt = "19" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control{ id = "KPPSouth"; - name = "South Checkpoint Bolts"; - normaldoorcontrol = 1; pixel_x = -6; pixel_y = -2; - req_one_access_txt = "19"; - specialfunctions = 4 + req_one_access_txt = "19" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -48548,9 +45471,7 @@ /area/station/bridge/checkpoint/south) "dFy" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/retractor, /obj/item/hemostat, /obj/item/bonesetter, @@ -48589,11 +45510,7 @@ /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) "dFW" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -48643,11 +45560,7 @@ /obj/machinery/computer/card{ 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 = "blue" @@ -48665,22 +45578,14 @@ }, /area/station/bridge/checkpoint/south) "dGn" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/closet/secure_closet/roboticist, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "dGL" = ( @@ -48695,9 +45600,7 @@ /obj/machinery/computer/crew{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" @@ -48800,18 +45703,12 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dHN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 10; @@ -48820,11 +45717,7 @@ /area/station/bridge/checkpoint/south) "dHQ" = ( /obj/structure/filingcabinet/security, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "blue" @@ -48865,17 +45758,13 @@ /turf/simulated/floor/plating, /area/station/security/storage) "dHV" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/bridge/checkpoint/south) "dHZ" = ( @@ -48889,9 +45778,7 @@ /area/station/medical/medbay) "dIb" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -49144,10 +46031,7 @@ /area/station/security/armory/secure) "dJM" = ( /obj/structure/closet/secure_closet/medical3, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -49155,22 +46039,12 @@ /area/station/medical/storage) "dKd" = ( /obj/structure/table, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dKe" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -49187,16 +46061,12 @@ /area/station/service/chapel) "dKg" = ( /obj/structure/bookcase, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dKh" = ( /obj/structure/table/wood, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dKi" = ( @@ -49205,19 +46075,13 @@ /area/station/service/chapel) "dKk" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dKl" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dKm" = ( @@ -49349,9 +46213,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dKP" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/transparent/glass/reinforced, /area/station/hallway/secondary/exit) "dKQ" = ( @@ -49388,11 +46250,7 @@ /area/station/maintenance/apmaint) "dLp" = ( /obj/structure/table, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dLq" = ( @@ -49467,9 +46325,7 @@ /obj/machinery/atmospherics/portable/canister/oxygen{ anchored = 1 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -49534,10 +46390,9 @@ }, /area/station/hallway/secondary/exit) "dMp" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Bar"; - name = "Bar Privacy Shutters Control"; - pixel_x = 25 + name = "Bar Privacy Shutters Control" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -49586,14 +46441,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dMS" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/alarm/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dMT" = ( @@ -49620,12 +46469,8 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" @@ -49727,10 +46572,7 @@ /area/station/hallway/secondary/exit) "dNR" = ( /obj/machinery/computer/crew, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/north, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "dNS" = ( @@ -49761,9 +46603,7 @@ }, /area/station/medical/virology) "dOn" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -49771,11 +46611,7 @@ }, /area/station/maintenance/apmaint) "dOq" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "chapel" @@ -49787,11 +46623,7 @@ }, /area/station/service/chapel) "dOt" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "chapel" }, @@ -49812,9 +46644,7 @@ }, /area/station/science/toxins/mixing) "dOB" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/closet/fireaxecabinet{ pixel_x = 30 }, @@ -49898,9 +46728,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dOV" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "chapel" @@ -49921,9 +46749,7 @@ }, /area/station/service/chapel) "dOZ" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "chapel" @@ -49934,9 +46760,7 @@ cover_color = "#68452a"; dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/sign/poster/random{ pixel_x = -32 }, @@ -49992,7 +46816,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dPt" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -50159,11 +46983,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dPD" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -50196,9 +47016,7 @@ pixel_y = 12 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood{ icon_state = "wood-broken3" }, @@ -50217,9 +47035,7 @@ /area/station/maintenance/portsolar) "dQa" = ( /obj/machinery/power/smes, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -50239,11 +47055,7 @@ /area/station/maintenance/apmaint) "dQd" = ( /obj/machinery/chem_heater, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/engine, /area/station/science/explab) "dQe" = ( @@ -50261,10 +47073,9 @@ id_tag = "evashutters2"; name = "E.V.A. Storage Shutters" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "evashutters2"; - name = "Auxilary E.V.A. Storage"; - pixel_x = 26 + name = "Auxilary E.V.A. Storage" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -50287,17 +47098,11 @@ /area/station/maintenance/apmaint) "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" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Cremator"; dir = 8 @@ -50355,11 +47160,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "dQr" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -50422,20 +47223,14 @@ /area/station/maintenance/apmaint) "dQP" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dQR" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/folder/yellow, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dQS" = ( @@ -50452,10 +47247,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dQV" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "chapel" @@ -50533,11 +47325,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, @@ -50553,19 +47341,12 @@ /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/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/station/maintenance/portsolar) "dRq" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plating, @@ -50580,29 +47361,19 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/breath, /obj/item/reagent_containers/food/drinks/coffee, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "dRt" = ( /obj/structure/morgue, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dRv" = ( /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dRw" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/machinery/camera{ c_tag = "Chapel South"; dir = 1 @@ -50698,20 +47469,11 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dRR" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/wood, /area/station/service/theatre) "dRT" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump Engineering"; - pixel_y = 24 - }, +/obj/machinery/power/apc/engie/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -50801,15 +47563,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "dSf" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/chair/wood{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dSh" = ( @@ -50823,24 +47581,16 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dSj" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on, /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" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dSn" = ( @@ -50918,11 +47668,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "dSB" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "green" }, @@ -50930,7 +47676,7 @@ "dSC" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "dSD" = ( @@ -50972,18 +47718,11 @@ /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dSJ" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) @@ -50998,11 +47737,7 @@ /area/station/service/chapel/office) "dSN" = ( /obj/item/kirbyplants, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) "dSO" = ( @@ -51068,10 +47803,7 @@ /area/station/maintenance/apmaint) "dSY" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -51106,9 +47838,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "dTj" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -51123,25 +47853,15 @@ "dTm" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dTo" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -51157,28 +47877,16 @@ /area/station/service/chapel/office) "dTq" = ( /obj/structure/table/wood, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/status_display/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/lighter/zippo/black, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dTr" = ( /obj/machinery/disposal, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/light_switch/west, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -51228,13 +47936,9 @@ pixel_x = 24; pixel_y = 6 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/east{ id = "ExitPrivate"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - pixel_y = -6; - specialfunctions = 4 + pixel_y = -6 }, /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) @@ -51334,11 +48038,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) "dUp" = ( @@ -51492,10 +48192,7 @@ /turf/simulated/floor/plating/airless, /area/station/engineering/control) "dUJ" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/dresser, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) @@ -51524,16 +48221,8 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) "dUN" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/south, +/obj/machinery/light_switch/east, /obj/structure/closet/secure_closet/chaplain, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) @@ -51541,11 +48230,7 @@ /obj/structure/table/wood, /obj/item/clipboard, /obj/item/toy/figure/crew/chaplain, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dUP" = ( @@ -51556,19 +48241,13 @@ /area/station/service/chapel/office) "dUQ" = ( /obj/structure/table/wood, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/storage/fancy/candle_box/full{ pixel_x = 2; pixel_y = 3 }, /obj/item/storage/fancy/candle_box/full, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/service/chapel/office) "dUR" = ( @@ -51580,9 +48259,7 @@ /area/station/service/chapel/office) "dUS" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -51602,9 +48279,7 @@ /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) "dVc" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/kirbyplants, /obj/structure/sign/poster/random{ pixel_y = -32 @@ -51799,9 +48474,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "dWj" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/north, /obj/structure/cable{ d1 = 4; @@ -51856,7 +48529,7 @@ /area/station/science/xenobiology) "dWr" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "xeno1"; name = "Containment Control"; req_access_txt = "55" @@ -51864,34 +48537,26 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "custom placement"; - pixel_x = 25; - pixel_y = -30 - }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = 24 + }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "dWs" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - name = "custom placement"; - pixel_x = -25; - pixel_y = -30 - }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = -24 + }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "dWt" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/effect/decal/warning_stripes/yellow, /obj/structure/cable{ d1 = 4; @@ -51901,11 +48566,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "dWu" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/cable{ d1 = 1; @@ -51916,24 +48577,17 @@ /area/station/science/xenobiology) "dWv" = ( /obj/structure/table, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/crowbar, /obj/item/wrench, /obj/item/clothing/mask/gas, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "dWw" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/contraband/random/west, /obj/structure/chair/stool/bar{ dir = 1 }, @@ -51954,9 +48608,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) "dWC" = ( @@ -52044,12 +48696,8 @@ }, /area/station/bridge/checkpoint/south) "dXk" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/light/directional/east, +/obj/machinery/ai_status_display/west, /obj/machinery/camera{ c_tag = "Research Director's Bedroom"; dir = 4; @@ -52117,10 +48765,7 @@ network = list("Research","SS13"); pixel_y = -22 }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -52139,11 +48784,7 @@ }, /area/station/service/chapel) "dXC" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/machinery/camera{ c_tag = "Departure Lounge North" }, @@ -52164,10 +48805,7 @@ /obj/machinery/camera{ c_tag = "Port Aft Solars" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -52215,9 +48853,7 @@ "dYj" = ( /obj/effect/decal/warning_stripes/southwest, /obj/machinery/chem_dispenser, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_y = -32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/south, /obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -52251,7 +48887,7 @@ /turf/simulated/floor/plasteel/white, /area/station/maintenance/port2) "dYq" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port2) @@ -52467,11 +49103,7 @@ "dYV" = ( /obj/structure/rack, /obj/item/storage/secure/briefcase, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "dYX" = ( @@ -52627,17 +49259,12 @@ /area/station/command/office/cmo) "eak" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "eas" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -52645,11 +49272,7 @@ /area/station/science/break_room) "eav" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "eax" = ( @@ -52720,13 +49343,12 @@ pixel_x = 6; pixel_y = -25 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "ToxinsVenting"; name = "Toxin Venting Control"; - pixel_x = -8; - pixel_y = -26 + pixel_x = -8 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -53066,21 +49688,15 @@ "eip" = ( /obj/structure/bed, /obj/item/bedsheet/clown, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/station/service/clown) "eir" = ( /obj/machinery/economy/vending/cart, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "eiA" = ( @@ -53098,10 +49714,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/library) "eiR" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -53154,11 +49767,7 @@ }, /area/station/medical/virology/lab) "ejr" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -53466,26 +50075,16 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/door_control{ - id = "DormToilet1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4; - pixel_y = -24 +/obj/machinery/door_control/bolt_control/south{ + id = "DormToilet1" }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, /area/station/public/toilet) "eqp" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -53520,13 +50119,8 @@ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -53561,10 +50155,7 @@ /area/station/engineering/aitransit) "esa" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -53612,9 +50203,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "esH" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/glasses/science{ @@ -53675,16 +50264,8 @@ /obj/structure/table/glass, /obj/item/storage/toolbox/emergency, /obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/machinery/light_switch/east, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -53788,11 +50369,7 @@ /area/station/medical/storage) "ewd" = ( /obj/machinery/photocopier, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -53878,9 +50455,7 @@ }, /area/station/maintenance/apmaint) "exE" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -53941,11 +50516,7 @@ /obj/machinery/camera{ c_tag = "Arcade" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -54018,20 +50589,14 @@ "ezp" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "ezM" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/crew/chef, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -54127,9 +50692,7 @@ }, /area/station/medical/medbay2) "eCj" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/effect/decal/warning_stripes/east, /obj/machinery/camera{ c_tag = "Arrivals Port Fore"; @@ -54149,14 +50712,8 @@ /obj/effect/turf_decal{ dir = 5 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel/white, /area/station/science/storage) "eDh" = ( @@ -54171,11 +50728,7 @@ /area/station/hallway/primary/central/nw) "eEd" = ( /obj/effect/decal/warning_stripes/south, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -54363,16 +50916,13 @@ /obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/camera{ c_tag = "Medbay Cryo"; network = list("Medbay","SS13"); dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -54393,9 +50943,7 @@ }, /area/station/public/storage/tools) "eIJ" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -54414,11 +50962,7 @@ }, /area/station/maintenance/starboard) "eJn" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/transit_tube{ dir = 8; @@ -54438,14 +50982,8 @@ /area/station/maintenance/abandoned_garden) "eJM" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/alarm/directional/east, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -54605,22 +51143,13 @@ }, /area/station/public/fitness) "eLJ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/light_switch/west, /obj/machinery/computer/area_atmos, /turf/simulated/floor/plasteel, /area/station/science/storage) "eMw" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, @@ -54719,11 +51248,7 @@ /obj/item/hand_labeler{ pixel_y = 8 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/item/roller, /turf/simulated/floor/plasteel{ dir = 5; @@ -54742,9 +51267,7 @@ "ePr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -54780,9 +51303,7 @@ "eQc" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "eQe" = ( @@ -54828,10 +51349,7 @@ /area/station/maintenance/fore2) "eQv" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "eQC" = ( @@ -54979,10 +51497,7 @@ "eTh" = ( /obj/structure/bed/psych, /obj/random/therapy, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood, /area/station/medical/psych) "eTq" = ( @@ -55116,14 +51631,8 @@ /area/station/service/library) "eWX" = ( /obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /obj/item/clipboard, /obj/item/toy/figure/crew/warden, /turf/simulated/floor/plasteel{ @@ -55216,11 +51725,7 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -55366,27 +51871,17 @@ }, /area/station/medical/paramedic) "fdI" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/table/reinforced, /obj/item/flashlight/lamp, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/execution) "fen" = ( /obj/item/kirbyplants, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/wood{ icon_state = "wood-broken6" }, @@ -55406,10 +51901,7 @@ /obj/item/storage/belt/utility, /obj/item/weldingtool, /obj/item/clothing/head/welding, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -55549,7 +52041,7 @@ }, /area/station/maintenance/turbine) "fgB" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "fgE" = ( @@ -55671,9 +52163,7 @@ /area/station/public/fitness) "fiI" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -55732,9 +52222,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "fjW" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/beach/away/water/deep/dense{ density = 0; water_overlay_image = null @@ -55796,11 +52284,7 @@ }, /area/station/telecomms/chamber) "fmE" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -55816,9 +52300,7 @@ /obj/machinery/bodyscanner{ dir = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -55842,11 +52324,7 @@ /area/station/maintenance/starboard) "fnt" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/grass, /area/station/service/hydroponics) "fnz" = ( @@ -55909,11 +52387,10 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "fox" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; pixel_x = 7; - pixel_y = -28; req_access_txt = "3" }, /obj/structure/rack, @@ -55921,11 +52398,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "foX" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -55952,10 +52425,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -55986,10 +52456,7 @@ /obj/item/fish_eggs/salmon, /obj/item/fish_eggs/shrimp, /obj/item/fish_eggs/shrimp, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "fqo" = ( @@ -56130,9 +52597,7 @@ }, /area/station/service/theatre) "frI" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -56471,11 +52936,7 @@ /area/station/maintenance/starboard2) "fyS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, @@ -56584,9 +53045,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "fBl" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/directional/south{ + cell_type = 15000 }, /obj/structure/cable{ d2 = 4; @@ -56677,22 +53137,14 @@ /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "fDk" = ( /obj/structure/chair/comfy/teal{ dir = 8 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/camera{ c_tag = "Medbay Hallway South"; dir = 1 @@ -56710,9 +53162,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "fDS" = ( @@ -56736,9 +53186,7 @@ "fEi" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/plantgenes, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "fEo" = ( @@ -56848,10 +53296,9 @@ "fFX" = ( /obj/effect/decal/warning_stripes/southeast, /obj/machinery/disposal, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "chemdesk"; - name = "Primary Chemistry Shutters"; - pixel_y = -24 + name = "Primary Chemistry Shutters" }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -56861,12 +53308,8 @@ "fGc" = ( /obj/item/clothing/mask/gas, /obj/effect/landmark/damageturf, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/east, +/obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -56952,8 +53395,7 @@ /obj/item/kirbyplants{ pixel_y = 12 }, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /turf/simulated/floor/plating, @@ -57087,9 +53529,7 @@ /area/station/medical/sleeper) "fLP" = ( /obj/structure/flora/ausbushes, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "fLZ" = ( @@ -57127,22 +53567,15 @@ }, /area/station/maintenance/starboard) "fMU" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/station/hallway/primary/central/west) "fMW" = ( -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -57254,11 +53687,7 @@ "fOy" = ( /obj/item/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "fOB" = ( @@ -57269,11 +53698,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" @@ -57349,9 +53774,7 @@ /area/station/hallway/primary/fore) "fPC" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -57509,10 +53932,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) "fRl" = ( @@ -57590,11 +54010,7 @@ /area/station/hallway/secondary/bridge) "fRQ" = ( /obj/machinery/economy/vending/coffee, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "fSa" = ( @@ -57633,16 +54049,8 @@ /obj/structure/table/reinforced, /obj/item/stack/sheet/plasteel, /obj/item/wrench, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light_switch/south, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/stack/sheet/mineral/plasma{ amount = 5 @@ -57849,11 +54257,7 @@ pixel_y = 5; pixel_x = 5 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteyellow" }, @@ -57905,11 +54309,7 @@ /area/station/maintenance/fore) "fXb" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/carpet, /area/station/medical/psych) "fXR" = ( @@ -57970,11 +54370,7 @@ }, /area/station/maintenance/old_kitchen) "fZu" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -57997,9 +54393,7 @@ pixel_y = 5 }, /obj/item/storage/box/matches, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/sign/barsign{ pixel_y = 32 }, @@ -58019,10 +54413,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -58073,10 +54464,7 @@ }, /area/station/medical/virology) "gaZ" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -58123,7 +54511,7 @@ "gbO" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -58138,11 +54526,7 @@ /obj/machinery/computer/atmoscontrol{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -58210,9 +54594,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "gfF" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gfN" = ( @@ -58332,9 +54714,7 @@ /area/station/hallway/primary/aft) "ghP" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/stack/sheet/mineral/plasma{ amount = 30 @@ -58344,11 +54724,7 @@ pixel_x = -1; pixel_y = -1 }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -58681,10 +55057,7 @@ /area/station/science/toxins/mixing) "gpy" = ( /obj/item/kirbyplants, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "gpC" = ( @@ -58773,16 +55146,9 @@ /obj/structure/table, /obj/item/flash, /obj/item/restraints/handcuffs, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/firealarm/directional/north, +/obj/structure/sign/poster/official/random/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -58897,9 +55263,7 @@ }, /area/station/command/office/cmo) "gty" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -59177,11 +55541,7 @@ /area/station/engineering/engine/supermatter) "gwZ" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -59247,7 +55607,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "gyp" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -59424,7 +55784,7 @@ "gCv" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "gCG" = ( @@ -59467,10 +55827,7 @@ }, /area/station/medical/cryo) "gDm" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -59543,7 +55900,7 @@ /turf/simulated/floor/wood/fancy/light, /area/station/service/theatre) "gEs" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -59592,17 +55949,13 @@ }, /area/station/hallway/primary/central/north) "gFX" = ( -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/starboard) "gGq" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -59642,13 +55995,7 @@ /obj/effect/turf_decal{ dir = 6 }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "east bump Engineering"; - pixel_x = 24; - shock_proof = 1 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -59670,18 +56017,15 @@ pixel_x = 24; pixel_y = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Biohazard_medi"; name = "Emergency Medbay Quarantine"; - pixel_x = 24; pixel_y = -8; color = "yellow" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal/east{ id = "CMO"; name = "Office Door"; - normaldoorcontrol = 1; - pixel_x = 24; req_access_txt = "40" }, /obj/item/cartridge/chemistry{ @@ -59904,11 +56248,7 @@ dir = 8 }, /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{ dir = 4; icon_state = "green" @@ -59919,7 +56259,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/atmos) "gMM" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -59931,9 +56271,7 @@ "gMW" = ( /obj/effect/decal/cleanable/flour, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -59955,15 +56293,8 @@ color = "#A30FAF"; dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, +/obj/machinery/newscaster/directional/south, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -60253,12 +56584,8 @@ /obj/item/pen{ pixel_y = 6 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -60335,11 +56662,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gUi" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -60397,9 +56720,7 @@ }, /area/station/public/toilet) "gVE" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/economy/vending/chinese, /turf/simulated/floor/plasteel{ dir = 1; @@ -60419,10 +56740,7 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "gVG" = ( @@ -60445,11 +56763,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "gWj" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -60476,9 +56790,7 @@ dir = 4; pixel_y = -22 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/service/theatre) "gWP" = ( @@ -60510,11 +56822,7 @@ /turf/simulated/wall, /area/station/medical/cryo) "gXY" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -60572,15 +56880,9 @@ /area/station/medical/medbay2) "gYK" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/effect/decal/warning_stripes/west, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "gYQ" = ( @@ -60615,9 +56917,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "haa" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -60638,9 +56938,7 @@ }, /area/station/medical/virology) "hap" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -60655,9 +56953,7 @@ /area/station/maintenance/apmaint) "haD" = ( /obj/effect/landmark/start/security_officer, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -60673,10 +56969,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "hbv" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -60719,11 +57012,7 @@ /obj/structure/chair/stool{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -60872,24 +57161,14 @@ /area/station/science/xenobiology) "hfk" = ( /obj/machinery/economy/vending/security, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, /area/station/security/main) "hfm" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/west, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -60961,9 +57240,7 @@ /obj/structure/transit_tube_pod{ dir = 8 }, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -60987,7 +57264,7 @@ /obj/item/pen{ pixel_y = 6 }, -/obj/machinery/light{ +/obj/machinery/light/directional/north{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -61160,11 +57437,7 @@ /area/station/medical/chemistry) "hjN" = ( /obj/structure/closet/secure_closet/medical2, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -61222,10 +57495,7 @@ /area/station/engineering/hardsuitstorage) "hkA" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/fore2) @@ -61318,9 +57588,7 @@ /area/station/maintenance/starboardsolar) "hpH" = ( /obj/machinery/fishtank/tank, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/beach/sand, /area/station/maintenance/fsmaint) "hpS" = ( @@ -61328,9 +57596,7 @@ dir = 4 }, /obj/machinery/disposal, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/wood, /area/station/service/theatre) "hpX" = ( @@ -61392,10 +57658,7 @@ /area/station/service/chapel/office) "hqR" = ( /obj/machinery/photocopier, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/wood, /area/station/medical/psych) "hqT" = ( @@ -61407,9 +57670,7 @@ /area/station/hallway/secondary/exit/maintenance) "hrB" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61450,10 +57711,8 @@ }, /area/station/medical/break_room) "hsa" = ( -/obj/machinery/light/small, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/contraband/random/south, /obj/machinery/economy/vending/boozeomat, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) @@ -61568,11 +57827,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -61604,12 +57859,8 @@ /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "hvE" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/structure/sign/poster/official/random/east, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit/maintenance) "hvJ" = ( @@ -61717,10 +57968,7 @@ }, /area/station/hallway/primary/central) "hxB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -61743,10 +57991,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "hxL" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -61778,16 +58023,13 @@ pixel_x = 32; pixel_y = 7 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "justice_blast"; name = "Space Vent"; - pixel_x = 32; req_access_txt = "2" }, /obj/structure/closet/secure_closet/injection, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61867,10 +58109,7 @@ /obj/machinery/camera{ c_tag = "Kitchen Backroom" }, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "hAj" = ( @@ -61896,12 +58135,7 @@ pixel_x = 7; pixel_y = 3 }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -62069,9 +58303,7 @@ "hDH" = ( /obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/mineral/tranquillite, /area/station/maintenance/starboard2) "hDS" = ( @@ -62218,10 +58450,7 @@ /area/station/engineering/controlroom) "hGN" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/machinery/camera{ c_tag = "Restrooms" }, @@ -62283,9 +58512,7 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "hHr" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/station/supply/storage) @@ -62300,10 +58527,7 @@ /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "hHy" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /obj/effect/landmark/start/doctor, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -62340,10 +58564,7 @@ /turf/simulated/floor/plating, /area/station/security/checkpoint/south) "hIj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/carpet, /area/station/medical/psych) @@ -62522,9 +58743,7 @@ /area/station/engineering/atmos) "hKW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/freezer, /area/station/public/toilet) "hLe" = ( @@ -62611,12 +58830,7 @@ c_tag = "Research Toxin Mixing"; network = list("Research","SS13") }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump Engineering"; - pixel_y = 24 - }, +/obj/machinery/power/apc/engie/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -62709,7 +58923,7 @@ color = "#A30FAF"; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -62724,11 +58938,7 @@ pixel_y = 4; pixel_x = 8 }, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -62773,16 +58983,11 @@ /area/station/maintenance/starboard2) "hPI" = ( /obj/machinery/economy/vending/medical, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ nightshift_allowed = 0; nightshift_enabled = 1 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62796,11 +59001,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "hQe" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -62930,9 +59131,7 @@ }, /area/station/service/janitor) "hTj" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" @@ -63147,10 +59346,8 @@ }, /obj/structure/morgue, /obj/effect/landmark/spawner/rev, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/machinery/light/small, +/obj/structure/sign/poster/official/random/south, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -63166,9 +59363,7 @@ }, /area/station/medical/morgue) "hWh" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/grille{ density = 0; icon_state = "brokengrille" @@ -63188,9 +59383,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "hWp" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/east, /obj/structure/cable/yellow{ d1 = 1; @@ -63322,11 +59515,7 @@ }, /area/station/engineering/controlroom) "iaD" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) @@ -63341,9 +59530,7 @@ /obj/machinery/atmospherics/binary/pump{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/access_button{ autolink_id = "turbine_btn_ext"; name = "Gas Turbine Access Button"; @@ -63415,11 +59602,7 @@ /area/station/security/armory/secure) "ici" = ( /obj/machinery/economy/vending/tool, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -63648,9 +59831,7 @@ icon_state = "1-2" }, /obj/effect/spawner/random_spawners/oil_maybe, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ifv" = ( @@ -63671,11 +59852,7 @@ "ifQ" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/crate/freezer, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -63846,18 +60023,14 @@ }, /area/station/hallway/secondary/bridge) "iig" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/service/bar/atrium) "iil" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/table/reinforced, /obj/item/storage/box/bodybags, /turf/simulated/floor/plasteel{ @@ -64040,10 +60213,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "imx" = ( @@ -64056,11 +60226,8 @@ "imN" = ( /obj/structure/closet/crate/freezer/iv_storage, /obj/effect/decal/warning_stripes/blue/hollow, -/obj/machinery/light, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64292,11 +60459,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -64306,11 +60469,7 @@ /turf/simulated/wall, /area/station/maintenance/abandonedbar) "iru" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -64344,9 +60503,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "isQ" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -64367,9 +60524,7 @@ dir = 1; network = list("Medical","SS13") }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -64624,13 +60779,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "ixV" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -64712,10 +60866,7 @@ }, /area/station/engineering/controlroom) "iyF" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -64774,7 +60925,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "iAD" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64899,9 +61050,7 @@ /area/station/engineering/control) "iCY" = ( /obj/machinery/hydroponics/soil, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "iDa" = ( @@ -64927,11 +61076,7 @@ dir = 4; network = list("SS13","Engineering") }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -64942,9 +61087,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/captain) "iEw" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -65389,10 +61532,9 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "detprivacy"; - name = "Detective Privacy Shutters Control"; - pixel_y = -24 + name = "Detective Privacy Shutters Control" }, /turf/simulated/floor/plating, /area/station/maintenance/old_detective) @@ -65483,9 +61625,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "iPQ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, @@ -65504,7 +61644,7 @@ /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "iQv" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -65712,9 +61852,7 @@ "iUa" = ( /obj/machinery/economy/vending/tool/free, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/control) "iUc" = ( @@ -65770,9 +61908,7 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/janitor, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "purple" @@ -65783,9 +61919,7 @@ c_tag = "Expedition"; dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -65800,11 +61934,7 @@ }, /area/station/public/fitness) "iVi" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -65832,14 +61962,10 @@ /obj/item/stack/cable_coil, /obj/item/airlock_electronics, /obj/item/airlock_electronics, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/airlock_electronics, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "iVJ" = ( @@ -65879,9 +62005,7 @@ /turf/simulated/wall, /area/station/maintenance/library) "iWz" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/sign/fire{ pixel_x = 32 }, @@ -65907,9 +62031,7 @@ /area/station/hallway/secondary/entry) "iWV" = ( /obj/effect/spawner/lootdrop/trash, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -66084,11 +62206,7 @@ }, /area/station/service/barber) "jbW" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -66172,15 +62290,8 @@ /area/station/maintenance/fore) "jfy" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/item/radio/intercom/directional/south, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -26 }, @@ -66251,11 +62362,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "jgE" = ( @@ -66274,10 +62381,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jhp" = ( -/obj/machinery/light, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -66401,10 +62506,7 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "jjp" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -66441,10 +62543,8 @@ /area/station/maintenance/electrical) "jjN" = ( /obj/machinery/recharge_station, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, -/obj/machinery/light, +/obj/machinery/ai_status_display/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -66459,11 +62559,8 @@ /turf/simulated/wall, /area/station/public/fitness) "jku" = ( -/obj/machinery/light, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -66509,7 +62606,7 @@ }, /area/station/medical/medbay2) "jkD" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel) "jkM" = ( @@ -66626,22 +62723,14 @@ }, /area/station/maintenance/starboard2) "jmX" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/station/hallway/primary/fore) "jnp" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/simulated/floor/wood{ icon_state = "wood-broken" }, @@ -66723,11 +62812,7 @@ }, /area/station/security/permasolitary) "jou" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -66776,14 +62861,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "jqb" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/computer/scan_consolenew, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -66950,11 +63030,7 @@ /area/station/security/prison/cell_block) "jsE" = ( /obj/machinery/drone_fabricator, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -67335,9 +63411,7 @@ }, /area/station/medical/virology/lab) "jzI" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/sign/fire{ pixel_x = 32 }, @@ -67418,10 +63492,7 @@ /area/station/maintenance/old_kitchen) "jCz" = ( /obj/item/kirbyplants, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -67435,9 +63506,7 @@ }, /area/station/maintenance/starboard) "jCU" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -67536,8 +63605,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "jEH" = ( -/obj/machinery/door_control{ - pixel_x = 24; +/obj/machinery/door_control/shutter/east{ id = "unknowndoor" }, /turf/simulated/floor/plating, @@ -67701,9 +63769,7 @@ }, /area/station/medical/chemistry) "jIg" = ( -/obj/machinery/light_construct{ - dir = 4 - }, +/obj/machinery/light_construct/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -67758,9 +63824,7 @@ vent_link_id = "escape_vent" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "jJs" = ( @@ -67892,11 +63956,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" @@ -67967,10 +64027,7 @@ "jMo" = ( /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/item/clothing/glasses/meson, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -67995,14 +64052,10 @@ /turf/space, /area/space/nearstation) "jNg" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/economy/vending/cargodrobe, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -68122,9 +64175,7 @@ /turf/simulated/wall/r_wall, /area/station/security/storage) "jRf" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -68141,13 +64192,8 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/light/small/directional/south, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "jRG" = ( @@ -68181,10 +64227,7 @@ /area/station/maintenance/starboard2) "jSb" = ( /obj/structure/chair/sofa/left, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/landmark/start/virologist, /turf/simulated/floor/plasteel{ dir = 4; @@ -68240,10 +64283,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68283,11 +64323,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/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/white, @@ -68415,10 +64451,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) @@ -68469,10 +64502,7 @@ }, /area/station/security/brig) "jXC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/machinery/computer/sm_monitor{ dir = 1 @@ -68588,9 +64618,7 @@ }, /area/station/medical/surgery/secondary) "jZx" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood/fancy/light, /area/station/service/theatre) "jZz" = ( @@ -68610,9 +64638,7 @@ /area/station/hallway/primary/central/nw) "jZO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "jZR" = ( @@ -68688,17 +64714,13 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/station/maintenance/fore) "kaM" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/wood, /area/station/service/theatre) "kaN" = ( @@ -68718,13 +64740,9 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "kaP" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/table/wood, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -68810,11 +64828,7 @@ /turf/simulated/floor/carpet, /area/station/medical/psych) "kcj" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68847,31 +64861,16 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "kdm" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump Engineering"; - pixel_y = 24 - }, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/power/apc/engie/north, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "kdn" = ( /obj/structure/chair/sofa/left{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/theatre) "kdu" = ( @@ -68940,11 +64939,7 @@ }, /area/station/engineering/atmos/control) "keu" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -69015,11 +65010,7 @@ /area/station/maintenance/electrical) "kfU" = ( /obj/structure/chair/sofa/right, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -69230,9 +65221,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/gps/engineering, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -69334,11 +65323,7 @@ "kkR" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "kkX" = ( @@ -69381,9 +65366,7 @@ }, /area/station/medical/morgue) "klO" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -69416,9 +65399,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "kno" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/grille, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -69528,11 +65509,7 @@ /turf/simulated/wall, /area/station/maintenance/old_detective) "kpB" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "chapel" }, @@ -69559,7 +65536,7 @@ /turf/simulated/wall, /area/station/maintenance/old_kitchen) "kqp" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/engine, /area/station/engineering/controlroom) "kqF" = ( @@ -69572,10 +65549,7 @@ /obj/machinery/camera{ c_tag = "Escape Shuttle Command Point" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/station/bridge/checkpoint/south) @@ -69634,8 +65608,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "ksQ" = ( -/obj/machinery/door_control{ - pixel_x = -24; +/obj/machinery/door_control/shutter/west{ id = "restaurant"; name = "Restaurant Shutters control" }, @@ -69756,9 +65729,7 @@ }, /area/station/science/research) "kvR" = ( -/obj/structure/sink/kitchen{ - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /obj/effect/decal/cleanable/ants, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -69773,9 +65744,7 @@ }, /area/station/maintenance/abandoned_garden) "kwv" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -69786,9 +65755,7 @@ /area/station/science/explab) "kww" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "kwC" = ( @@ -69854,23 +65821,15 @@ /area/station/medical/virology) "kyg" = ( /obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/machinery/light/directional/south, /obj/item/paper/pamphlet/deltainfo, /turf/simulated/floor/plasteel{ icon_state = "barber" }, /area/station/service/barber) "kyq" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" }, @@ -69895,11 +65854,10 @@ dir = 1; name = "Medbay Reception" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/normal{ desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyerPort"; name = "Medbay Doors Control"; - normaldoorcontrol = 1; req_access = list(5) }, /obj/machinery/door/poddoor/preopen{ @@ -70225,11 +66183,7 @@ pixel_x = 6; pixel_y = 6 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -70337,10 +66291,7 @@ }, /area/station/science/explab) "kGM" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -70408,11 +66359,7 @@ /area/station/security/main) "kIs" = ( /obj/effect/decal/warning_stripes/south, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "kIL" = ( @@ -70441,7 +66388,7 @@ /area/station/maintenance/library) "kJd" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "kJN" = ( @@ -70550,7 +66497,7 @@ }, /area/station/security/prison/cell_block) "kMx" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -70630,11 +66577,7 @@ pixel_y = 6; pixel_x = 8 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "kNn" = ( @@ -70683,9 +66626,7 @@ /turf/simulated/floor/engine, /area/station/science/explab) "kNF" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/computer/monitor{ dir = 1; name = "Engineering Power Monitoring Console" @@ -70702,9 +66643,7 @@ }, /area/station/engineering/controlroom) "kNU" = ( -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/old_detective) "kOq" = ( @@ -70736,11 +66675,7 @@ /obj/item/scalpel{ pixel_y = 2 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -70803,9 +66738,7 @@ /area/station/supply/storage) "kPt" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "kPJ" = ( @@ -70859,10 +66792,7 @@ pixel_y = 4; pixel_x = 8 }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/camera{ c_tag = "Medbay Genetics"; network = list("Medbay","SS13") @@ -70908,10 +66838,7 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "kSQ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "green" @@ -71077,11 +67004,7 @@ }, /area/station/maintenance/starboard) "kVB" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -71101,9 +67024,7 @@ "kWa" = ( /obj/structure/table, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/item/storage/toolbox/emergency{ pixel_y = 2 }, @@ -71137,7 +67058,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kWF" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/engine, /area/station/science/test_chamber) "kWL" = ( @@ -71238,10 +67159,7 @@ /area/station/service/chapel) "kZe" = ( /obj/structure/closet/secure_closet/medical2, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 1; @@ -71306,11 +67224,7 @@ dir = 8 }, /obj/effect/landmark/spawner/rev, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkblue" @@ -71324,11 +67238,7 @@ }, /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/decal/warning_stripes/yellow, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "laV" = ( @@ -71482,22 +67392,14 @@ /obj/item/assembly/igniter{ pixel_y = -1 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" }, /area/station/science/explab) "ley" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel, /area/station/service/theatre) "leM" = ( @@ -71638,10 +67540,7 @@ /area/station/maintenance/starboard2) "lhu" = ( /obj/machinery/chem_master/condimaster, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "lhF" = ( @@ -71668,9 +67567,7 @@ }, /area/station/medical/virology) "lhN" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) "lhQ" = ( @@ -71688,27 +67585,17 @@ /area/station/hallway/primary/starboard) "lhR" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour{ pixel_x = 2; pixel_y = 2 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "lim" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -71722,7 +67609,7 @@ /turf/simulated/floor/engine, /area/station/science/test_chamber) "liC" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/economy/vending/snack, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -71809,10 +67696,7 @@ /area/station/science/break_room) "lkh" = ( /obj/structure/filingcabinet/chestdrawer/autopsy, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -71829,10 +67713,7 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -71932,9 +67813,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "llR" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -71982,7 +67861,7 @@ /area/station/service/chapel) "lmD" = ( /obj/structure/table/glass, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_y = 4; pixel_x = 12 @@ -72092,11 +67971,7 @@ /area/station/maintenance/old_detective) "loX" = ( /obj/structure/closet/secure_closet/security, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -72154,10 +68029,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) @@ -72215,9 +68087,7 @@ /area/station/science/robotics/showroom) "lsa" = ( /obj/machinery/icemachine, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -72240,7 +68110,7 @@ dir = 8 }, /obj/effect/landmark/spawner/rev, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -72328,9 +68198,7 @@ }, /area/station/science/toxins/mixing) "ltw" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -72422,19 +68290,11 @@ name = "Chief Medical Officer Requests Console"; pixel_x = 30 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /obj/machinery/computer/card/minor/cmo{ dir = 8 }, -/obj/machinery/keycard_auth{ - dir = 1; - pixel_y = -24; - pixel_x = -8 - }, +/obj/machinery/keycard_auth/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -72449,10 +68309,7 @@ /area/station/service/hydroponics) "lwj" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -72595,9 +68452,7 @@ "lxV" = ( /obj/structure/table/glass, /obj/item/book/manual/barman_recipes, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -72621,11 +68476,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -72649,7 +68500,7 @@ "lzg" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -72667,7 +68518,7 @@ /area/station/engineering/atmos/control) "lzG" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -72685,10 +68536,7 @@ }, /area/station/medical/virology/lab) "lAk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 6; @@ -72721,11 +68569,7 @@ }, /area/station/service/kitchen) "lAO" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lBf" = ( @@ -72816,10 +68660,7 @@ /area/station/medical/medbay) "lCu" = ( /obj/structure/table/reinforced, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -72914,11 +68755,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "lEt" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/item/kirbyplants, /obj/machinery/camera{ c_tag = "Chief Medical Officer's Office"; @@ -72937,9 +68774,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/locker) "lEL" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 6; @@ -72955,22 +68790,14 @@ /obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/station/medical/reception) "lEV" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, -/obj/machinery/light, +/obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "lFi" = ( @@ -73007,10 +68834,9 @@ id_tag = "paramedic"; name = "Paramedic Garage" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "paramedic"; name = "Garage Door Control"; - pixel_y = 24; req_access_txt = "66" }, /obj/machinery/door/poddoor/preopen{ @@ -73031,10 +68857,7 @@ /area/station/medical/medbay2) "lHr" = ( /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, @@ -73058,27 +68881,19 @@ pixel_y = 8 }, /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "lHI" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/station/maintenance/fore) "lHO" = ( /obj/effect/decal/cleanable/ants, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "lIc" = ( @@ -73131,25 +68946,17 @@ dir = 4 }, /obj/item/soap, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/structure/sink/directional/east, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/station/service/kitchen) "lIQ" = ( /obj/machinery/suit_storage_unit/clown, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/east{ id = "Clown"; - name = "Clowns Privacy Shutters Control"; - pixel_x = 26 + name = "Clowns Privacy Shutters Control" }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -73289,18 +69096,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "lMl" = ( /turf/simulated/floor/carpet/arcade, /area/station/maintenance/starboard) "lMs" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -73430,11 +69233,7 @@ }, /area/station/maintenance/fore) "lPy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/table/glass, /obj/item/folder/white{ pixel_y = 2; @@ -73515,10 +69314,7 @@ c_tag = "Medbay Treatment North"; network = list("Medbay","SS13") }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73548,9 +69344,7 @@ /obj/item/storage/box/cups{ pixel_y = 2 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -73610,9 +69404,7 @@ }, /area/station/medical/surgery/primary) "lQN" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/engine, /area/station/science/test_chamber) "lRb" = ( @@ -73665,9 +69457,7 @@ /area/station/security/brig) "lSa" = ( /obj/machinery/economy/arcade/claw, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "lSc" = ( @@ -73698,9 +69488,7 @@ /area/station/service/theatre) "lSE" = ( /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -74037,12 +69825,8 @@ }, /area/station/medical/cloning) "mbB" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/light_switch/south, +/obj/machinery/light/directional/north, /obj/machinery/button/windowtint{ dir = 8; id = "Chapel"; @@ -74158,11 +69942,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "mem" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -74195,10 +69975,7 @@ dir = 9; color = "lightblue" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 6; @@ -74290,10 +70067,8 @@ /area/station/maintenance/electrical) "mgx" = ( /obj/machinery/suit_storage_unit/cmo/secure/sec_storage, -/obj/machinery/light, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -74339,20 +70114,14 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/station/maintenance/fore) "mhU" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -74423,9 +70192,7 @@ /obj/item/clothing/accessory/stethoscope{ pixel_y = 9 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; name = "Quarantine Lockdown" @@ -74501,16 +70268,11 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "mkY" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/economy/vending/security, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) @@ -74566,11 +70328,7 @@ /area/station/security/main) "mmx" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -74619,9 +70377,7 @@ dir = 8 }, /obj/effect/landmark/spawner/rev, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -74636,9 +70392,7 @@ }, /area/station/engineering/atmos/control) "mmV" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/airlock_controller/air_cycler{ ext_button_link_id = "perma_btn_ext"; ext_door_link_id = "perma_door_ext"; @@ -74659,9 +70413,7 @@ /obj/item/reagent_containers/food/snacks/candy/cotton/pink, /obj/item/reagent_containers/food/snacks/candy/cotton/rainbow, /obj/item/reagent_containers/food/snacks/candy/cotton/yellow, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -74693,10 +70445,7 @@ }, /area/station/maintenance/aft) "mnK" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -74716,9 +70465,7 @@ /area/station/security/main) "moT" = ( /obj/machinery/cryopod/right, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -74785,11 +70532,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "mqn" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; @@ -74801,10 +70544,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "mqr" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -74876,18 +70616,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood{ icon_state = "wood-broken3" }, /area/station/maintenance/starboard) "mqS" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) @@ -74934,11 +70669,7 @@ /turf/simulated/wall/r_wall, /area/station/medical/medbay2) "mrW" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -74983,11 +70714,7 @@ /obj/item/stack/sheet/metal{ amount = 10 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, @@ -75006,9 +70733,7 @@ "mtz" = ( /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -75050,9 +70775,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 9 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "mux" = ( @@ -75104,11 +70827,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "mwK" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -75177,9 +70896,7 @@ c_tag = "Brig - Head of Security's Quarters"; network = list("SS13","Security") }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/effect/landmark/start/head_of_security, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) @@ -75231,11 +70948,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit/maintenance) "mzt" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -75268,9 +70981,7 @@ /area/station/engineering/atmos) "mAp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "mAs" = ( @@ -75499,9 +71210,7 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "mEV" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/closet/walllocker/medlocker/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -75520,28 +71229,17 @@ /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "mFy" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "mGG" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "orangecorner" }, @@ -75616,9 +71314,7 @@ }, /area/station/science/genetics) "mLm" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -75636,10 +71332,7 @@ "mMm" = ( /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -75742,12 +71435,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump Engineering"; - pixel_y = 24 - }, +/obj/machinery/power/apc/engie/north, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "mPV" = ( @@ -75782,10 +71470,7 @@ anchored = 1 }, /obj/effect/decal/warning_stripes/blue, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -75842,18 +71527,17 @@ pixel_x = 8; pixel_y = -36 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "turbinevent"; name = "Turbine Vent Control"; pixel_x = -8; pixel_y = -36; req_access_txt = "12" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "auxincineratorvent"; name = "Auxiliary Vent Control"; - pixel_x = -8; - pixel_y = -24 + pixel_x = -8 }, /obj/machinery/computer/turbine_computer{ dir = 1; @@ -75866,9 +71550,7 @@ }, /area/station/maintenance/turbine) "mRk" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/machinery/camera{ c_tag = "Theatre North" }, @@ -75970,13 +71652,8 @@ }, /area/station/science/explab) "mSQ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/science/test_chamber) "mSZ" = ( @@ -76018,11 +71695,10 @@ id = "Cell 3"; pixel_y = 25 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "cell3lockdown"; name = "Cell Lockdown"; - pixel_y = 32; req_access_txt = "2" }, /obj/effect/decal/warning_stripes/east, @@ -76083,13 +71759,9 @@ /area/station/medical/reception) "mUr" = ( /obj/structure/table/wood, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/book/random, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/carpet, /area/station/service/theatre) "mUU" = ( @@ -76231,11 +71903,7 @@ }, /area/station/maintenance/starboard2) "mYH" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -76258,14 +71926,8 @@ dir = 8 }, /mob/living/simple_animal/hostile/retaliate/goat/chef, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -76377,15 +72039,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "naD" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/computer/atmos_alert{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "caution" }, @@ -76431,9 +72089,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "nbk" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -76502,23 +72158,16 @@ /area/station/science/research) "nct" = ( /obj/machinery/constructable_frame/machine_frame, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "ncG" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -76552,11 +72201,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ndr" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/old_detective) "ndD" = ( @@ -76838,11 +72483,7 @@ /turf/space, /area/space) "nho" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -76921,9 +72562,7 @@ }, /area/station/maintenance/fore) "njE" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/washing_machine, /obj/machinery/camera{ c_tag = "Perma-Brig General Population East"; @@ -76985,10 +72624,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "nkp" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "nkB" = ( @@ -77014,7 +72650,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/service/theatre) "nli" = ( @@ -77081,20 +72717,14 @@ /turf/simulated/floor/wood, /area/station/maintenance/library) "nmw" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/machinery/economy/slot_machine, /turf/simulated/floor/wood, /area/station/command/meeting_room) "nmA" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/engine, /area/station/science/explab) "nmR" = ( @@ -77211,9 +72841,7 @@ /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "non" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -77246,11 +72874,7 @@ }, /obj/structure/table, /obj/machinery/recharger, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -77313,10 +72937,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) "npp" = ( @@ -77444,10 +73065,7 @@ }, /area/station/hallway/primary/fore) "ntt" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/economy/vending/chinese, /turf/simulated/floor/plasteel{ dir = 6; @@ -77475,12 +73093,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -77498,9 +73112,7 @@ }, /area/station/medical/cryo) "nui" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/sign/vacuum/external{ pixel_x = -32 }, @@ -77534,11 +73146,7 @@ "nvc" = ( /obj/structure/closet/secure_closet/hos, /obj/effect/decal/warning_stripes/west, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77546,11 +73154,7 @@ "nvd" = ( /obj/effect/decal/warning_stripes/yellow, /obj/structure/closet/crate/hydroponics/prespawned, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "nvh" = ( @@ -77803,7 +73407,7 @@ /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "nAv" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, /obj/item/flash, @@ -77880,9 +73484,7 @@ }, /area/station/command/office/rd) "nBa" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "nBc" = ( @@ -77971,11 +73573,7 @@ /area/station/hallway/secondary/bridge) "nBP" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -78032,7 +73630,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "nCK" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -78056,10 +73654,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "nDu" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -78103,10 +73698,7 @@ /area/station/service/hydroponics) "nEe" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -78127,14 +73719,8 @@ }, /area/station/science/genetics) "nEp" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/power/apc/directional/north, +/obj/machinery/light/directional/south, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -78179,9 +73765,7 @@ }, /area/station/maintenance/old_detective) "nFi" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fore) "nFk" = ( @@ -78206,7 +73790,7 @@ }, /area/station/service/expedition) "nFv" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -78230,13 +73814,9 @@ }, /area/station/security/execution) "nFL" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/smartfridge/drying_rack, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -78367,15 +73947,13 @@ initialized = 1; volume = 0 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/station/maintenance/aft) "nHS" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -78526,12 +74104,8 @@ }, /area/station/security/armory/secure) "nJE" = ( -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -78645,13 +74219,8 @@ /turf/simulated/floor/plating, /area/station/medical/break_room) "nLL" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -78883,9 +74452,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "nPi" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -78913,11 +74480,7 @@ /obj/item/storage/firstaid/o2{ pixel_y = 2 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -78930,7 +74493,7 @@ /area/station/medical/chemistry) "nQL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fore) "nQM" = ( @@ -79051,12 +74614,8 @@ }, /area/station/medical/virology/lab) "nTt" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light, +/obj/machinery/alarm/directional/south, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -79069,9 +74628,7 @@ c_tag = "Central Ring Hallway West"; dir = 8 }, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -79093,9 +74650,7 @@ /area/station/maintenance/apmaint) "nUc" = ( /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/spacecleanertank/west, /obj/item/storage/box/mousetraps, /obj/item/storage/box/mousetraps{ pixel_x = 2; @@ -79208,10 +74763,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/gps/engineering, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "nVz" = ( @@ -79351,9 +74903,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "nYh" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -79363,9 +74913,7 @@ /obj/structure/sign/radiation/rad_area{ pixel_x = -32 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/engineering/gravitygenerator) "nYw" = ( @@ -79374,11 +74922,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "nYz" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -79394,7 +74938,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "nZg" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -79403,10 +74947,7 @@ /obj/structure/chair/comfy/teal{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/effect/landmark/start/doctor, /turf/simulated/floor/plasteel{ @@ -79452,12 +74993,9 @@ }, /area/station/public/fitness) "oan" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/warning_stripes/south, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -79518,9 +75056,7 @@ pixel_x = 27; pixel_y = -26 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -79622,7 +75158,7 @@ /turf/space, /area/station/maintenance/starboardsolar) "odQ" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -79633,27 +75169,17 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" }, /area/station/security/checkpoint/south) "odU" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/closet/bombcloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -79694,9 +75220,7 @@ /obj/item/storage/toolbox/emergency/old{ pixel_y = 2 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oeP" = ( @@ -79765,11 +75289,7 @@ dir = 4; network = list("SS13","Security","Prison") }, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; @@ -79795,19 +75315,12 @@ pixel_y = 2 }, /obj/item/pen, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel/white, /area/station/science/explab) "ogZ" = ( /obj/structure/table, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/item/radio/alternative{ pixel_y = 12; pixel_x = -6 @@ -79885,11 +75398,7 @@ }, /area/station/science/xenobiology) "ohQ" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/screwdriver, @@ -79923,9 +75432,7 @@ }, /area/station/hallway/primary/fore) "oiz" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -79948,9 +75455,7 @@ "okf" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -80034,11 +75539,7 @@ }, /area/station/public/sleep) "olo" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -80083,11 +75584,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "omA" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -80355,9 +75852,7 @@ /area/station/engineering/controlroom) "oqq" = ( /obj/effect/decal/cleanable/dust, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -80529,10 +76024,7 @@ /area/station/maintenance/starboard2) "otH" = ( /obj/machinery/kitchen_machine/grill, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "ouk" = ( @@ -80577,11 +76069,7 @@ dir = 8 }, /obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80617,11 +76105,7 @@ /area/station/security/permabrig) "ovl" = ( /obj/structure/table/wood, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -80652,11 +76136,7 @@ }, /area/station/maintenance/starboard) "owG" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/chair/office/dark{ dir = 8 }, @@ -80664,9 +76144,7 @@ /area/station/science/toxins/launch) "owW" = ( /obj/structure/table/glass, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/machinery/computer/med_data/laptop{ pixel_y = 2 }, @@ -80742,9 +76220,7 @@ /obj/item/hand_labeler{ pixel_y = 2 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -80942,12 +76418,8 @@ /area/station/science/toxins/mixing) "oCs" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light_construct/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ icon_state = "wood-broken" @@ -80983,10 +76455,7 @@ /area/station/supply/office) "oCK" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -81007,11 +76476,7 @@ /turf/simulated/floor/wood, /area/station/medical/psych) "oDy" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "oDB" = ( @@ -81089,11 +76554,7 @@ /area/station/maintenance/incinerator) "oEP" = ( /obj/item/kirbyplants, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "oER" = ( @@ -81107,14 +76568,8 @@ /area/station/maintenance/port2) "oFv" = ( /obj/machinery/computer/arcade, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/newscaster/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "oFL" = ( @@ -81124,11 +76579,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "oFY" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/chair/comfy/red{ dir = 8 }, @@ -81161,11 +76612,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "oHi" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plasteel, @@ -81186,11 +76633,7 @@ /area/station/security/storage) "oHK" = ( /obj/machinery/power/smes, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -81313,25 +76756,14 @@ "oKl" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/machinery/light/directional/south, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "oKp" = ( /obj/structure/dresser, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/light_switch/west, +/obj/machinery/newscaster/security_unit/north, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "oKN" = ( @@ -81369,11 +76801,7 @@ /area/station/command/office/ntrep) "oLA" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable, /turf/simulated/floor/plasteel/white, /area/station/science/explab) @@ -81463,13 +76891,8 @@ /turf/simulated/wall, /area/station/public/arcade) "oNe" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -81513,10 +76936,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "oOq" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -81739,10 +77159,7 @@ /area/station/maintenance/port) "oUP" = ( /obj/structure/chair/sofa/left, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "oUR" = ( @@ -81781,13 +77198,7 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "Engineering Engine Super APC"; - pixel_y = 24; - shock_proof = 1 - }, +/obj/machinery/power/apc/engie/north, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -81868,9 +77279,7 @@ }, /area/station/public/storage/tools) "oWz" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -82140,11 +77549,7 @@ /area/station/medical/morgue) "paM" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" @@ -82217,11 +77622,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "pcT" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -82248,11 +77649,7 @@ network = list("Engineering","SS13") }, /obj/effect/decal/warning_stripes/south, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -82275,11 +77672,7 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 2 }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -82297,15 +77690,13 @@ /area/station/medical/sleeper) "pey" = ( /obj/item/kirbyplants, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/station/medical/medbay2) "peG" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/port) "peH" = ( @@ -82328,10 +77719,7 @@ }, /area/station/engineering/control) "pfe" = ( -/obj/machinery/light_switch{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/light_switch/north, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ dir = 9; @@ -82361,8 +77749,7 @@ }, /area/station/engineering/atmos) "pfl" = ( -/obj/machinery/door_control{ - pixel_x = -24; +/obj/machinery/door_control/shutter/west{ id = "restaurant"; name = "Restaurant Shutters control" }, @@ -82371,10 +77758,7 @@ /area/station/maintenance/old_kitchen) "pfu" = ( /obj/machinery/disposal, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "cmo" @@ -82433,14 +77817,8 @@ /area/station/security/prison/cell_block) "pgH" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/west, /obj/item/book/manual/wiki/security_space_law, /turf/simulated/floor/plasteel{ dir = 6; @@ -82458,9 +77836,7 @@ /turf/simulated/floor/light/blue, /area/station/maintenance/old_kitchen) "phe" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -82473,11 +77849,7 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "phF" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/machinery/camera{ c_tag = "Brig - Officer Equipment Storage"; network = list("SS13","Security") @@ -82625,11 +77997,7 @@ /area/station/maintenance/fsmaint) "pjS" = ( /obj/structure/closet/radiation, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -82724,13 +78092,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "east bump"; - pixel_x = 24; - shock_proof = 1 - }, +/obj/machinery/power/apc/engie/east, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -82751,9 +78113,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "chapel" @@ -82993,9 +78353,7 @@ /obj/machinery/bodyscanner{ dir = 2 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -83051,11 +78409,7 @@ /turf/simulated/wall, /area/station/service/clown) "pqQ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/effect/spawner/random_spawners/dirt_maybe, /obj/structure/flora/junglebush, /obj/structure/cable{ @@ -83235,18 +78589,11 @@ pixel_y = 4 }, /obj/effect/decal/cleanable/dust, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/maintenance/starboard) "psA" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/machinery/camera{ c_tag = "Research Test Lab"; dir = 8; @@ -83255,10 +78602,7 @@ /turf/simulated/floor/engine, /area/station/science/explab) "psB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/table/reinforced, /obj/item/stack/cable_coil, /obj/item/apc_electronics{ @@ -83480,7 +78824,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -83573,11 +78917,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "pyb" = ( @@ -83597,10 +78937,7 @@ }, /obj/machinery/atmospherics/portable/canister, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "pyQ" = ( @@ -83726,9 +79063,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "pAC" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -83760,13 +79095,8 @@ /area/station/security/checkpoint/south) "pBc" = ( /obj/machinery/economy/vending/coffee, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_y = 24; +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/north{ pixel_x = -10 }, /turf/simulated/floor/carpet/arcade, @@ -83828,10 +79158,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -84253,9 +79580,7 @@ /area/station/science/robotics/showroom) "pJw" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "pJL" = ( @@ -84267,7 +79592,7 @@ }, /area/station/security/storage) "pJP" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/machinery/power/smes, /obj/structure/cable{ d1 = 4; @@ -84567,9 +79892,7 @@ "pPW" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -84664,12 +79987,8 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/door_control{ - id = "DormToilet2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4; - pixel_y = -24 +/obj/machinery/door_control/bolt_control/south{ + id = "DormToilet2" }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" @@ -84790,17 +80109,13 @@ pixel_x = 25; vent_link_id = "arrivalsn_vent" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "pUN" = ( /obj/effect/landmark/spawner/nukedisc_respawn, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -84863,10 +80178,7 @@ cover_color = "#68452a"; dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -25 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" @@ -84880,9 +80192,7 @@ /area/station/maintenance/fsmaint) "pWw" = ( /obj/machinery/economy/vending/snack, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -85059,7 +80369,7 @@ }, /area/station/public/locker) "pZI" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/safe{ known_by = list("captain") }, @@ -85105,10 +80415,7 @@ /area/station/engineering/atmos/control) "qaS" = ( /obj/effect/decal/warning_stripes/southeast, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qbb" = ( @@ -85224,9 +80531,7 @@ /area/station/medical/sleeper) "qdE" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "qdW" = ( @@ -85235,9 +80540,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/library) "qeU" = ( -/obj/machinery/ai_status_display{ - pixel_x = -32 - }, +/obj/machinery/ai_status_display/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -85271,8 +80574,7 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "qfs" = ( -/obj/machinery/light{ - dir = 1; +/obj/machinery/light/directional/south{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -85311,11 +80613,7 @@ /area/station/legal/magistrate) "qgK" = ( /obj/machinery/economy/vending/chinese, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -85384,10 +80682,7 @@ dir = 6; color = "lightblue" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -85411,10 +80706,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "qhZ" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/table/glass, /obj/item/soap, /turf/simulated/floor/plasteel{ @@ -85472,11 +80764,7 @@ }, /area/station/maintenance/fore) "qjT" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -85602,9 +80890,7 @@ /area/station/maintenance/fore2) "qmT" = ( /obj/item/mounted/frame/display/newscaster_frame, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood/fancy/birch{ icon_state = "fancy-wood-birch-broken5" }, @@ -85723,9 +81009,7 @@ /area/station/security/checkpoint/south) "qqh" = ( /obj/machinery/cryopod, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/computer/cryopod{ pixel_x = 32 }, @@ -85844,11 +81128,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "qul" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -85911,10 +81191,9 @@ c_tag = "Medbay Virology Main Hall"; network = list("Medical","SS13") }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "Virology1"; - name = "Virology Window Shutters Control"; - pixel_y = 24 + name = "Virology Window Shutters Control" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -85966,11 +81245,7 @@ }, /area/station/hallway/primary/fore) "qwl" = ( -/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" @@ -86077,9 +81352,7 @@ }, /area/station/hallway/primary/central/se) "qyr" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/structure/table/glass, /obj/item/storage/box/beakers{ pixel_y = 4; @@ -86089,11 +81362,10 @@ pixel_y = 4; pixel_x = 8 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ desc = "A remote control switch for the medbay foyer."; id = "GeneticsPrivacy"; - name = "Genetics Privacy Shutter Control"; - pixel_y = 24 + name = "Genetics Privacy Shutter Control" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -86116,10 +81388,7 @@ /turf/simulated/wall/r_wall, /area/station/security/checkpoint/south) "qzy" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/wood, /area/station/service/theatre) "qzG" = ( @@ -86131,11 +81400,7 @@ /area/station/service/kitchen) "qzR" = ( /obj/machinery/hydroponics/soil, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/grass, /area/station/service/hydroponics) "qAM" = ( @@ -86202,9 +81467,7 @@ /area/station/maintenance/starboard) "qBu" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/service/theatre) "qBw" = ( @@ -86217,10 +81480,7 @@ /turf/simulated/wall/r_wall, /area/station/security/main) "qCc" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/computer/station_alert, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -86269,11 +81529,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "qDv" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -86298,11 +81554,7 @@ pixel_y = 2; pixel_x = -4 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteyellow" }, @@ -86490,11 +81742,7 @@ /area/station/public/fitness) "qGo" = ( /obj/structure/chair/comfy/green, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -86519,18 +81767,12 @@ pixel_x = -24; pixel_y = -6 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/bolt_control/west{ id = "privateroom"; - name = "Privacy Room Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -24; - pixel_y = 6; - specialfunctions = 4 + pixel_y = 6 }, /obj/structure/table/wood, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 @@ -86638,9 +81880,7 @@ /area/station/maintenance/port) "qIl" = ( /obj/structure/flora/grass/jungle, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/grass/no_creep, /area/station/hallway/secondary/exit) "qIz" = ( @@ -86651,9 +81891,7 @@ /area/station/maintenance/starboard2) "qIE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -86751,11 +81989,7 @@ }, /area/station/medical/virology/lab) "qKt" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -86780,9 +82014,7 @@ pixel_x = -26 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -86810,9 +82042,7 @@ }, /area/station/maintenance/starboard2) "qLk" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -86891,11 +82121,7 @@ }, /area/station/supply/office) "qMV" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -86952,9 +82178,7 @@ "qOd" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "qOs" = ( @@ -87172,12 +82396,8 @@ }, /area/station/security/checkpoint/south) "qSo" = ( -/obj/machinery/door_control{ - id = "PrivateRoom1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -24; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/south{ + id = "PrivateRoom1" }, /obj/structure/chair/sofa/left{ dir = 1 @@ -87277,11 +82497,7 @@ /area/station/maintenance/starboard2) "qTE" = ( /obj/item/kirbyplants, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -87341,7 +82557,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "qUB" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ @@ -87349,10 +82565,7 @@ }, /area/station/security/prison/cell_block) "qUJ" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 32 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -87402,11 +82615,7 @@ /obj/item/clothing/mask/gas/sechailer, /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -87429,9 +82638,7 @@ /turf/simulated/floor/wood, /area/station/medical/psych) "qWr" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -87445,16 +82652,11 @@ /area/station/maintenance/fore2) "qWx" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "qWG" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -87466,9 +82668,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -87539,14 +82739,8 @@ }, /area/station/security/interrogation) "qYT" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/south, +/obj/machinery/light_switch/east, /turf/simulated/floor/carpet, /area/station/command/office/hop) "qZk" = ( @@ -87673,16 +82867,8 @@ }, /area/station/medical/chemistry) "rbo" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/alarm/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, @@ -87805,10 +82991,7 @@ pixel_x = 8; pixel_y = 4 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -87836,9 +83019,7 @@ }, /obj/machinery/hydroponics/constructable, /obj/item/seeds/carrot, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -87882,20 +83063,12 @@ }, /area/station/engineering/atmos/control) "reW" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "rfh" = ( -/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{ dir = 4; @@ -88071,11 +83244,7 @@ "rim" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "rix" = ( @@ -88103,11 +83272,7 @@ /area/station/supply/qm) "riJ" = ( /obj/structure/railing, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -88198,11 +83363,7 @@ /turf/simulated/floor/plating, /area/station/medical/virology/lab) "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" @@ -88222,9 +83383,7 @@ }, /area/station/security/warden) "rkO" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/black, /obj/item/storage/box/lights/mixed, @@ -88246,7 +83405,7 @@ /turf/space, /area/space) "rkV" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/rack, /obj/effect/decal/warning_stripes/southwest, /obj/effect/spawner/lootdrop/maintenance, @@ -88290,11 +83449,7 @@ }, /area/station/public/storage/tools) "rmm" = ( -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -88302,19 +83457,13 @@ /area/station/security/prison/cell_block) "rmw" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - name = "custom placement" - }, +/obj/item/radio/intercom, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "rnI" = ( /obj/structure/closet/crate/freezer/iv_storage, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -88427,20 +83576,14 @@ }, /area/station/command/bridge) "rqh" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "green" }, /area/station/hallway/secondary/exit) "rqk" = ( /obj/effect/landmark/damageturf, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "rqn" = ( @@ -88490,9 +83633,7 @@ /turf/simulated/wall/r_wall, /area/station/medical/storage) "rrJ" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -88611,11 +83752,7 @@ /area/station/medical/sleeper) "rtG" = ( /obj/machinery/economy/vending/secdrobe, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -88728,10 +83865,7 @@ /area/station/maintenance/virology_maint) "rvD" = ( /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/radio{ pixel_x = -6; @@ -88836,10 +83970,7 @@ /area/station/maintenance/starboard) "rxb" = ( /obj/machinery/computer/secure_data, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/north, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "rxe" = ( @@ -89037,11 +84168,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "rAL" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -89077,10 +84204,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/old_kitchen) "rBu" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -89283,17 +84407,13 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_construct/small, +/obj/machinery/light_construct/small/north, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/station/maintenance/starboard2) "rGZ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -89526,10 +84646,9 @@ /obj/item/storage/box/monkeycubes{ pixel_y = 3 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "Virology2"; - name = "Virology Window Shutters Control"; - pixel_x = -24 + name = "Virology Window Shutters Control" }, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) @@ -89583,9 +84702,7 @@ "rMw" = ( /obj/structure/bedsheetbin, /obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/requests_console{ department = "Crew Quarters"; name = "Crew Quarters Requests Console"; @@ -89597,10 +84714,7 @@ /area/station/public/fitness) "rML" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -89666,24 +84780,15 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "rOG" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "rOW" = ( /turf/simulated/wall/r_wall, /area/station/medical/reception) "rPh" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -89691,11 +84796,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/aitransit) "rPs" = ( -/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 }, @@ -89735,8 +84836,7 @@ /area/station/security/prison/cell_block) "rPF" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 4; +/obj/machinery/light/directional/west{ nightshift_allowed = 0; nightshift_enabled = 1 }, @@ -89776,11 +84876,7 @@ }, /area/station/medical/medbay) "rQj" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -89893,12 +84989,9 @@ "rRQ" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4; +/obj/machinery/light/small/directional/west{ pixel_y = 8 }, /turf/simulated/floor/plasteel{ @@ -89915,10 +85008,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "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) @@ -89943,12 +85033,7 @@ /area/station/telecomms/chamber) "rSM" = ( /obj/structure/closet/secure_closet/medical3, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -90038,12 +85123,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "rUS" = ( -/obj/machinery/door_control{ - id = "pub_room"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/north{ + id = "pub_room" }, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) @@ -90066,11 +85147,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "rWL" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -90159,7 +85236,7 @@ /area/station/bridge/checkpoint/south) "rXZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ nightshift_enabled = 1; nightshift_allowed = 0 }, @@ -90188,11 +85265,7 @@ /obj/item/reagent_containers/food/drinks/britcup{ pixel_y = 2 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -90517,9 +85590,7 @@ /obj/machinery/gateway{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -90702,11 +85773,7 @@ /turf/simulated/wall, /area/station/medical/virology) "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" @@ -90763,10 +85830,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "sgZ" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -90789,10 +85853,7 @@ /area/station/hallway/primary/port) "shs" = ( /obj/machinery/economy/vending/assist, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/camera{ c_tag = "Primary Tool Storage"; dir = 4 @@ -90872,13 +85933,7 @@ /area/station/public/fitness) "sjT" = ( /obj/item/flag/clown, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "east bump Engineering"; - pixel_x = 24; - shock_proof = 1 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -91071,13 +86126,8 @@ pixel_y = 2 }, /obj/item/storage/belt/medical, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -91119,9 +86169,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "spp" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ @@ -91147,25 +86195,15 @@ /area/station/security/range) "spF" = ( /obj/machinery/icemachine, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/station/service/kitchen) "spP" = ( /obj/structure/closet, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91190,11 +86228,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "sqb" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "sqk" = ( @@ -91232,11 +86266,7 @@ /area/station/science/toxins/launch) "sqI" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -91332,11 +86362,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/service/theatre) "ssy" = ( @@ -91402,10 +86428,7 @@ }, /area/station/medical/medbay2) "stv" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -91440,9 +86463,7 @@ /area/station/public/fitness) "stW" = ( /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "suu" = ( @@ -91469,9 +86490,7 @@ /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "suy" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/item/kirbyplants, /obj/structure/sign/poster/random{ pixel_y = -32 @@ -91522,17 +86541,11 @@ }, /area/station/public/fitness) "suI" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "suU" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -91648,10 +86661,7 @@ /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide, /obj/item/gps/engineering, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "sxq" = ( @@ -91682,15 +86692,12 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/spray/cleaner, /obj/item/key/janitor, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "janitorshutters"; name = "Janitor Shutters Control"; - pixel_y = 25; req_access_txt = "26" }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -91784,7 +86791,7 @@ /obj/machinery/bodyscanner{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -91877,14 +86884,8 @@ }, /area/station/hallway/secondary/entry) "sAP" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -91895,11 +86896,7 @@ /area/station/medical/virology) "sBm" = ( /obj/structure/chair/comfy/teal, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -91922,26 +86919,18 @@ /area/station/science/toxins/mixing) "sBE" = ( /obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" }, /area/station/science/break_room) "sBV" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/computer/scan_consolenew{ dir = 1 }, -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -92015,21 +87004,14 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "sCZ" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/machinery/kitchen_machine/grill, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/station/service/kitchen) "sDh" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -92123,9 +87105,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/clipboard, /obj/item/folder/blue, /obj/machinery/camera{ @@ -92158,15 +87138,8 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/machinery/alarm/directional/north, +/obj/item/radio/intercom/directional/east, /obj/effect/landmark/start/psychiatrist, /turf/simulated/floor/wood, /area/station/medical/psych) @@ -92174,11 +87147,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -92266,11 +87235,7 @@ /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/clothing/gloves/color/black, /obj/item/clothing/mask/gas, @@ -92321,9 +87286,7 @@ /area/station/hallway/primary/starboard) "sIB" = ( /obj/effect/decal/warning_stripes/northeastcorner, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -92351,10 +87314,8 @@ pixel_y = 26; range = 18 }, -/obj/machinery/light_switch{ - name = "custom placement"; - pixel_x = 7; - pixel_y = 24 +/obj/machinery/light_switch/north{ + pixel_x = 7 }, /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) @@ -92368,9 +87329,7 @@ /area/station/maintenance/apmaint) "sJI" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -92405,10 +87364,7 @@ /area/station/service/bar/atrium) "sKG" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "sKM" = ( @@ -92499,9 +87455,7 @@ }, /area/station/medical/medbay) "sMV" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) @@ -92582,9 +87536,7 @@ }, /area/station/engineering/aitransit) "sPz" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/sign/vacuum{ pixel_y = 32 }, @@ -92699,10 +87651,7 @@ /area/station/science/research) "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) "sSY" = ( @@ -92870,9 +87819,7 @@ "sYj" = ( /obj/effect/spawner/lootdrop/trash, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -92895,10 +87842,7 @@ }, /obj/item/bedsheet/red, /obj/structure/bed, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -92948,13 +87892,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "sZp" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -93021,10 +87963,7 @@ /area/station/science/research) "taB" = ( /obj/machinery/economy/vending/coffee, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" @@ -93251,9 +88190,7 @@ /obj/machinery/hydroponics/constructable, /obj/item/seeds/tower, /obj/item/seeds/amanita, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/cobweb2, /obj/structure/cable{ d1 = 2; @@ -93282,9 +88219,7 @@ }, /area/station/service/barber) "tgn" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/beach/away/water/deep/dense{ density = 0; water_overlay_image = null @@ -93407,9 +88342,7 @@ /area/station/maintenance/apmaint) "tjM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel, /area/station/science/research) "tjY" = ( @@ -93505,11 +88438,7 @@ /area/station/medical/virology) "tlf" = ( /obj/effect/decal/warning_stripes/east, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "Dark" @@ -93642,11 +88571,7 @@ }, /area/station/maintenance/electrical) "tmV" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -93760,11 +88685,7 @@ network = list("Medbay","SS13"); dir = 8 }, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -93778,10 +88699,7 @@ }, /area/station/maintenance/old_kitchen) "tpc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -93808,19 +88726,13 @@ }, /area/station/engineering/tech_storage) "tpo" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/security/execution) "tpP" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "tqg" = ( @@ -93939,9 +88851,7 @@ }, /area/station/service/expedition) "trG" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -94008,11 +88918,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "ttb" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -94216,10 +89122,7 @@ c_tag = "Experimention Lab"; network = list("Experimentator","Research","SS13") }, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/engine, /area/station/science/test_chamber) "txW" = ( @@ -94246,20 +89149,14 @@ /area/station/maintenance/starboard) "tzb" = ( /obj/structure/closet/crate/freezer/iv_storage, -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" }, /area/station/medical/surgery/secondary) "tzp" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/clothing/glasses/meson, @@ -94325,9 +89222,7 @@ /area/station/security/storage) "tAT" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -94581,9 +89476,7 @@ /area/station/service/expedition) "tFK" = ( /obj/item/soap/nanotrasen, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/curtain/open/shower, /obj/machinery/shower{ pixel_y = 22 @@ -94604,11 +89497,7 @@ /obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/plantbgone, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "tGN" = ( @@ -94767,11 +89656,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/qm) "tJa" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/alarm/directional/west, /obj/structure/bed/dogbed/runtime, /mob/living/simple_animal/pet/cat/Runtime, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -94785,10 +89670,7 @@ "tJc" = ( /obj/item/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "tJd" = ( @@ -94945,9 +89827,7 @@ /area/station/security/prison/cell_block) "tNd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -94982,24 +89862,17 @@ /area/station/security/checkpoint/south) "tNm" = ( /obj/structure/dresser, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "barber" }, /area/station/service/barber) "tNn" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "tNO" = ( @@ -95063,10 +89936,7 @@ }, /area/station/security/checkpoint/south) "tOM" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -95078,11 +89948,7 @@ "tOP" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "tOS" = ( @@ -95113,9 +89979,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -95129,11 +89993,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) @@ -95157,9 +90017,7 @@ pixel_x = 27; pixel_y = 28 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -95369,11 +90227,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel/white, /area/station/science/explab) "tUW" = ( @@ -95474,24 +90328,14 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "tXb" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "tXj" = ( /obj/machinery/cryopod/right, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -95700,7 +90544,7 @@ /area/station/maintenance/fore2) "uah" = ( /obj/structure/table/reinforced, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "RnDChem"; name = "Chamber Blast Doors"; pixel_x = 3; @@ -96022,9 +90866,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ugQ" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -96088,9 +90930,7 @@ /area/station/hallway/secondary/exit/maintenance) "uhM" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, /area/station/supply/sorting) "uic" = ( @@ -96114,15 +90954,8 @@ "uih" = ( /obj/structure/table, /obj/item/storage/box/evidence, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/newscaster/security_unit/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -96164,11 +90997,7 @@ /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) "uiw" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -96184,11 +91013,7 @@ /obj/item/shield/riot, /obj/item/shield/riot, /obj/item/shield/riot, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light_switch/east, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) "uiL" = ( @@ -96392,7 +91217,7 @@ /area/station/medical/virology/lab) "umY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -96435,9 +91260,7 @@ pixel_x = -26; pixel_y = 28 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -96530,9 +91353,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "upe" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -96559,11 +91380,7 @@ pixel_y = -24; dir = 1 }, -/obj/item/radio/intercom{ - dir = 4; - name = "west bump"; - pixel_x = -22 - }, +/obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -96589,10 +91406,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "upw" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -96603,11 +91417,7 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -96637,10 +91447,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "upW" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -96748,12 +91555,8 @@ "usc" = ( /obj/structure/bed, /obj/item/bedsheet/mime, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "usF" = ( @@ -96771,12 +91574,8 @@ "usY" = ( /obj/structure/table/glass, /obj/effect/spawner/lootdrop/officetoys, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -96823,19 +91622,11 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/door_control{ - id = "toilet1"; - name = "Toilet Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -24; - specialfunctions = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/door_control/bolt_control/west{ + id = "toilet1" }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/service/theatre) "uvM" = ( @@ -96931,9 +91722,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/bridge) "uxu" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plating, /area/station/maintenance/old_detective) @@ -96975,11 +91764,7 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/maintenance/starboard2) "uzb" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -96991,12 +91776,8 @@ /turf/simulated/wall, /area/station/service/kitchen) "uzO" = ( -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -97006,11 +91787,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/old_detective) @@ -97063,13 +91840,10 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "uAY" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/meson/engine{ pixel_x = 2; @@ -97301,9 +92075,7 @@ }, /area/station/hallway/primary/fore) "uFO" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 @@ -97326,10 +92098,7 @@ /area/station/maintenance/port) "uFP" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/light/blue, /area/station/maintenance/old_kitchen) "uFS" = ( @@ -97361,10 +92130,7 @@ /area/station/public/fitness) "uGp" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood/fancy/light, /area/station/public/sleep_female) "uGY" = ( @@ -97433,11 +92199,7 @@ }, /area/station/maintenance/old_kitchen) "uIk" = ( -/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 }, @@ -97602,18 +92364,14 @@ "uKR" = ( /obj/item/reagent_containers/food/snacks/candy/gummybear/green, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/station/maintenance/starboard2) "uKV" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) @@ -97711,10 +92469,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "uMM" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/economy/vending/detdrobe, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) @@ -98211,11 +92966,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/electrical) @@ -98224,9 +92975,7 @@ pixel_y = 8 }, /obj/item/bikehorn/rubberducky, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/item/seeds/ambrosia, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel, @@ -98368,9 +93117,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/status_display{ - pixel_y = -32 - }, +/obj/machinery/status_display/directional/south, /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 3; @@ -98405,17 +93152,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/station/public/locker) "uXv" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/wood, /area/station/service/bar/atrium) "uXF" = ( @@ -98473,10 +93216,7 @@ /obj/machinery/camera{ c_tag = "Brig - Cell 5" }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 22 - }, +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -98566,9 +93306,7 @@ name = "Cryo Tank Storage" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/general, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -98606,9 +93344,7 @@ /area/station/turret_protected/ai_upload) "vbA" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -98634,11 +93370,7 @@ "vbQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98714,9 +93446,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/sink/kitchen{ - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -98748,7 +93478,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "veK" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "vfg" = ( @@ -98818,7 +93548,7 @@ /area/station/medical/medbay) "vgU" = ( /obj/structure/flora/grass/jungle, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "vhD" = ( @@ -98826,11 +93556,7 @@ /turf/simulated/floor/engine, /area/station/science/explab) "vhS" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -98901,10 +93627,7 @@ /area/station/maintenance/starboard2) "vjg" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -98923,10 +93646,7 @@ icon_state = "2-4" }, /obj/machinery/photocopier, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -98950,7 +93670,7 @@ /obj/structure/sign/vacuum{ pixel_x = -32 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -99123,11 +93843,7 @@ pixel_x = -8; id = "disp" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -99266,14 +93982,8 @@ /area/station/maintenance/abandonedbar) "vqr" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/light/directional/west, +/obj/machinery/alarm/directional/east, /obj/item/paper{ pixel_y = 2 }, @@ -99344,9 +94054,7 @@ /area/station/maintenance/old_kitchen) "vrH" = ( /obj/structure/flora/junglebush, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/grass/jungle, /area/station/maintenance/fsmaint) "vrJ" = ( @@ -99356,11 +94064,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/service/theatre) "vrQ" = ( @@ -99401,10 +94105,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "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, @@ -99477,10 +94178,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" @@ -99496,18 +94194,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/station/science/research) "vxa" = ( -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -99567,10 +94261,9 @@ }, /area/station/hallway/primary/central) "vyl" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/north{ id = "experimentor"; - name = "Experimentor Control"; - pixel_y = 25 + name = "Experimentor Control" }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -99602,9 +94295,7 @@ /obj/structure/bed, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "vzd" = ( @@ -99660,9 +94351,7 @@ }, /area/station/maintenance/starboard2) "vzz" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/bluegrid, /area/station/telecomms/chamber) "vzB" = ( @@ -99791,11 +94480,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "vDg" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -99832,10 +94517,7 @@ /area/station/science/xenobiology) "vDp" = ( /obj/machinery/papershredder, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -99853,9 +94535,7 @@ /area/station/security/processing) "vDT" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/sign/poster/contraband/atmosia_independence{ pixel_y = 32 @@ -99881,10 +94561,7 @@ /obj/item/storage/box/gloves{ pixel_y = -6 }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkblue" @@ -99970,10 +94647,7 @@ /obj/structure/table/wood, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "vEV" = ( @@ -100027,9 +94701,7 @@ /area/station/command/office/cmo) "vGg" = ( /obj/machinery/economy/vending/coffee, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/official/random/west, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "vGw" = ( @@ -100090,11 +94762,7 @@ /turf/simulated/floor/plating, /area/station/science/toxins/launch) "vHV" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -100121,12 +94789,8 @@ }, /obj/structure/morgue, /obj/effect/landmark/spawner/rev, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/sign/poster/official/random/north, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -100311,13 +94975,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "vLF" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/machinery/alarm/directional/north, +/obj/structure/sign/poster/official/random/east, /obj/structure/chair/comfy/brown, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -100333,13 +94992,8 @@ /area/station/engineering/hardsuitstorage) "vLX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 27 - }, +/obj/machinery/light/small/directional/west, +/obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit/maintenance) "vMg" = ( @@ -100382,11 +95036,7 @@ /obj/structure/bed, /obj/item/bedsheet/red, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "vNm" = ( @@ -100423,9 +95073,7 @@ dir = 4 }, /obj/machinery/clonepod/biomass, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -100497,11 +95145,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "vPa" = ( -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /obj/machinery/computer/station_alert{ dir = 1 }, @@ -100542,9 +95186,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel, /area/station/service/theatre) "vQh" = ( @@ -100568,9 +95210,7 @@ /area/station/hallway/secondary/exit) "vQw" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/stack/sheet/plasteel, /obj/item/wrench, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -100627,9 +95267,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/starboard2) "vSM" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/sparker{ id = "Execution"; pixel_y = 22 @@ -100714,11 +95352,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vUu" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /obj/structure/chair/comfy/shuttle{ dir = 1 }, @@ -100830,9 +95464,7 @@ }, /area/station/command/bridge) "vWm" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, +/obj/machinery/ai_status_display/south, /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/painter, @@ -101063,19 +95695,15 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) "wah" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "south bump"; - pixel_y = -22 - }, -/obj/machinery/light, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/carpet/cyan, /area/station/command/office/cmo) "wax" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ nightshift_enabled = 1; nightshift_allowed = 0 }, @@ -101112,11 +95740,7 @@ /obj/structure/chair/sofa/right{ dir = 1 }, -/obj/machinery/alarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "wbt" = ( @@ -101161,11 +95785,7 @@ }, /area/station/science/toxins/mixing) "wcI" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -101233,11 +95853,7 @@ /turf/simulated/floor/carpet, /area/station/security/prison/cell_block) "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) "weE" = ( @@ -101325,9 +95941,7 @@ }, /area/station/maintenance/port) "wfP" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /obj/machinery/computer/security/engineering{ dir = 4 }, @@ -101349,11 +95963,7 @@ /area/station/maintenance/virology_maint) "wfX" = ( /obj/effect/spawner/random_spawners/blood_maybe, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -101400,7 +96010,7 @@ }, /area/station/engineering/hardsuitstorage) "wgF" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 @@ -101523,9 +96133,7 @@ /area/station/medical/storage) "wjm" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "wjw" = ( @@ -101641,11 +96249,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "wmx" = ( -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /obj/machinery/disposal{ name = "Deathposal" }, @@ -101682,18 +96286,16 @@ }, /area/station/medical/virology/lab) "wny" = ( -/obj/machinery/light, -/obj/machinery/door_control{ +/obj/machinery/light/directional/north, +/obj/machinery/door_control/shutter/south{ id = "kitchenhall"; name = "Kitchen Hallway Shutters Control"; - pixel_x = -5; - pixel_y = -24 + pixel_x = -5 }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "Kitchen Windows"; name = "Kitchen Privacy Shutters Control"; - pixel_x = 5; - pixel_y = -24 + pixel_x = 5 }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) @@ -101849,9 +96451,7 @@ /area/station/maintenance/starboard2) "wqU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "wrr" = ( @@ -101892,11 +96492,7 @@ /area/station/security/processing) "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, @@ -101993,9 +96589,7 @@ /area/station/security/prison/cell_block) "wtE" = ( /obj/machinery/cryopod/right, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -102186,9 +96780,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/aitransit) "wxg" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/computer/security/engineering, /turf/simulated/floor/plasteel{ @@ -102345,9 +96937,7 @@ /area/station/medical/virology/lab) "wCJ" = ( /obj/item/camera_film, -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -102383,9 +96973,7 @@ "wDU" = ( /obj/machinery/chem_dispenser, /obj/item/reagent_containers/glass/beaker/large, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/west, /turf/simulated/floor/engine, /area/station/science/explab) "wEA" = ( @@ -102417,14 +97005,8 @@ /area/station/maintenance/fore) "wFh" = ( /obj/structure/table, -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/east, /obj/item/reagent_containers/syringe/charcoal{ pixel_y = 10; pixel_x = -6 @@ -102492,13 +97074,9 @@ }, /area/station/science/break_room) "wGf" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood, /area/station/maintenance/old_kitchen) "wGg" = ( @@ -102548,11 +97126,7 @@ }, /area/station/hallway/primary/central/ne) "wGL" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wHc" = ( @@ -102607,9 +97181,7 @@ "wIb" = ( /obj/effect/spawner/random_spawners/dirt_frequent, /obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/grass/jungle, /area/station/maintenance/fsmaint) "wIc" = ( @@ -102621,7 +97193,7 @@ }, /area/station/maintenance/starboard2) "wIw" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wIE" = ( @@ -102836,11 +97408,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "wPH" = ( -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -102909,17 +97477,11 @@ /area/station/medical/medbay2) "wRc" = ( /obj/machinery/chem_heater, -/obj/item/radio/intercom{ - dir = 8; - name = "east bump"; - pixel_x = 22 - }, +/obj/item/radio/intercom/directional/east, /turf/simulated/floor/engine, /area/station/science/explab) "wRl" = ( -/obj/machinery/light_construct{ - dir = 1 - }, +/obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -103273,9 +97835,7 @@ }, /area/station/science/research) "wXE" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "green" @@ -103363,9 +97923,7 @@ }, /area/station/medical/virology/lab) "wZe" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -103417,7 +97975,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "xag" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plating, /area/station/science/toxins/launch) "xao" = ( @@ -103435,9 +97993,7 @@ }, /area/station/security/execution) "xat" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -103517,11 +98073,7 @@ /obj/item/reagent_containers/food/snacks/meat/human, /obj/item/reagent_containers/food/snacks/meat/human, /obj/item/reagent_containers/food/snacks/meat/human, -/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" @@ -103544,10 +98096,7 @@ "xda" = ( /obj/item/cultivator, /obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -103584,10 +98133,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "xdY" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -103607,9 +98153,7 @@ }, /area/station/medical/cloning) "xej" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, @@ -103736,7 +98280,7 @@ dir = 8 }, /obj/effect/landmark/spawner/rev, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; pixel_x = 8; @@ -103767,12 +98311,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "xjh" = ( -/obj/machinery/door_control{ - id = "maintcabin1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 24; - specialfunctions = 4 +/obj/machinery/door_control/bolt_control/north{ + id = "maintcabin1" }, /obj/structure/closet/crate/secure/bin, /obj/effect/spawner/lootdrop/maintenance, @@ -103853,10 +98393,9 @@ /area/station/medical/virology/lab) "xli" = ( /obj/machinery/suit_storage_unit/mime, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/west{ id = "Mime"; - name = "Mimes Privacy Shutters Control"; - pixel_x = -27 + name = "Mimes Privacy Shutters Control" }, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) @@ -103918,10 +98457,7 @@ /area/station/science/xenobiology) "xmJ" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 10; @@ -103970,7 +98506,7 @@ }, /area/station/supply/miningdock) "xnh" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/transparent/glass/reinforced, /area/station/hallway/secondary/exit) "xnm" = ( @@ -104087,9 +98623,7 @@ /area/station/maintenance/starboard2) "xpI" = ( /obj/effect/spawner/lootdrop/trash, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -104132,9 +98666,7 @@ }, /area/station/medical/reception) "xql" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ @@ -104200,9 +98732,7 @@ }, /area/station/maintenance/turbine) "xre" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -104370,22 +98900,20 @@ }, /area/station/hallway/primary/central/east) "xuC" = ( -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; - pixel_y = -28; req_access_txt = "2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter/south{ desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -7; - pixel_y = -28; req_access_txt = "2" }, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; pixel_x = -2; @@ -104506,10 +99034,7 @@ /turf/simulated/floor/grass, /area/station/service/hydroponics) "xxn" = ( -/obj/machinery/firealarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -104558,10 +99083,7 @@ "xyD" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "xyV" = ( @@ -104671,10 +99193,7 @@ }, /area/station/security/prison/cell_block) "xBI" = ( -/obj/machinery/alarm{ - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/alarm/directional/north, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -104764,9 +99283,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "xCv" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -105092,11 +99609,7 @@ }, /area/station/medical/chemistry) "xJD" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/engine, /area/station/science/explab) "xJH" = ( @@ -105216,9 +99729,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "xKE" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -105257,10 +99768,7 @@ }, /obj/item/wrench, /obj/item/clothing/glasses/welding, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -105357,11 +99865,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "xNs" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -105493,11 +99997,11 @@ "xPQ" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/bridge/checkpoint/south) "xPW" = ( -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "xQj" = ( @@ -105529,9 +100033,7 @@ /obj/item/radio{ pixel_y = 8 }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/peppertank/east, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -105541,9 +100043,7 @@ /obj/machinery/camera{ c_tag = "Departure Lounge Security Checkpoint West" }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -105559,11 +100059,7 @@ pixel_y = 6; pixel_x = 6 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -105605,10 +100101,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "xRD" = ( @@ -105675,10 +100168,7 @@ /area/station/maintenance/virology_maint) "xSV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -105709,7 +100199,7 @@ "xTI" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; @@ -105721,9 +100211,7 @@ }, /area/station/medical/sleeper) "xTK" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/table/reinforced, @@ -105780,9 +100268,7 @@ /turf/simulated/floor/plasteel, /area/station/security/armory/secure) "xUO" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) @@ -105802,9 +100288,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "xVm" = ( @@ -105818,9 +100302,7 @@ /obj/structure/table/wood, /obj/item/camera, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "xVZ" = ( @@ -105864,9 +100346,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/starboard) "xWE" = ( -/obj/structure/sink/kitchen{ - pixel_y = 25 - }, +/obj/structure/sink/kitchen/north, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -105878,9 +100358,7 @@ /area/station/service/library) "xWO" = ( /obj/structure/bed, -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/effect/landmark/start/chief_medical_officer, /obj/item/bedsheet/cmo, /turf/simulated/floor/plasteel{ @@ -105894,10 +100372,7 @@ id_tag = "Bar"; name = "Bar Privacy Shutters" }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -105910,11 +100385,7 @@ /area/station/maintenance/starboard2) "xXh" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/firealarm{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -105922,9 +100393,7 @@ /area/station/medical/virology/lab) "xXt" = ( /obj/machinery/chem_dispenser, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/east, /obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/engine, /area/station/science/explab) @@ -106105,11 +100574,7 @@ "ycB" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "ycK" = ( @@ -106145,7 +100610,7 @@ /area/station/security/checkpoint/south) "ydY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "yeb" = ( @@ -106184,12 +100649,8 @@ /area/station/maintenance/incinerator) "yff" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -106229,11 +100690,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{ icon_state = "redyellowfull" }, @@ -106243,9 +100700,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /obj/item/wrench, /obj/item/crowbar, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -106302,9 +100757,7 @@ /obj/machinery/door/window/classic/reversed{ name = "Coroner" }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/official/random/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -106329,15 +100782,10 @@ /area/station/medical/virology) "yil" = ( /obj/item/kirbyplants, -/obj/machinery/firealarm{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/door_control{ +/obj/machinery/firealarm/directional/east, +/obj/machinery/door_control/shutter/north{ id = "transitlock"; name = "Transit Tube Lockdown Control"; - pixel_y = 24; req_access_txt = "11" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -106433,11 +100881,7 @@ dir = 4; network = list("SS13","Security") }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index ea367d138ad4..dbdcfae0b15d 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -105,7 +105,7 @@ "cB" = ( /obj/item/bedsheet/black, /obj/structure/bed, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ brightness_range = 6; light_range = 8; nightshift_light_range = 6; @@ -238,7 +238,7 @@ /area/admin) "ea" = ( /obj/structure/table/wood/poker, -/obj/machinery/door_control{ +/obj/machinery/door_control/shutter{ id = "eventroom"; name = "Ready room"; pixel_x = -6; @@ -554,9 +554,8 @@ /turf/simulated/floor/wood, /area/admin) "iY" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/west{ brightness_range = 6; - dir = 4; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -746,9 +745,8 @@ /turf/simulated/floor/holofloor, /area/holodeck/source_thunderdomecourt) "lt" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/east{ brightness_range = 6; - dir = 8; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -765,9 +763,8 @@ /turf/simulated/floor/wood, /area/admin) "lE" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/west{ brightness_range = 6; - dir = 4; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -1441,9 +1438,8 @@ }, /area/tdome/tdomeadmin) "vS" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/east{ brightness_range = 6; - dir = 8; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -1809,9 +1805,8 @@ /area/tdome/tdomeobserve) "Bv" = ( /obj/item/kirbyplants, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/east{ brightness_range = 6; - dir = 8; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -1827,9 +1822,8 @@ /turf/simulated/floor/wood, /area/admin) "BB" = ( -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/east{ brightness_range = 6; - dir = 8; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -1841,9 +1835,8 @@ /area/admin) "BG" = ( /obj/structure/table/wood/poker, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/west{ brightness_range = 6; - dir = 4; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -1926,9 +1919,8 @@ }, /obj/item/radio, /obj/structure/table/wood, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "tdome1"; - pixel_x = 24; req_access_txt = "102" }, /turf/simulated/floor/plasteel{ @@ -2241,7 +2233,7 @@ /obj/machinery/status_display{ pixel_y = -30 }, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/north{ brightness_range = 6; light_range = 8; nightshift_light_range = 6; @@ -2408,11 +2400,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -2499,9 +2487,8 @@ /area/admin) "Kw" = ( /obj/structure/closet, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/west{ brightness_range = 6; - dir = 4; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -2862,9 +2849,8 @@ /obj/machinery/status_display{ pixel_y = 30 }, -/obj/machinery/light/small{ +/obj/machinery/light/small/directional/south{ brightness_range = 6; - dir = 1; light_range = 8; nightshift_light_range = 6; throw_range = 6 @@ -3097,9 +3083,8 @@ }, /obj/item/radio, /obj/structure/table/wood, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "tdome2"; - pixel_x = -24; req_access_txt = "102" }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 68fb5f25e701..67fe60d083a8 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -12,9 +12,7 @@ /turf/simulated/floor/carpet, /area/syndicate_mothership/infteam) "aaA" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "aaB" = ( @@ -28,9 +26,7 @@ layer = 3 }, /obj/structure/statue/ell_good, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/redgrid, /area/syndicate_mothership) "aaW" = ( @@ -289,9 +285,7 @@ /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) "amP" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /obj/structure/mirror{ layer = 2.8; pixel_y = 34 @@ -833,9 +827,7 @@ }, /area/syndicate_mothership/elite_squad) "aER" = ( -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = -32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/west, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -1716,9 +1708,7 @@ /obj/structure/light_fake/spot{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /turf/simulated/floor/carpet/black, /area/centcom/ss220/admin2) "bux" = ( @@ -2183,18 +2173,16 @@ /obj/machinery/light/spot{ dir = 8 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "QMLoaddoor2"; layer = 3; name = "Loading Doors"; - pixel_x = -24; pixel_y = -8 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "QMLoaddoor"; layer = 3; name = "Loading Doors"; - pixel_x = -24; pixel_y = 8 }, /turf/simulated/floor/mineral/titanium/blue, @@ -2528,7 +2516,7 @@ /area/syndicate_mothership/cargo) "bYl" = ( /obj/item/flag/syndi, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/syndie_logo{ icon_state = "logo19" }, @@ -2626,9 +2614,7 @@ }, /area/syndicate_mothership/cargo) "ceC" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "cff" = ( @@ -2770,9 +2756,7 @@ /obj/machinery/light/spot{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, +/obj/machinery/ai_status_display/north, /obj/item/gun/energy/immolator/multi, /obj/item/gun/energy/immolator/multi, /obj/item/gun/energy/immolator/multi, @@ -2796,9 +2780,7 @@ /area/centcom/ss220/evac) "clO" = ( /obj/structure/light_fake/small, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkjail" @@ -2831,9 +2813,7 @@ /area/centcom/ss220/bar) "cnh" = ( /obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cns" = ( @@ -3134,21 +3114,19 @@ id_tag = "СС_BD_Exterior_2"; layer = 3 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "СС_BD_Exterior_2"; name = "Blast Door Open"; - pixel_x = -24; req_one_access_txt = "101" }, /obj/effect/decal/warning_stripes/white, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/general) "cCA" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ color = "#ffbf80"; id = "CC_DeathSquad"; name = "Blast Door Control"; - pixel_x = -24; req_one_access_txt = "114" }, /obj/structure/light_fake/spot{ @@ -3270,11 +3248,10 @@ /turf/simulated/floor/wood/fancy/cherry, /area/centcom/ss220/admin2) "cGC" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ color = "#ff8080"; id = "CC_Armory_Red"; name = "Оружейная - Уровень 3"; - pixel_x = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -3327,9 +3304,7 @@ /obj/item/clothing/glasses/welding{ pixel_y = 10 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -3413,9 +3388,7 @@ "cLm" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "cLo" = ( @@ -3817,9 +3790,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -3994,9 +3965,7 @@ /obj/machinery/computer/mech_bay_power_console{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/syndicate) "djY" = ( @@ -4231,9 +4200,7 @@ "dsw" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/mug/med, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -4383,9 +4350,7 @@ }, /area/syndicate_mothership/cargo) "dxX" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/directional/east, /obj/structure/light_fake/spot{ dir = 4 }, @@ -4504,10 +4469,7 @@ }, /area/centcom/ss220/bar) "dBo" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 13 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror{ pixel_x = 30 }, @@ -5139,10 +5101,9 @@ name = "Зона ЦК"; req_one_access_txt = "101" }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "СС_BD_Interior_2"; name = "Blast Door Open"; - pixel_x = -24; req_one_access_txt = "101" }, /obj/effect/decal/warning_stripes/white, @@ -5330,10 +5291,9 @@ id_tag = "СС_BD_Jail"; layer = 3 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/north{ id = "СС_BD_Jail"; name = "Blast Door Open"; - pixel_y = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark, @@ -5395,9 +5355,7 @@ }, /area/syndicate_mothership/control) "enw" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/status_display/directional/west, /turf/simulated/floor/carpet/black, /area/centcom/ss220/admin2) "enT" = ( @@ -5520,9 +5478,7 @@ /area/centcom/ss220/jail) "erh" = ( /obj/structure/window/reinforced, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/official/random/south, /turf/simulated/floor/wood/fancy/light, /area/centcom/ss220/evac) "erG" = ( @@ -5666,9 +5622,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/centcom/ss220/admin2) "eyg" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/structure/chair/comfy/shuttle/dark{ dir = 4 }, @@ -5851,11 +5805,7 @@ /area/syndicate_mothership/infteam) "eDn" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/storage/briefcase{ pixel_y = 6 }, @@ -5996,9 +5946,7 @@ /obj/structure/chair/comfy/shuttle/dark{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_sit) "eHy" = ( @@ -6791,10 +6739,9 @@ /turf/simulated/floor/wood/fancy/cherry, /area/centcom/ss220/bar) "fkO" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "CC_GammaShuttle"; name = "Blast Door Control"; - pixel_x = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -6954,11 +6901,10 @@ pixel_y = 2 }, /obj/item/clothing/accessory/holster, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/north{ color = "#80ff80"; id = "CC_Armory_Green"; name = "Оружейная - Уровень 1"; - pixel_y = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -7002,10 +6948,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/admin3) "fqN" = ( @@ -7511,9 +7454,7 @@ /obj/structure/chair/comfy/shuttle/dark{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -7622,7 +7563,7 @@ pixel_y = -28; dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /obj/effect/decal/syndie_logo{ icon_state = "logo16" }, @@ -7687,7 +7628,7 @@ pixel_y = -28; dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -7865,11 +7806,10 @@ /turf/simulated/floor/wood, /area/wizard_station) "gjt" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ color = "#8080ff"; id = "CC_Armory_Blue"; name = "Оружейная - Уровень 2"; - pixel_x = -24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -7943,10 +7883,9 @@ /obj/item/storage/toolbox/drone{ pixel_y = 13 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/north{ id = "CC_Armory_Mech"; name = "Оружейная - Мехи"; - pixel_y = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -7997,9 +7936,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) "gof" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "goZ" = ( @@ -8007,10 +7944,7 @@ id = "syndie_FB_cells"; pixel_y = -24 }, -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "blackfull" @@ -8452,9 +8386,7 @@ /turf/simulated/floor/carpet/green, /area/centcom/ss220/general) "gEl" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "gEK" = ( @@ -8625,7 +8557,7 @@ pixel_x = -2; pixel_y = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -8665,9 +8597,7 @@ /area/shuttle/gamma/space) "gNW" = ( /obj/structure/light_fake/small, -/obj/structure/sign/poster/contraband/random{ - pixel_y = -32 - }, +/obj/structure/sign/poster/contraband/random/south, /obj/structure/chair/sofa/bench{ dir = 1 }, @@ -8950,9 +8880,7 @@ "hbm" = ( /obj/item/storage/firstaid/o2, /obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -9129,11 +9057,10 @@ }, /area/syndicate_mothership) "hjo" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "cc_toilet_1"; name = "Door Bolt Control"; normaldoorcontrol = 1; - pixel_x = -24; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -9289,11 +9216,7 @@ pixel_x = 8; pixel_y = -10 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet/black, /area/centcom/ss220/admin2) "hpe" = ( @@ -9453,11 +9376,7 @@ pixel_x = 8; pixel_y = -2 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood/fancy/cherry, /area/centcom/ss220/admin2) "huN" = ( @@ -9465,9 +9384,7 @@ /turf/simulated/floor/indestructible/grass/no_creep, /area/syndicate_mothership/outside) "hvm" = ( -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_elite) @@ -9772,9 +9689,7 @@ }, /area/syndicate_mothership/elite_squad) "hHE" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -10239,9 +10154,7 @@ }, /area/ninja/holding) "hYP" = ( -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/window/reinforced{ color = "red" }, @@ -10283,9 +10196,7 @@ /turf/simulated/wall/mineral/titanium/nodiagonal, /area/shuttle/trade/sol) "iaF" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/wood/fancy/birch, /area/shuttle/trade/sol) "ibG" = ( @@ -10307,10 +10218,7 @@ }, /area/centcom/ss220/general) "icT" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -30 }, @@ -10686,9 +10594,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/machinery/airlock_controller/air_cycler{ pixel_x = -25; req_access_txt = "150"; @@ -10882,9 +10788,7 @@ /obj/structure/light_fake{ dir = 8 }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, +/obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) "ivH" = ( @@ -10898,12 +10802,8 @@ }, /area/shuttle/escape) "ivP" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -11094,9 +10994,7 @@ /area/centcom/ss220/bar) "iFH" = ( /obj/item/kirbyplants, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/shuttle/escape) "iGx" = ( @@ -11882,9 +11780,7 @@ /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = 32 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkyellow" @@ -12421,10 +12317,7 @@ /obj/item/circular_saw, /obj/item/surgicaldrill, /obj/item/clothing/gloves/color/latex/nitrile, -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /turf/simulated/floor/mineral/titanium, /area/shuttle/syndicate) "jOk" = ( @@ -12441,10 +12334,7 @@ /area/centcom/ss220/bar) "jPg" = ( /obj/machinery/photocopier, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/light_fake/spot{ dir = 1 }, @@ -12724,7 +12614,7 @@ /obj/structure/table/reinforced, /obj/item/storage/backpack/medic, /obj/item/storage/belt/medical, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -12868,9 +12758,7 @@ /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) "kmE" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel, /area/centcom/ss220/evac) "kni" = ( @@ -13322,10 +13210,7 @@ }, /area/syndicate_mothership) "kFK" = ( -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -13 - }, +/obj/structure/sink/kitchen/west, /turf/simulated/floor/plating{ icon = 'icons/turf/floors.dmi'; icon_state = "elevatorshaft"; @@ -13377,11 +13262,7 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/supply) "kIl" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/light_fake/spot{ dir = 8 }, @@ -13446,9 +13327,7 @@ /area/centcom/ss220/admin3) "kJF" = ( /obj/machinery/optable, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/mineral/titanium, /area/shuttle/syndicate) "kKp" = ( @@ -13567,10 +13446,9 @@ layer = 3; name = "Склад" }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/north{ id = "CC_Cargo"; name = "Blast Door Control"; - pixel_y = 24; req_one_access_txt = "106" }, /turf/simulated/floor/plasteel/dark, @@ -13735,9 +13613,7 @@ pixel_y = 6 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/syndicate) "ldu" = ( @@ -13875,9 +13751,7 @@ /turf/simulated/floor/plasteel/dark, /area/shuttle/administration) "ljK" = ( -/obj/machinery/status_display/supply_display{ - pixel_x = 32 - }, +/obj/machinery/status_display/supply_display/east, /turf/simulated/floor/carpet/black, /area/centcom/ss220/admin2) "ljX" = ( @@ -14280,11 +14154,7 @@ pixel_x = -8; pixel_y = -2 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood/fancy/cherry, /area/centcom/ss220/admin2) "lwp" = ( @@ -14541,19 +14411,17 @@ /area/centcom/ss220/bar) "lGW" = ( /obj/item/flag/solgov, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "soltrader_north"; name = "Trade Deposits Door"; normaldoorcontrol = 1; - pixel_x = 24; pixel_y = 8; req_access_txt = "160"; req_one_access_txt = "160" }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "trader_privacy"; name = "Privacy Shutters Control"; - pixel_x = 24; pixel_y = -8; req_access_txt = "160"; req_one_access_txt = "160" @@ -16509,9 +16377,7 @@ /turf/simulated/floor/plating/airless, /area/shuttle/administration) "nfG" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 32 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/box, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/syndicate) @@ -16852,10 +16718,9 @@ pixel_x = 8; pixel_y = 5 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/south{ id = "CC_Armory_Advanced"; name = "Оружейная - Дополнительный аренал"; - pixel_y = -24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -17033,10 +16898,7 @@ }, /area/centcom/ss220/admin3) "nCV" = ( -/obj/structure/extinguisher_cabinet{ - name = "east bump"; - pixel_x = 24 - }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/light_fake/spot{ dir = 4 }, @@ -17053,12 +16915,8 @@ /area/shuttle/specops) "nDq" = ( /obj/item/kirbyplants, -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -17106,10 +16964,7 @@ /obj/structure/mirror{ pixel_x = -30 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -17128,10 +16983,9 @@ }, /area/centcom/ss220/admin2) "nGg" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "CC_Armory"; name = "Оружейная"; - pixel_x = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -17255,10 +17109,7 @@ }, /area/syndicate_mothership/control) "nLF" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, +/obj/structure/sink/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -17417,9 +17268,7 @@ /area/syndicate_mothership/control) "nSl" = ( /obj/structure/table/wood/fancy/red, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet/royalblue, /area/shuttle/trade/sol) "nSN" = ( @@ -17810,11 +17659,10 @@ }, /area/centcom/ss220/evac) "onI" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "cc_toilet_3"; name = "Door Bolt Control"; normaldoorcontrol = 1; - pixel_x = -24; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -17842,7 +17690,7 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -18197,11 +18045,9 @@ }, /area/centcom/ss220/admin3) "oCU" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/recharge_station, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -18408,9 +18254,7 @@ /obj/structure/chair/comfy/shuttle/dark{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -19008,7 +18852,7 @@ /turf/simulated/floor/carpet/black, /area/centcom/ss220/evac) "pmM" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/stripes/line, /obj/machinery/economy/vending/wallmed/syndicate{ pixel_y = -30 @@ -19082,10 +18926,7 @@ /area/centcom/ss220/general) "pqS" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, +/obj/machinery/status_display/directional/north, /obj/machinery/light/spot{ dir = 8 }, @@ -19209,11 +19050,10 @@ /obj/item/grenade/clusterbuster/emp{ pixel_y = 4 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/north{ color = "#ffbf80"; id = "CC_Armory_Epsilon"; name = "Оружейная - Уровень 4"; - pixel_y = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -19327,10 +19167,9 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/admin1) "pzN" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "CC_Armory"; name = "Оружейная"; - pixel_x = -24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -19390,7 +19229,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -20079,16 +19918,14 @@ /turf/simulated/floor/carpet/arcade, /area/centcom/ss220/bar) "qem" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "СС_Jail_1"; name = "Камера 1"; - pixel_x = 24; pixel_y = 6 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "СС_Jail_2"; name = "Камера 2"; - pixel_x = 24; pixel_y = -6 }, /turf/simulated/floor/plasteel/dark{ @@ -20233,10 +20070,9 @@ "qld" = ( /obj/structure/bookcase/manuals, /obj/item/book/manual/wiki/sop_legal, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/north{ id = "СС_Office_COO"; name = "Открыть створки"; - pixel_y = 24; req_one_access_txt = "114" }, /turf/simulated/floor/wood/fancy/cherry, @@ -21064,8 +20900,7 @@ }, /area/shuttle/escape) "qTE" = ( -/obj/machinery/door_control/no_emag{ - pixel_y = -24; +/obj/machinery/door_control/no_emag/south{ id = "SST_armory_mech_maintenance"; wires = 1; req_access_txt = "153"; @@ -21139,16 +20974,14 @@ /turf/simulated/floor/wood, /area/wizard_station) "qXJ" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "СС_Jail_4"; name = "Камера 4"; - pixel_x = 24; pixel_y = -6 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "СС_Jail_3"; name = "Камера 3"; - pixel_x = 24; pixel_y = 6 }, /turf/simulated/floor/plasteel/dark{ @@ -21258,10 +21091,9 @@ layer = 3; name = "Тебе скорее всего сюда нельзя, увы." }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "СС_Office_Armory"; name = "Blast Door Open"; - pixel_x = -24; req_one_access_txt = "114" }, /turf/simulated/floor/wood/fancy/cherry, @@ -21291,10 +21123,7 @@ id = "syndie_FB_cells"; pixel_y = -24 }, -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blackfull" }, @@ -21331,9 +21160,7 @@ /turf/simulated/floor/plating, /area/shuttle/syndicate_elite) "rfO" = ( -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = 32 - }, +/obj/structure/reagent_dispensers/fueltank/chem/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowaltstrip" @@ -21612,9 +21439,7 @@ /area/syndicate_mothership/elite_squad) "rsA" = ( /obj/machinery/teleport/station, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/syndicate) "rsG" = ( @@ -22049,11 +21874,10 @@ }, /area/syndicate_mothership/control) "rER" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ color = "#ffbf80"; id = "CC_DeathSquad"; name = "Blast Door Control"; - pixel_x = 24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark{ @@ -22420,9 +22244,7 @@ }, /area/syndicate_mothership/cargo) "rTO" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/structure/chair/sofa/bench, /turf/simulated/floor/plasteel{ icon_state = "darkjail" @@ -22658,11 +22480,10 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/supply) "sbF" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "cc_toilet_2"; name = "Door Bolt Control"; normaldoorcontrol = 1; - pixel_x = -24; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -22802,18 +22623,16 @@ /obj/machinery/computer/supplycomp{ dir = 8 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; - pixel_x = 24; pixel_y = -8 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "QMLoaddoor"; layer = 4; name = "Loading Doors"; - pixel_x = 24; pixel_y = 8 }, /turf/simulated/floor/plasteel/dark, @@ -22951,9 +22770,7 @@ }, /area/centcom/ss220/admin3) "smv" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/dark, /area/shuttle/administration) "snz" = ( @@ -23183,9 +23000,7 @@ /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 }, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -23223,10 +23038,9 @@ id_tag = "СС_BD_Exterior_1"; layer = 3 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "СС_BD_Exterior_1"; name = "Blast Door Open"; - pixel_x = -24; req_one_access_txt = "101" }, /obj/machinery/door/airlock/centcom{ @@ -23434,10 +23248,9 @@ id_tag = "СС_BD_Interior_1"; layer = 3 }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "СС_BD_Interior_1"; name = "Blast Door Open"; - pixel_x = -24; req_one_access_txt = "101" }, /obj/machinery/door/airlock/centcom{ @@ -23572,7 +23385,7 @@ }, /area/syndicate_mothership/control) "sPz" = ( -/obj/machinery/light/small, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "sQk" = ( @@ -23633,10 +23446,7 @@ }, /area/syndicate_mothership/outside) "sUd" = ( -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -24 - }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, /obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -6; @@ -23699,10 +23509,7 @@ id = "syndie_FB_cells"; pixel_y = -24 }, -/obj/structure/sink{ - dir = 1; - pixel_y = -4 - }, +/obj/structure/sink/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blackfull" }, @@ -23888,9 +23695,7 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -24147,9 +23952,7 @@ }, /area/syndicate_mothership/jail) "tqQ" = ( -/obj/structure/sink{ - pixel_y = 32 - }, +/obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -24187,19 +23990,17 @@ /area/syndicate_mothership) "tse" = ( /obj/item/flag/solgov, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "trader_privacy"; name = "Privacy Shutters Control"; - pixel_x = 24; pixel_y = 8; req_access_txt = "160"; req_one_access_txt = "160" }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "soltrader_south"; name = "Trade Deposits Door"; normaldoorcontrol = 1; - pixel_x = 24; pixel_y = -8; req_access_txt = "160"; req_one_access_txt = "160" @@ -24556,8 +24357,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) "tIq" = ( -/obj/machinery/door_control/no_emag{ - pixel_y = -24; +/obj/machinery/door_control/no_emag/south{ emagged = 1; wires = 1; req_access_txt = "153"; @@ -24777,10 +24577,9 @@ layer = 3; name = "Тебе скорее всего сюда нельзя, увы." }, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "СС_Office_COO_Door"; name = "Blast Door Open"; - pixel_x = -24; req_one_access_txt = "114" }, /turf/simulated/floor/wood/fancy/cherry, @@ -24943,9 +24742,7 @@ /obj/structure/light_fake/small{ dir = 1 }, -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, +/obj/structure/sign/poster/contraband/random/north, /obj/structure/statue/sandstone/assistant{ anchored = 1; desc = "Он точно не спит на посту"; @@ -25770,9 +25567,7 @@ /obj/machinery/recharger/wallcharger{ pixel_x = 30 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/syndicate) "uGb" = ( @@ -25836,12 +25631,7 @@ /turf/simulated/floor/wood, /area/wizard_station) "uJb" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 - }, +/obj/structure/sink/kitchen/west, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -26000,9 +25790,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 8 }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, +/obj/structure/sign/poster/contraband/random/east, /obj/effect/landmark/spawner/prisonsecuritywarp, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) @@ -26042,10 +25830,9 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) "uOS" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/south{ id = "CC_Armory_Advanced_2"; name = "Огнестрел"; - pixel_y = -24; req_one_access_txt = "114" }, /turf/simulated/floor/plasteel/dark, @@ -26068,10 +25855,7 @@ /turf/simulated/floor/carpet/blue, /area/centcom/ss220/general) "uQo" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/simulated/floor/plasteel, /area/centcom/ss220/evac) "uRt" = ( @@ -26224,9 +26008,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26448,9 +26230,7 @@ /area/shuttle/escape) "vik" = ( /obj/item/flag/solgov, -/obj/machinery/economy/vending/wallmed{ - pixel_y = 32 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/light_fake{ dir = 1 }, @@ -26881,9 +26661,7 @@ }, /area/syndicate_mothership) "vwY" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/shuttle/administration) "vxx" = ( @@ -27203,9 +26981,7 @@ /obj/structure/sign/poster/contraband/syndicate_pistol{ pixel_y = 32 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "vNu" = ( @@ -27226,10 +27002,9 @@ /turf/simulated/floor/plating, /area/shuttle/administration) "vNO" = ( -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/west{ id = "sec"; name = "CentCom Security Shutters"; - pixel_x = -24; req_one_access_txt = "101" }, /turf/simulated/floor/plasteel/dark, @@ -27320,10 +27095,7 @@ }, /area/centcom/ss220/bar) "vPR" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror{ pixel_x = -26 }, @@ -27526,10 +27298,9 @@ req_one_access_txt = "114" }, /obj/effect/decal/warning_stripes/red, -/obj/machinery/door_control/no_emag{ +/obj/machinery/door_control/no_emag/east{ id = "CC_BSA"; name = "Blast Door Control"; - pixel_x = 24; req_one_access_txt = "114" }, /obj/machinery/door/poddoor/impassable{ @@ -28208,9 +27979,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -28601,9 +28370,7 @@ "wSY" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, -/obj/machinery/light{ - dir = 8 - }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" diff --git a/modular_ss220/maps220/_maps220.dme b/modular_ss220/maps220/_maps220.dme index f7195591cfce..062c6ae5b387 100644 --- a/modular_ss220/maps220/_maps220.dme +++ b/modular_ss220/maps220/_maps220.dme @@ -8,6 +8,7 @@ #include "code/Station/cyberiad.dm" #include "code/Station/delta.dm" #include "code/corpses.dm" +#include "code/directions.dm" #include "code/helpers.dm" #include "code/misc.dm" #include "code/mobs.dm" diff --git a/modular_ss220/maps220/code/directions.dm b/modular_ss220/maps220/code/directions.dm new file mode 100644 index 000000000000..4e54faf50563 --- /dev/null +++ b/modular_ss220/maps220/code/directions.dm @@ -0,0 +1,634 @@ +/* Intercom */ +/obj/item/radio/intercom/directional + name = "\improper station intercom" + +/obj/item/radio/intercom/directional/south + pixel_y = -22 + dir = 1 + +/obj/item/radio/intercom/directional/north + pixel_y = 22 + +/obj/item/radio/intercom/directional/west + pixel_x = -22 + dir = 4 + +/obj/item/radio/intercom/directional/east + pixel_x = 22 + dir = 8 + +/* WallMed */ +/obj/machinery/economy/vending/wallmed/directional + name = "\improper Emergency NanoMed" + +/obj/machinery/economy/vending/wallmed/directional/south + pixel_y = -32 + +/obj/machinery/economy/vending/wallmed/directional/north + pixel_y = 32 + +/obj/machinery/economy/vending/wallmed/directional/west + pixel_x = -25 + +/obj/machinery/economy/vending/wallmed/directional/east + pixel_x = 24 + +/* Air Alarm */ +/obj/machinery/alarm/directional + name = "\improper air alarm" + +/obj/machinery/alarm/directional/south + pixel_y = -24 + dir = 1 + +/obj/machinery/alarm/directional/north + pixel_y = 24 + +/obj/machinery/alarm/directional/west + pixel_x = -24 + dir = 4 + +/obj/machinery/alarm/directional/east + pixel_x = 24 + dir = 8 + +/* Fire Alarm */ +/obj/machinery/firealarm/directional + name = "\improper fire alarm" + +/obj/machinery/firealarm/directional/south + pixel_y = -24 + dir = 1 + +/obj/machinery/firealarm/directional/north + pixel_y = 24 + +/obj/machinery/firealarm/directional/west + pixel_x = -24 + dir = 8 + +/obj/machinery/firealarm/directional/east + pixel_x = 24 + dir = 4 + +/obj/machinery/firealarm/no_alarm + name = "\improper fire alarm" + +/obj/machinery/firealarm/no_alarm/south + pixel_y = -24 + dir = 1 + +/obj/machinery/firealarm/no_alarm/north + pixel_y = 24 + +/obj/machinery/firealarm/no_alarm/west + pixel_x = -24 + dir = 4 + +/obj/machinery/firealarm/no_alarm/east + pixel_x = 24 + dir = 8 + +/* Light Switch */ +/obj/machinery/light_switch + name = "\improper light switch" + +/obj/machinery/light_switch/south + pixel_y = -24 + dir = 1 + +/obj/machinery/light_switch/north + pixel_y = 24 + +/obj/machinery/light_switch/west + pixel_x = -24 + dir = 4 + +/obj/machinery/light_switch/east + pixel_x = 24 + dir = 8 + +/obj/machinery/holosign_switch + name = "\improper holosign switch" + +/obj/machinery/holosign_switch/south + pixel_y = -24 + dir = 1 + +/obj/machinery/holosign_switch/north + pixel_y = 24 + +/obj/machinery/holosign_switch/west + pixel_x = -24 + dir = 4 + +/obj/machinery/holosign_switch/east + pixel_x = 24 + dir = 8 + +/* Keycard Authentication Device */ +/obj/machinery/keycard_auth + name = "\improper Keycard Authentication Device" + +/obj/machinery/keycard_auth/south + pixel_y = -24 + dir = 1 + +/obj/machinery/keycard_auth/north + pixel_y = 24 + +/obj/machinery/keycard_auth/west + pixel_x = -24 + dir = 4 + +/obj/machinery/keycard_auth/east + pixel_x = 24 + dir = 8 + +/* Buttons */ +/obj/machinery/door_control/bolt_control + name = "\improper Door Bolt Control" + normaldoorcontrol = 1 + specialfunctions = 4 + +/obj/machinery/door_control/bolt_control/south + pixel_y = -24 + dir = 1 + +/obj/machinery/door_control/bolt_control/north + pixel_y = 24 + +/obj/machinery/door_control/bolt_control/west + pixel_x = -24 + dir = 4 + +/obj/machinery/door_control/bolt_control/east + pixel_x = 24 + dir = 8 + +/obj/machinery/door_control/normal + name = "\improper Door Control" + normaldoorcontrol = 1 + +/obj/machinery/door_control/normal/south + pixel_y = -24 + dir = 1 + +/obj/machinery/door_control/normal/north + pixel_y = 24 + +/obj/machinery/door_control/normal/west + pixel_x = -24 + dir = 4 + +/obj/machinery/door_control/normal/east + pixel_x = 24 + dir = 8 + +/obj/machinery/door_control/shutter + name = "\improper Shutters Control" + +/obj/machinery/door_control/shutter/south + pixel_y = -24 + dir = 1 + +/obj/machinery/door_control/shutter/north + pixel_y = 24 + +/obj/machinery/door_control/shutter/west + pixel_x = -24 + dir = 4 + +/obj/machinery/door_control/shutter/east + pixel_x = 24 + dir = 8 + +/obj/machinery/door_control/no_emag + name = "\improper Door Bolt Control (Secured)" + +/obj/machinery/door_control/no_emag/south + pixel_y = -24 + dir = 1 + +/obj/machinery/door_control/no_emag/north + pixel_y = 24 + +/obj/machinery/door_control/no_emag/west + pixel_x = -24 + dir = 4 + +/obj/machinery/door_control/no_emag/east + pixel_x = 24 + dir = 8 + +/obj/machinery/button/windowtint + name = "\improper Window Tint Control" + +/obj/machinery/button/windowtint/south + pixel_y = -24 + dir = 1 + +/obj/machinery/button/windowtint/north + pixel_y = 24 + +/obj/machinery/button/windowtint/west + pixel_x = -24 + dir = 4 + +/obj/machinery/button/windowtint/east + pixel_x = 24 + dir = 8 + +/* Light Fixtures */ +/obj/machinery/light/directional + name = "\improper light fixture" + +/obj/machinery/light/directional/south + dir = 1 + +/obj/machinery/light/directional/north + +/obj/machinery/light/directional/west + dir = 4 + +/obj/machinery/light/directional/east + dir = 8 + +/obj/machinery/light/built + name = "\improper light fixture" + +/obj/machinery/light/built/south + dir = 1 + +/obj/machinery/light/built/north + +/obj/machinery/light/built/west + dir = 4 + +/obj/machinery/light/built/east + dir = 8 + +/obj/machinery/light/small/directional + name = "\improper light fixture" + +/obj/machinery/light/small/directional/south + dir = 1 + +/obj/machinery/light/small/directional/north + +/obj/machinery/light/small/directional/west + dir = 4 + +/obj/machinery/light/small/directional/east + dir = 8 + +/obj/machinery/light/small/built + name = "\improper light fixture" + +/obj/machinery/light/small/built/south + dir = 1 + +/obj/machinery/light/small/built/north + +/obj/machinery/light/small/built/west + dir = 4 + +/obj/machinery/light/small/built/east + dir = 8 + +/obj/machinery/light_construct/directional + name = "\improper light fixture frame" + +/obj/machinery/light_construct/directional/south + dir = 1 + +/obj/machinery/light_construct/directional/north + +/obj/machinery/light_construct/directional/west + dir = 4 + +/obj/machinery/light_construct/directional/east + dir = 8 + +/obj/machinery/light_construct/small/south + dir = 1 + +/obj/machinery/light_construct/small/north + +/obj/machinery/light_construct/small/west + dir = 4 + +/obj/machinery/light_construct/small/east + dir = 8 + +/* Extinguisher */ +/obj/structure/extinguisher_cabinet/directional + name = "\improper extinguisher cabinet" + +/obj/structure/extinguisher_cabinet/directional/south + pixel_y = -32 + dir = 1 + +/obj/structure/extinguisher_cabinet/directional/north + pixel_y = 32 + +/obj/structure/extinguisher_cabinet/directional/west + pixel_x = -24 + dir = 4 + +/obj/structure/extinguisher_cabinet/directional/east + pixel_x = 24 + dir = 8 + +/obj/structure/extinguisher_cabinet/empty/south + pixel_y = -32 + dir = 1 + +/obj/structure/extinguisher_cabinet/empty/north + pixel_y = 32 + +/obj/structure/extinguisher_cabinet/empty/west + pixel_x = -24 + dir = 4 + +/obj/structure/extinguisher_cabinet/empty/east + pixel_x = 24 + dir = 8 + +/* APC */ +/obj/machinery/power/apc/directional + name = "\improper Area Power Controller" + +/obj/machinery/power/apc/directional/south + pixel_y = -24 + +/obj/machinery/power/apc/directional/north + pixel_y = 24 + dir = 1 + +/obj/machinery/power/apc/directional/west + pixel_x = -24 + dir = 8 + +/obj/machinery/power/apc/directional/east + pixel_x = 24 + dir = 4 + +/obj/machinery/power/apc/engie + name = "\improper Engineering APC" + cell_type = 25000 + shock_proof = TRUE + +/obj/machinery/power/apc/engie/south + pixel_y = -24 + +/obj/machinery/power/apc/engie/north + pixel_y = 24 + dir = 1 + +/obj/machinery/power/apc/engie/west + pixel_x = -24 + dir = 8 + +/obj/machinery/power/apc/engie/east + pixel_x = 24 + dir = 4 + +/obj/machinery/power/apc/worn_out/south + pixel_y = -24 + +/obj/machinery/power/apc/worn_out/north + pixel_y = 24 + dir = 1 + +/obj/machinery/power/apc/worn_out/west + pixel_x = -24 + dir = 8 + +/obj/machinery/power/apc/worn_out/east + pixel_x = 24 + dir = 4 + +/* Wall Tanks */ +/obj/structure/reagent_dispensers/fueltank/chem + name = "\improper fuel tank" + +/obj/structure/reagent_dispensers/fueltank/chem/south + pixel_y = -32 + dir = 1 + +/obj/structure/reagent_dispensers/fueltank/chem/north + pixel_y = 32 + +/obj/structure/reagent_dispensers/fueltank/chem/west + pixel_x = -32 + dir = 4 + +/obj/structure/reagent_dispensers/fueltank/chem/east + pixel_x = 32 + dir = 8 + +/obj/structure/reagent_dispensers/virusfood + name = "\improper virus food dispenser" + +/obj/structure/reagent_dispensers/virusfood/south + pixel_y = -32 + dir = 1 + +/obj/structure/reagent_dispensers/virusfood/north + pixel_y = 32 + +/obj/structure/reagent_dispensers/virusfood/west + pixel_x = -32 + dir = 4 + +/obj/structure/reagent_dispensers/virusfood/east + pixel_x = 32 + dir = 8 + +/obj/structure/reagent_dispensers/spacecleanertank + name = "\improper space cleaner refiller" + +/obj/structure/reagent_dispensers/spacecleanertank/south + pixel_y = -32 + dir = 1 + +/obj/structure/reagent_dispensers/spacecleanertank/north + pixel_y = 32 + +/obj/structure/reagent_dispensers/spacecleanertank/west + pixel_x = -32 + dir = 4 + +/obj/structure/reagent_dispensers/spacecleanertank/east + pixel_x = 32 + dir = 8 + +/obj/structure/reagent_dispensers/peppertank + name = "\improper pepper spray refiller" + +/obj/structure/reagent_dispensers/peppertank/south + pixel_y = -32 + dir = 1 + +/obj/structure/reagent_dispensers/peppertank/north + pixel_y = 32 + +/obj/structure/reagent_dispensers/peppertank/west + pixel_x = -32 + dir = 4 + +/obj/structure/reagent_dispensers/peppertank/east + pixel_x = 32 + dir = 8 + +/* NewsCaster */ +/obj/machinery/newscaster/directional + name = "\improper newscaster" + +/obj/machinery/newscaster/directional/south + pixel_y = -28 + dir = 1 + +/obj/machinery/newscaster/directional/north + pixel_y = 28 + +/obj/machinery/newscaster/directional/west + pixel_x = -28 + dir = 4 + +/obj/machinery/newscaster/directional/east + pixel_x = 28 + dir = 8 + +/obj/machinery/newscaster/security_unit + name = "\improper security newscaster" + +/obj/machinery/newscaster/security_unit/south + pixel_y = -28 + dir = 1 + +/obj/machinery/newscaster/security_unit/north + pixel_y = 28 + +/obj/machinery/newscaster/security_unit/west + pixel_x = -28 + dir = 4 + +/obj/machinery/newscaster/security_unit/east + pixel_x = 28 + dir = 8 + +/* Sinks */ +/obj/structure/sink/directional + name = "\improper sink" + +/obj/structure/sink/directional/south + pixel_y = -4 + dir = 1 + +/obj/structure/sink/directional/north + pixel_y = 18 + +/obj/structure/sink/directional/west + pixel_x = 12 + dir = 4 + +/obj/structure/sink/directional/east + pixel_x = -12 + dir = 8 + +/obj/structure/sink/kitchen/south + pixel_y = -4 + dir = 1 + +/obj/structure/sink/kitchen/north + pixel_y = 18 + +/obj/structure/sink/kitchen/west + pixel_x = -11 + dir = 4 + +/obj/structure/sink/kitchen/east + pixel_x = 11 + dir = 8 + +/* Posters */ +/obj/structure/sign/poster/contraband/random/south + pixel_y = -32 + +/obj/structure/sign/poster/contraband/random/north + pixel_y = 32 + +/obj/structure/sign/poster/contraband/random/west + pixel_x = -32 + +/obj/structure/sign/poster/contraband/random/east + pixel_x = 32 + +/obj/structure/sign/poster/official/random/south + pixel_y = -32 + +/obj/structure/sign/poster/official/random/north + pixel_y = 32 + +/obj/structure/sign/poster/official/random/west + pixel_x = -32 + +/obj/structure/sign/poster/official/random/east + pixel_x = 32 + +/* Displays */ +/obj/machinery/status_display/directional + name = "\improper status display" + +/obj/machinery/status_display/directional/south + pixel_y = -32 + +/obj/machinery/status_display/directional/north + pixel_y = 32 + +/obj/machinery/status_display/directional/west + pixel_x = -32 + +/obj/machinery/status_display/directional/east + pixel_x = 32 + +/obj/machinery/status_display/supply_display/south + pixel_y = -32 + +/obj/machinery/status_display/supply_display/north + pixel_y = 32 + +/obj/machinery/status_display/supply_display/west + pixel_x = -32 + +/obj/machinery/status_display/supply_display/east + pixel_x = 32 + +/obj/machinery/ai_status_display/south + pixel_y = -32 + +/obj/machinery/ai_status_display/north + pixel_y = 32 + +/obj/machinery/ai_status_display/west + pixel_x = -32 + +/obj/machinery/ai_status_display/east + pixel_x = 32 + +/obj/machinery/computer/security/telescreen/entertainment/directional + name = "\improper entertainment monitor" + +/obj/machinery/computer/security/telescreen/entertainment/directional/south + pixel_y = -32 + +/obj/machinery/computer/security/telescreen/entertainment/directional/north + pixel_y = 32 + +/obj/machinery/computer/security/telescreen/entertainment/directional/west + pixel_x = -32 + +/obj/machinery/computer/security/telescreen/entertainment/directional/east + pixel_x = 32 diff --git a/tools/UpdatePaths/dir_subtypes.txt b/tools/UpdatePaths/dir_subtypes.txt new file mode 100644 index 000000000000..7c2caead2f1e --- /dev/null +++ b/tools/UpdatePaths/dir_subtypes.txt @@ -0,0 +1,424 @@ +/obj/item/radio/intercom {dir=1;name="south bump";pixel_y=-22} : /obj/item/radio/intercom/directional/south +/obj/item/radio/intercom {name="north bump";pixel_y=22} : /obj/item/radio/intercom/directional/north +/obj/item/radio/intercom {dir=4;name="west bump";pixel_x=-22} : /obj/item/radio/intercom/directional/west +/obj/item/radio/intercom {dir=8;name="east bump";pixel_x=22} : /obj/item/radio/intercom/directional/east +/obj/item/radio/intercom {name="custom placement"} : /obj/item/radio/intercom + +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_y=-32} : /obj/machinery/economy/vending/wallmed/directional/south +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_y=-28} : /obj/machinery/economy/vending/wallmed/directional/south +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_y=32} : /obj/machinery/economy/vending/wallmed/directional/north +/obj/machinery/economy/vending/wallmed {pixel_y=32} : /obj/machinery/economy/vending/wallmed/directional/north +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_y=28} : /obj/machinery/economy/vending/wallmed/directional/north +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_x=-28} : /obj/machinery/economy/vending/wallmed/directional/west +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_x=28} : /obj/machinery/economy/vending/wallmed/directional/east +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_x=-25} : /obj/machinery/economy/vending/wallmed/directional/west +/obj/machinery/economy/vending/wallmed {name="Emergency NanoMed";pixel_x=28;layer=3.3} : /obj/machinery/economy/vending/wallmed/directional/east + +/obj/machinery/alarm {dir=1;name="south bump";pixel_y=-24} : /obj/machinery/alarm/directional/south +/obj/machinery/alarm {name="north bump";pixel_y=24} : /obj/machinery/alarm/directional/north +/obj/machinery/alarm {dir=4;name="west bump";pixel_x=-24} : /obj/machinery/alarm/directional/west +/obj/machinery/alarm {dir=8;name="east bump";pixel_x=24} : /obj/machinery/alarm/directional/east + +/obj/machinery/firealarm {dir=1;name="south bump";pixel_y=-24} : /obj/machinery/firealarm/directional/south +/obj/machinery/firealarm {name="north bump";pixel_y=24} : /obj/machinery/firealarm/directional/north +/obj/machinery/firealarm {dir=8;name="west bump";pixel_x=-24} : /obj/machinery/firealarm/directional/west +/obj/machinery/firealarm {dir=4;name="east bump";pixel_x=24} : /obj/machinery/firealarm/directional/east + +/obj/machinery/light_switch {dir=1;name="south bump";pixel_y=-24} : /obj/machinery/light_switch/south +/obj/machinery/light_switch {name="north bump";pixel_y=24} : /obj/machinery/light_switch/north +/obj/machinery/light_switch {name="custom placement";pixel_y=24} : /obj/machinery/light_switch/north {pixel_x=@OLD} +/obj/machinery/light_switch {dir=4;name="west bump";pixel_x=-24} : /obj/machinery/light_switch/west +/obj/machinery/light_switch {dir=1;name="west bump";pixel_x=-24} : /obj/machinery/light_switch/west +/obj/machinery/light_switch {dir=4;name="custom placement";pixel_x=-24} : /obj/machinery/light_switch/west {pixel_y=@OLD} +/obj/machinery/light_switch {dir=8;name="east bump";pixel_x=24} : /obj/machinery/light_switch/east +/obj/machinery/light_switch {dir=8;name="custom placement";pixel_x=24} : /obj/machinery/light_switch/east {pixel_y=@OLD} +/obj/machinery/light_switch {name="custom placement"} : /obj/machinery/light_switch + +/obj/machinery/keycard_auth {pixel_y=-24} : /obj/machinery/keycard_auth/south +/obj/machinery/keycard_auth {dir=1;pixel_y=-24} : /obj/machinery/keycard_auth/south +/obj/machinery/keycard_auth {dir=1;pixel_y=-24;pixel_x=-8} : /obj/machinery/keycard_auth/south {pixel_x=@OLD} +/obj/machinery/keycard_auth {pixel_y=-38} : /obj/machinery/keycard_auth/south +/obj/machinery/keycard_auth {pixel_y=-35} : /obj/machinery/keycard_auth/south +/obj/machinery/keycard_auth {pixel_y=-26} : /obj/machinery/keycard_auth/south +/obj/machinery/keycard_auth {pixel_y=24} : /obj/machinery/keycard_auth/north +/obj/machinery/keycard_auth {pixel_x=-24} : /obj/machinery/keycard_auth/west +/obj/machinery/keycard_auth {pixel_x=-24;pixel_y=4} : /obj/machinery/keycard_auth/west +/obj/machinery/keycard_auth {pixel_x=-28;pixel_y=2} : /obj/machinery/keycard_auth/west +/obj/machinery/keycard_auth {pixel_x=24} : /obj/machinery/keycard_auth/east +/obj/machinery/keycard_auth {pixel_x=24;pixel_y=-2} : /obj/machinery/keycard_auth/east + +/obj/machinery/light {dir=1} : /obj/machinery/light/directional/south {@OLD;dir=@SKIP} +/obj/machinery/light {dir=4} : /obj/machinery/light/directional/west {@OLD;dir=@SKIP} +/obj/machinery/light {dir=8} : /obj/machinery/light/directional/east {@OLD;dir=@SKIP} +/obj/machinery/light : /obj/machinery/light/directional/north {@OLD} + +/obj/machinery/light/small {dir=1} : /obj/machinery/light/small/directional/south {@OLD;dir=@SKIP} +/obj/machinery/light/small {dir=4} : /obj/machinery/light/small/directional/west {@OLD;dir=@SKIP} +/obj/machinery/light/small {dir=8} : /obj/machinery/light/small/directional/east {@OLD;dir=@SKIP} +/obj/machinery/light/small : /obj/machinery/light/small/directional/north {@OLD} + +/obj/machinery/light/small/built {dir=1} : /obj/machinery/light/small/built/south {@OLD;dir=@SKIP} +/obj/machinery/light/small/built {dir=4} : /obj/machinery/light/small/built/west {@OLD;dir=@SKIP} +/obj/machinery/light/small/built {dir=8} : /obj/machinery/light/small/built/east {@OLD;dir=@SKIP} +/obj/machinery/light/small/built : /obj/machinery/light/small/built/north {@OLD} + +/obj/machinery/light_construct {dir=1} : /obj/machinery/light_construct/directional/south {@OLD;dir=@SKIP} +/obj/machinery/light_construct {dir=4} : /obj/machinery/light_construct/directional/west {@OLD;dir=@SKIP} +/obj/machinery/light_construct {dir=8} : /obj/machinery/light_construct/directional/east {@OLD;dir=@SKIP} +/obj/machinery/light_construct : /obj/machinery/light_construct/directional/north {@OLD} + +/obj/machinery/light_construct/small {dir=1} : /obj/machinery/light_construct/small/south {@OLD;dir=@SKIP} +/obj/machinery/light_construct/small {dir=4} : /obj/machinery/light_construct/small/west {@OLD;dir=@SKIP} +/obj/machinery/light_construct/small {dir=8} : /obj/machinery/light_construct/small/east {@OLD;dir=@SKIP} +/obj/machinery/light_construct/small : /obj/machinery/light_construct/small/north {@OLD} + +/obj/structure/extinguisher_cabinet {name="south bump";pixel_y=-30} : /obj/structure/extinguisher_cabinet/directional/south +/obj/structure/extinguisher_cabinet {name="south bump";pixel_y=-32} : /obj/structure/extinguisher_cabinet/directional/south +/obj/structure/extinguisher_cabinet {name="north bump";pixel_y=30} : /obj/structure/extinguisher_cabinet/directional/north +/obj/structure/extinguisher_cabinet {name="north bump";pixel_y=32} : /obj/structure/extinguisher_cabinet/directional/north +/obj/structure/extinguisher_cabinet {name="west bump";pixel_x=-24} : /obj/structure/extinguisher_cabinet/directional/west +/obj/structure/extinguisher_cabinet {name="west bump";pixel_x=-27} : /obj/structure/extinguisher_cabinet/directional/west +/obj/structure/extinguisher_cabinet {name="west bump";pixel_x=-30} : /obj/structure/extinguisher_cabinet/directional/west +/obj/structure/extinguisher_cabinet {name="west bump";pixel_x=-28} : /obj/structure/extinguisher_cabinet/directional/west +/obj/structure/extinguisher_cabinet {pixel_x=-28} : /obj/structure/extinguisher_cabinet/directional/west +/obj/structure/extinguisher_cabinet {name="east bump";pixel_x=24} : /obj/structure/extinguisher_cabinet/directional/east +/obj/structure/extinguisher_cabinet {name="east bump";pixel_x=30} : /obj/structure/extinguisher_cabinet/directional/east +/obj/structure/extinguisher_cabinet {name="east bump";pixel_x=27} : /obj/structure/extinguisher_cabinet/directional/east +/obj/structure/extinguisher_cabinet {pixel_x=28} : /obj/structure/extinguisher_cabinet/directional/east +/obj/structure/extinguisher_cabinet {pixel_x=32} : /obj/structure/extinguisher_cabinet/directional/east +/obj/structure/extinguisher_cabinet {name="custom placement"} : /obj/structure/extinguisher_cabinet {@OLD;name=@DELETE} + +/obj/structure/reagent_dispensers/fueltank/chem {pixel_y=-32} : /obj/structure/reagent_dispensers/fueltank/chem/south +/obj/structure/reagent_dispensers/fueltank/chem {pixel_y=32} : /obj/structure/reagent_dispensers/fueltank/chem/north +/obj/structure/reagent_dispensers/fueltank/chem {pixel_x=-32} : /obj/structure/reagent_dispensers/fueltank/chem/west +/obj/structure/reagent_dispensers/fueltank/chem {pixel_x=32} : /obj/structure/reagent_dispensers/fueltank/chem/east + +/obj/structure/reagent_dispensers/virusfood {pixel_y=-32} : /obj/structure/reagent_dispensers/virusfood/south +/obj/structure/reagent_dispensers/virusfood {pixel_y=32} : /obj/structure/reagent_dispensers/virusfood/north +/obj/structure/reagent_dispensers/virusfood {pixel_x=-32} : /obj/structure/reagent_dispensers/virusfood/west +/obj/structure/reagent_dispensers/virusfood {pixel_x=32} : /obj/structure/reagent_dispensers/virusfood/east + +/obj/structure/reagent_dispensers/spacecleanertank {pixel_y=-32} : /obj/structure/reagent_dispensers/spacecleanertank/south +/obj/structure/reagent_dispensers/spacecleanertank {pixel_y=32} : /obj/structure/reagent_dispensers/spacecleanertank/north +/obj/structure/reagent_dispensers/spacecleanertank {pixel_y=30} : /obj/structure/reagent_dispensers/spacecleanertank/north +/obj/structure/reagent_dispensers/spacecleanertank {pixel_y=27} : /obj/structure/reagent_dispensers/spacecleanertank/north +/obj/structure/reagent_dispensers/spacecleanertank {pixel_x=-32} : /obj/structure/reagent_dispensers/spacecleanertank/west +/obj/structure/reagent_dispensers/spacecleanertank {pixel_x=32} : /obj/structure/reagent_dispensers/spacecleanertank/east + +/obj/structure/reagent_dispensers/peppertank {pixel_y=-32} : /obj/structure/reagent_dispensers/peppertank/south +/obj/structure/reagent_dispensers/peppertank {pixel_y=32} : /obj/structure/reagent_dispensers/peppertank/north +/obj/structure/reagent_dispensers/peppertank {pixel_y=30} : /obj/structure/reagent_dispensers/peppertank/north +/obj/structure/reagent_dispensers/peppertank {pixel_x=-32} : /obj/structure/reagent_dispensers/peppertank/west +/obj/structure/reagent_dispensers/peppertank {pixel_x=32} : /obj/structure/reagent_dispensers/peppertank/east + +/obj/machinery/newscaster {dir=1;name="south bump";pixel_y=-28} : /obj/machinery/newscaster/directional/south +/obj/machinery/newscaster {name="north bump";pixel_y=28} : /obj/machinery/newscaster/directional/north +/obj/machinery/newscaster {dir=4;name="west bump";pixel_x=-28} : /obj/machinery/newscaster/directional/west +/obj/machinery/newscaster {dir=8;name="east bump";pixel_x=28} : /obj/machinery/newscaster/directional/east + +/obj/machinery/newscaster/security_unit {pixel_y=-28} : /obj/machinery/newscaster/security_unit/south +/obj/machinery/newscaster/security_unit {pixel_y=28} : /obj/machinery/newscaster/security_unit/north +/obj/machinery/newscaster/security_unit {pixel_x=-28} : /obj/machinery/newscaster/security_unit/west +/obj/machinery/newscaster/security_unit {pixel_x=28} : /obj/machinery/newscaster/security_unit/east + +/obj/structure/sink {dir=1;pixel_y=-4} : /obj/structure/sink/directional/south +/obj/structure/sink {dir=1;pixel_y=-10} : /obj/structure/sink/directional/south +/obj/structure/sink {pixel_y=18} : /obj/structure/sink/directional/north +/obj/structure/sink {pixel_y=25} : /obj/structure/sink/directional/north +/obj/structure/sink {pixel_y=32} : /obj/structure/sink/directional/north +/obj/structure/sink {pixel_y=22} : /obj/structure/sink/directional/north +/obj/structure/sink {dir=4;pixel_x=12} : /obj/structure/sink/directional/west +/obj/structure/sink {dir=4;pixel_x=11} : /obj/structure/sink/directional/west +/obj/structure/sink {dir=4;pixel_x=13} : /obj/structure/sink/directional/west +/obj/structure/sink {dir=8;pixel_x=-12} : /obj/structure/sink/directional/east +/obj/structure/sink {dir=8;pixel_x=-12;pixel_y=2} : /obj/structure/sink/directional/east + +/obj/structure/sink/kitchen {pixel_y=-28} : /obj/structure/sink/kitchen/south +/obj/structure/sink/kitchen {pixel_y=18} : /obj/structure/sink/kitchen/north +/obj/structure/sink/kitchen {pixel_y=25} : /obj/structure/sink/kitchen/north +/obj/structure/sink/kitchen {pixel_y=28} : /obj/structure/sink/kitchen/north +/obj/structure/sink/kitchen {pixel_x=-12} : /obj/structure/sink/kitchen/west +/obj/structure/sink/kitchen {pixel_x=-13} : /obj/structure/sink/kitchen/west +/obj/structure/sink/kitchen {pixel_x=28} : /obj/structure/sink/kitchen/east +/obj/structure/sink/kitchen {pixel_x=12} : /obj/structure/sink/kitchen/east + +/obj/structure/sign/poster/official/random {pixel_y=-32} : /obj/structure/sign/poster/official/random/south +/obj/structure/sign/poster/official/random {pixel_y=32} : /obj/structure/sign/poster/official/random/north +/obj/structure/sign/poster/official/random {pixel_x=-32} : /obj/structure/sign/poster/official/random/west +/obj/structure/sign/poster/official/random {pixel_x=32} : /obj/structure/sign/poster/official/random/east + +/obj/structure/sign/poster/contraband/random {pixel_y=-32} : /obj/structure/sign/poster/contraband/random/south +/obj/structure/sign/poster/contraband/random {pixel_y=32} : /obj/structure/sign/poster/contraband/random/north +/obj/structure/sign/poster/contraband/random {pixel_x=-32} : /obj/structure/sign/poster/contraband/random/west +/obj/structure/sign/poster/contraband/random {pixel_x=32} : /obj/structure/sign/poster/contraband/random/east + +/obj/machinery/status_display {pixel_y=-32} : /obj/machinery/status_display/directional/south +/obj/machinery/status_display {pixel_y=32} : /obj/machinery/status_display/directional/north +/obj/machinery/status_display {pixel_x=-32} : /obj/machinery/status_display/directional/west +/obj/machinery/status_display {pixel_x=32} : /obj/machinery/status_display/directional/east + +/obj/machinery/status_display/supply_display {pixel_y=-32} : /obj/machinery/status_display/supply_display/south +/obj/machinery/status_display/supply_display {pixel_y=32} : /obj/machinery/status_display/supply_display/north +/obj/machinery/status_display/supply_display {pixel_x=-32} : /obj/machinery/status_display/supply_display/west +/obj/machinery/status_display/supply_display {pixel_x=32} : /obj/machinery/status_display/supply_display/east + +/obj/machinery/ai_status_display {pixel_y=-32} : /obj/machinery/ai_status_display/south +/obj/machinery/ai_status_display {pixel_y=32} : /obj/machinery/ai_status_display/north +/obj/machinery/ai_status_display {pixel_x=-32} : /obj/machinery/ai_status_display/west +/obj/machinery/ai_status_display {pixel_x=32} : /obj/machinery/ai_status_display/east + +/obj/machinery/computer/security/telescreen/entertainment {pixel_y=-32} : /obj/machinery/computer/security/telescreen/entertainment/directional/south +/obj/machinery/computer/security/telescreen/entertainment {pixel_y=32} : /obj/machinery/computer/security/telescreen/entertainment/directional/north +/obj/machinery/computer/security/telescreen/entertainment {pixel_x=-32} : /obj/machinery/computer/security/telescreen/entertainment/directional/west +/obj/machinery/computer/security/telescreen/entertainment {pixel_x=32} : /obj/machinery/computer/security/telescreen/entertainment/directional/east + +/obj/machinery/door_control {pixel_y=-16;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-17;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-18;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-19;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-20;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-21;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-22;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-23;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-24;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-25;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-26;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-27;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-28;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-29;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-30;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-31;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-32;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-33;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-34;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-35;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/south {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=16;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=17;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=18;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=19;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=20;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=21;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=22;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=23;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=24;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=25;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=26;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=27;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=28;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=29;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=30;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=31;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=32;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=33;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=34;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=35;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/north {@OLD;pixel_y=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-16;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-17;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-18;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-19;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-20;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-21;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-22;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-23;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-24;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-25;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-26;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-27;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-28;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-29;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-30;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-31;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-32;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-33;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-34;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-35;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/west {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=16;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=17;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=18;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=19;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=20;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=21;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=22;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=23;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=24;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=25;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=26;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=27;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=28;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=29;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=30;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=31;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=32;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=33;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=34;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=35;specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control/east {@OLD;pixel_x=@SKIP;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {specialfunctions=4;normaldoorcontrol=1} : /obj/machinery/door_control/bolt_control {@OLD;name=@SKIP;specialfunctions=@SKIP;normaldoorcontrol=@SKIP} + +/obj/machinery/door_control {pixel_y=-16;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-17;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-18;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-19;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-20;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-21;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-22;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-23;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-24;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-25;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-26;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-27;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-28;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-29;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-30;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-31;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-32;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-33;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-34;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=-35;normaldoorcontrol=1} : /obj/machinery/door_control/normal/south {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=16;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=17;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=18;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=19;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=20;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=21;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=22;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=23;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=24;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=25;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=26;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=27;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=28;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=29;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=30;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=31;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=32;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=33;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=34;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_y=35;normaldoorcontrol=1} : /obj/machinery/door_control/normal/north {@OLD;pixel_y=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-16;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-17;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-18;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-19;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-20;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-21;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-22;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-23;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-24;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-25;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-26;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-27;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-28;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-29;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-30;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-31;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-32;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-33;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-34;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=-35;normaldoorcontrol=1} : /obj/machinery/door_control/normal/west {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=16;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=17;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=18;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=19;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=20;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=21;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=22;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=23;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=24;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=25;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=26;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=27;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=28;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=29;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=30;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=31;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=32;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=33;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=34;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {pixel_x=35;normaldoorcontrol=1} : /obj/machinery/door_control/normal/east {@OLD;pixel_x=@SKIP;normaldoorcontrol=@SKIP} +/obj/machinery/door_control {normaldoorcontrol=1} : /obj/machinery/door_control/normal {@OLD;normaldoorcontrol=@SKIP} + +/obj/machinery/door_control {pixel_y=-16} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-17} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-18} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-19} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-20} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-21} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-22} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-23} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-24} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-25} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-26} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-27} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-28} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-29} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-30} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-31} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-32} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-33} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-34} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=-35} : /obj/machinery/door_control/shutter/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=16} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=17} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=18} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=19} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=20} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=21} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=22} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=23} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=24} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=25} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=26} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=27} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=28} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=29} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=30} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=31} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=32} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=33} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=34} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_y=35} : /obj/machinery/door_control/shutter/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control {pixel_x=-16} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-17} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-18} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-19} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-20} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-21} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-22} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-23} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-24} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-25} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-26} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-27} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-28} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-29} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-30} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-31} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-32} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-33} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-34} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=-35} : /obj/machinery/door_control/shutter/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=16} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=17} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=18} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=19} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=20} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=21} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=22} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=23} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=24} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=25} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=26} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=27} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=28} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=29} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=30} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=31} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=32} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=33} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=34} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control {pixel_x=35} : /obj/machinery/door_control/shutter/east {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control : /obj/machinery/door_control/shutter {@OLD} + +/obj/machinery/door_control/no_emag {pixel_y=-24} : /obj/machinery/door_control/no_emag/south {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control/no_emag {pixel_y=24} : /obj/machinery/door_control/no_emag/north {@OLD;pixel_y=@SKIP} +/obj/machinery/door_control/no_emag {pixel_x=-24} : /obj/machinery/door_control/no_emag/west {@OLD;pixel_x=@SKIP} +/obj/machinery/door_control/no_emag {pixel_x=24} : /obj/machinery/door_control/no_emag/east {@OLD;pixel_x=@SKIP}