From fda697e2b5158c95d260530f1e9d1df1f031d09d Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Mon, 17 Jan 2022 20:18:00 +0000 Subject: [PATCH] [MDB Ignore] Makes maps comply with "[dir]_bump" standards (#17259) --- _maps/map_files/Delta/delta.dmm | 1837 +++++++++++----- _maps/map_files/MetaStation/MetaStation.dmm | 1882 +++++++++++------ .../LavaRuins/lavaland_biodome_beach.dmm | 1 + .../LavaRuins/lavaland_biodome_winter.dmm | 290 +-- .../lavaland_surface_animal_hospital.dmm | 4 +- .../LavaRuins/lavaland_surface_golem_ship.dmm | 2 + _maps/map_files/RandomRuins/SpaceRuins/dj.dmm | 5 + .../RandomRuins/SpaceRuins/oldstation.dmm | 18 + .../SpaceRuins/syndie_space_base.dmm | 3 + .../map_files/RandomRuins/SpaceRuins/ussp.dmm | 222 +- .../RandomRuins/SpaceRuins/whiteship.dmm | 10 +- _maps/map_files/RandomZLevels/academy.dmm | 56 +- .../RandomZLevels/blackmarketpackers.dmm | 250 ++- _maps/map_files/RandomZLevels/centcomAway.dmm | 4 +- .../map_files/RandomZLevels/moonoutpost19.dmm | 1673 ++++++--------- .../map_files/RandomZLevels/terrorspiders.dmm | 52 + .../RandomZLevels/undergroundoutpost45.dmm | 264 +-- _maps/map_files/cyberiad/cyberiad.dmm | 852 +++++++- _maps/map_files/generic/Lavaland.dmm | 45 +- _maps/map_files/generic/centcomm.dmm | 22 +- tools/mapmerge2/map_scripts/dirbump_part1.txt | 6 + tools/mapmerge2/map_scripts/dirbump_part2.txt | 24 + 22 files changed, 4508 insertions(+), 3014 deletions(-) create mode 100644 tools/mapmerge2/map_scripts/dirbump_part1.txt create mode 100644 tools/mapmerge2/map_scripts/dirbump_part2.txt diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index cb76c6fd08e..245b4452649 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -248,6 +248,7 @@ "adv" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -299,6 +300,7 @@ /area/hallway/secondary/entry) "adO" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -435,6 +437,7 @@ /area/shuttle/pod_4) "afa" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -508,6 +511,7 @@ /area/hallway/secondary/entry) "afn" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/cable{ @@ -1455,6 +1459,7 @@ "alR" = ( /obj/structure/chair/stool, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light/small{ @@ -1468,7 +1473,8 @@ "alS" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -1848,6 +1854,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -1958,6 +1965,7 @@ "anL" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2074,7 +2082,8 @@ /area/hallway/secondary/entry) "anX" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2089,6 +2098,7 @@ "anY" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -2134,7 +2144,8 @@ /obj/structure/table, /obj/random/toolbox, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -2152,7 +2163,8 @@ pixel_y = 25 }, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -2376,7 +2388,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -2396,7 +2409,8 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -2415,22 +2429,28 @@ "aoY" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/wood, /area/security/vacantoffice) "aoZ" = ( -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/security/vacantoffice) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/hallway/primary/fore) "apa" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, +/obj/machinery/light_switch{ + name = "north bump"; + pixel_y = 24 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -2480,12 +2500,18 @@ "apg" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 26 + 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 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "blue" @@ -2518,7 +2544,13 @@ "apl" = ( /obj/structure/filingcabinet, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 + }, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -2792,6 +2824,7 @@ /obj/structure/table, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/kitchen_machine/microwave, @@ -2802,10 +2835,6 @@ }, /area/maintenance/fore2) "apX" = ( -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2820,6 +2849,7 @@ "apY" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/cleanable/dirt, @@ -2916,10 +2946,6 @@ }, /area/security/customs) "aqh" = ( -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 26 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -3121,7 +3147,8 @@ /area/maintenance/fore) "aqI" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -3446,6 +3473,7 @@ "arA" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -3542,6 +3570,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/computer/card{ @@ -3702,6 +3731,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/computer/security{ @@ -4318,7 +4348,8 @@ /obj/structure/table/wood, /obj/item/phone, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4336,7 +4367,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4350,6 +4382,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -4393,6 +4426,7 @@ /obj/item/storage/secure/briefcase, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -4417,7 +4451,8 @@ "atB" = ( /obj/structure/filingcabinet, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -4427,6 +4462,7 @@ "atC" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/chair/comfy/brown{ @@ -4440,7 +4476,8 @@ "atD" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4451,6 +4488,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -4492,6 +4530,7 @@ "atI" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/closet/secure_closet/security, @@ -4716,6 +4755,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/circuitboard/microwave, @@ -4737,7 +4777,8 @@ "aui" = ( /obj/machinery/light/small, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4766,6 +4807,7 @@ /area/maintenance/electrical_shop) "auk" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/chair/stool, @@ -4806,7 +4848,8 @@ /obj/item/folder/red, /obj/item/lighter/zippo, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/wood, /area/maintenance/electrical_shop) @@ -5221,6 +5264,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/toy/flash, @@ -5989,6 +6033,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/clothing/suit/radiation, @@ -6357,6 +6402,7 @@ "axC" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable{ @@ -6469,6 +6515,7 @@ /area/engine/controlroom) "axN" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -6645,7 +6692,8 @@ /obj/item/storage/box/mousetraps, /obj/item/storage/box/mousetraps, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -6707,7 +6755,8 @@ /obj/item/hand_labeler, /obj/item/crowbar, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -7063,7 +7112,8 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -7211,6 +7261,7 @@ /area/quartermaster/sorting) "azD" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/cleanable/dirt, @@ -7257,6 +7308,7 @@ "azH" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -7315,6 +7367,7 @@ /obj/structure/table/reinforced, /obj/item/storage/box/lights/mixed, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -7565,6 +7618,7 @@ /obj/item/lightreplacer, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -7674,6 +7728,7 @@ "aAE" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -8127,6 +8182,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/sink{ @@ -8142,7 +8198,8 @@ "aBx" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/item/reagent_containers/glass/bucket, /obj/structure/janitorialcart, @@ -8178,7 +8235,8 @@ /obj/machinery/disposal, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -8241,6 +8299,7 @@ "aBG" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -8544,7 +8603,8 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/plating, @@ -9910,7 +9970,8 @@ /area/hallway/secondary/entry) "aFC" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -10022,7 +10083,8 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/assistant, @@ -10154,7 +10216,8 @@ /obj/structure/table/reinforced, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -10255,7 +10318,8 @@ "aGn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -10264,7 +10328,8 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -10317,11 +10382,13 @@ "aGv" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/bottler, /turf/simulated/floor/plasteel{ @@ -10377,13 +10444,15 @@ /obj/structure/table/wood, /obj/item/ammo_box/shotgun/beanbag, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 - }, -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 + name = "north bump"; + pixel_y = 30 }, /obj/item/gun/projectile/revolver/doublebarrel, +/obj/machinery/light_switch{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -10456,6 +10525,7 @@ "aGF" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/storage/fancy/cigarettes/cigpack_random{ @@ -10517,6 +10587,7 @@ "aGJ" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -10981,7 +11052,8 @@ /area/hallway/primary/central/nw) "aHR" = ( /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -11075,6 +11147,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/chair/sofa, @@ -11086,7 +11159,8 @@ "aIc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -11101,7 +11175,8 @@ "aId" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -11234,6 +11309,7 @@ network = list("SS13","Engineering") }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/cable{ @@ -11286,6 +11362,7 @@ dir = 1 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -11301,7 +11378,8 @@ network = list("SS13","Engineering") }, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -11386,7 +11464,8 @@ "aIF" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/structure/cable{ d1 = 4; @@ -11518,7 +11597,8 @@ pixel_y = -22 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11621,7 +11701,8 @@ /area/crew_quarters/bar) "aJb" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -11707,7 +11788,8 @@ /area/quartermaster/office) "aJm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -11846,6 +11928,7 @@ "aJF" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/effect/decal/warning_stripes/southwest, @@ -12042,7 +12125,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -12223,6 +12307,7 @@ /area/hallway/primary/central/nw) "aKm" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12526,6 +12611,7 @@ "aKZ" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -12742,7 +12828,8 @@ "aLv" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/cable{ d1 = 1; @@ -12805,7 +12892,8 @@ "aLE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/wood, /area/hallway/primary/central/nw) @@ -12866,10 +12954,12 @@ /obj/machinery/disposal, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -13187,7 +13277,8 @@ "aMx" = ( /obj/machinery/power/terminal, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/cable/yellow{ d2 = 8; @@ -13293,7 +13384,8 @@ /area/engine/controlroom) "aMN" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -13374,6 +13466,7 @@ pixel_x = 32 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/cable{ @@ -13446,7 +13539,8 @@ /area/maintenance/fore) "aNf" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13463,6 +13557,7 @@ "aNg" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -13476,7 +13571,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -13488,6 +13584,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -13561,6 +13658,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -13874,10 +13972,12 @@ "aNZ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/sm_monitor{ @@ -14142,18 +14242,24 @@ /area/crew_quarters/bar) "aOI" = ( /obj/item/radio/intercom{ - pixel_x = 28 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + dir = 5; + icon_state = "dark" }, -/area/hallway/primary/fore) +/area/crew_quarters/bar) "aOJ" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/filingcabinet/filingcabinet, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -14296,6 +14402,7 @@ "aPf" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/twohanded/required/kirbyplants, @@ -14515,7 +14622,8 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -14524,6 +14632,7 @@ /area/atmos) "aPz" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -14672,7 +14781,8 @@ }, /obj/structure/closet/secure_closet/clown, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" @@ -14721,9 +14831,11 @@ "aPT" = ( /obj/structure/table/wood, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/flashlight/lamp/bananalamp, @@ -14975,7 +15087,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -14987,6 +15100,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/decal/warning_stripes/southwestcorner, @@ -15185,7 +15299,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -15297,7 +15412,8 @@ /area/atmos) "aRa" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/shower{ dir = 4 @@ -15608,20 +15724,17 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/item/storage/box, /obj/item/storage/box/lights/mixed{ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -26; - pixel_y = -26 - }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -15658,6 +15771,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -16247,6 +16361,7 @@ /area/hallway/primary/central/nw) "aTb" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/hologram/holopad, @@ -16505,6 +16620,7 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -16596,6 +16712,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/table/reinforced, @@ -16999,6 +17116,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -17074,7 +17192,8 @@ /obj/machinery/disposal, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -17190,7 +17309,8 @@ pixel_y = 3 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -17295,7 +17415,8 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -17312,7 +17433,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -17407,7 +17529,8 @@ "aVk" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -17699,6 +17822,7 @@ "aVJ" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -17845,6 +17969,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/vending/autodrobe, @@ -18305,6 +18430,7 @@ /area/security/permabrig) "aWN" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -18363,7 +18489,7 @@ /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -18388,7 +18514,8 @@ "aWU" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -18399,7 +18526,8 @@ /area/security/execution) "aWV" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -18724,7 +18852,8 @@ /obj/item/twohanded/staff/broom, /obj/item/clothing/head/witchwig, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -18757,7 +18886,8 @@ name = "Theater Stage" }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -18777,14 +18907,12 @@ }, /area/atmos) "aXH" = ( -/obj/item/radio/intercom{ - pixel_x = -28; - pixel_y = -28 +/obj/machinery/light_switch{ + name = "north bump"; + pixel_y = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "aXI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -18938,6 +19066,7 @@ /area/hallway/primary/fore) "aYa" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -19232,7 +19361,8 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19259,7 +19389,8 @@ /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -19475,7 +19606,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -19575,12 +19707,14 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; + name = "custom placement"; pixel_x = -26; pixel_y = -26 }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -19684,6 +19818,7 @@ /obj/machinery/photocopier, /obj/machinery/firealarm{ dir = 1; + name = "custom placement"; pixel_x = -26; pixel_y = -26 }, @@ -19704,7 +19839,8 @@ /obj/machinery/light, /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -19713,6 +19849,7 @@ "aZA" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -19783,6 +19920,7 @@ network = list("SS13","Security") }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/cable{ @@ -19979,7 +20117,8 @@ /area/security/permabrig) "aZT" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable{ d1 = 4; @@ -20060,6 +20199,7 @@ /area/space/nearstation) "aZZ" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/structure/disposalpipe/segment, @@ -20379,6 +20519,7 @@ "baK" = ( /obj/machinery/door/firedoor, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20448,7 +20589,8 @@ "baR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -20478,7 +20620,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -20491,15 +20634,18 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/autolathe, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/firealarm{ dir = 1; + name = "custom placement"; pixel_x = -26; pixel_y = -26 }, @@ -20577,10 +20723,12 @@ pixel_y = 4 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -20691,7 +20839,8 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20798,6 +20947,7 @@ "bbz" = ( /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20886,6 +21036,7 @@ /area/shuttle/pod_3) "bbJ" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -21054,7 +21205,8 @@ /area/hydroponics) "bcf" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/structure/closet/secure_closet/hydroponics, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -21084,6 +21236,7 @@ /obj/item/wrench, /obj/item/clothing/suit/apron, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -21091,11 +21244,13 @@ /area/hydroponics) "bck" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/chem_master/condimaster, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -21184,7 +21339,8 @@ "bcv" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -21265,6 +21421,7 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -21314,6 +21471,7 @@ "bcJ" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet/secure_closet/cargotech, @@ -21339,7 +21497,8 @@ /obj/machinery/light, /obj/machinery/vending/cargodrobe, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -21891,6 +22050,7 @@ "bdN" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/rack, @@ -21975,6 +22135,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -22274,7 +22435,8 @@ "beL" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel{ @@ -22445,7 +22607,8 @@ "bfe" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -22456,6 +22619,7 @@ "bff" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -22490,7 +22654,8 @@ "bfj" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -22600,7 +22765,8 @@ /obj/item/toy/figure/crew/miner, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -22751,7 +22917,8 @@ /area/maintenance/starboard2) "bfT" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel{ @@ -23368,7 +23535,8 @@ /area/atmos) "bho" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/machinery/camera{ c_tag = "Atmospherics South"; @@ -23466,6 +23634,7 @@ /obj/item/storage/box/beakers, /obj/item/storage/box/syringes, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -23482,14 +23651,16 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/botanist, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hydroponics) "bhC" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -23951,7 +24122,8 @@ "bix" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -23977,6 +24149,7 @@ /area/security/main) "biz" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/closet/secure_closet/security, @@ -24052,7 +24225,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_x = 28; + name = "north bump"; pixel_y = 28 }, /obj/effect/landmark/start/security_officer, @@ -24366,6 +24539,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -24816,6 +24990,7 @@ /area/security/main) "bkj" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -24848,7 +25023,8 @@ "bkn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/computer/secure_data{ dir = 8 @@ -25197,7 +25373,8 @@ /obj/machinery/smartfridge/foodcart, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -25396,7 +25573,8 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -25716,7 +25894,8 @@ /obj/structure/dresser, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/newscaster/security_unit{ pixel_y = 32 @@ -25747,7 +25926,8 @@ }, /obj/item/flashlight/lamp, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -25961,7 +26141,8 @@ /obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -26196,7 +26377,8 @@ /area/quartermaster/miningdock) "bni" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/structure/rack, /obj/item/storage/toolbox/emergency{ @@ -26525,6 +26707,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/decal/warning_stripes/east, @@ -26650,7 +26833,8 @@ /area/hallway/primary/central) "bop" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -26777,7 +26961,8 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -26816,7 +27001,8 @@ icon_state = "pipe-c" }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -26931,6 +27117,7 @@ /area/security/prisonershuttle) "boN" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/computer/security, @@ -26956,7 +27143,8 @@ "boP" = ( /obj/structure/table/reinforced, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/item/storage/box/prisoner, /turf/simulated/floor/plasteel{ @@ -27759,7 +27947,8 @@ "bqh" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -28650,7 +28839,8 @@ "bsa" = ( /obj/machinery/hydroponics/constructable, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -28790,7 +28980,8 @@ "bsr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -28835,6 +29026,7 @@ /obj/machinery/light, /obj/structure/closet/wardrobe/miner, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -29053,8 +29245,9 @@ "bsY" = ( /obj/structure/table/wood, /obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = -28 + name = "custom placement"; + pixel_x = 30; + pixel_y = -30 }, /obj/machinery/status_display{ pixel_y = -32 @@ -29204,6 +29397,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -29467,6 +29661,7 @@ /area/security/nuke_storage) "btR" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/suit_storage_unit/security/hos, @@ -29504,6 +29699,7 @@ layer = 2.9 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/light{ @@ -29662,7 +29858,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/cable, /turf/simulated/floor/plasteel{ @@ -29705,6 +29902,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/disposal, @@ -29796,7 +29994,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -29817,7 +30016,8 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/portable_atmospherics/scrubber, /turf/simulated/floor/plasteel{ @@ -30212,7 +30412,8 @@ "bvu" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/structure/cable{ d1 = 4; @@ -30369,6 +30570,7 @@ "bvG" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -30440,7 +30642,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -30946,7 +31149,8 @@ /area/security/prisonershuttle) "bwA" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigEast"; @@ -31157,7 +31361,8 @@ /area/engine/break_room) "bwX" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -31171,14 +31376,15 @@ dir = 8 }, /obj/structure/closet/firecloset, -/obj/machinery/firealarm{ - pixel_x = -32; - pixel_y = 26 - }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/firealarm{ + name = "north bump"; + pixel_y = 24 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bwZ" = ( @@ -31209,7 +31415,8 @@ network = list("SS13","Engineering") }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -31294,7 +31501,8 @@ /area/storage/tech) "bxl" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31610,7 +31818,8 @@ "bxP" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -31835,7 +32044,8 @@ /area/engine/break_room) "byv" = ( /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -32120,6 +32330,7 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/light{ @@ -32198,6 +32409,7 @@ "byY" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/light{ @@ -32303,6 +32515,7 @@ /area/security/brig) "bzj" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -32526,6 +32739,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/warning_stripes/northeast, @@ -32536,7 +32750,8 @@ charge = 5e+006 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/cable{ d2 = 2; @@ -32743,7 +32958,8 @@ /obj/structure/table/reinforced, /obj/item/mmi, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -32943,6 +33159,7 @@ "bAI" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light/small, @@ -33376,7 +33593,8 @@ /area/engine/break_room) "bBB" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -33442,6 +33660,7 @@ "bBI" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -33460,6 +33679,7 @@ "bBK" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/computer/station_alert{ @@ -33475,7 +33695,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -33669,7 +33890,8 @@ /obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -34268,6 +34490,7 @@ /area/security/brig) "bCT" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -34364,6 +34587,7 @@ /area/turret_protected/ai) "bDa" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -34412,7 +34636,8 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/northeast, @@ -35245,6 +35470,7 @@ pixel_y = -10 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/door_control{ @@ -35366,7 +35592,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -35378,10 +35605,12 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, @@ -35453,7 +35682,8 @@ "bFc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -35476,13 +35706,13 @@ dir = 1 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bFf" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = 28 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -35561,6 +35791,7 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/micro_laser, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -35638,7 +35869,8 @@ "bFx" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -35651,7 +35883,8 @@ /area/bridge) "bFz" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -35778,6 +36011,7 @@ "bFN" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -35808,7 +36042,8 @@ "bFQ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -35899,6 +36134,7 @@ name = "Cell 1 Locker" }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/cable{ @@ -36078,6 +36314,7 @@ "bGv" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -36085,7 +36322,8 @@ /area/engine/gravitygenerator) "bGw" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -36096,11 +36334,13 @@ /obj/item/wrench, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -36489,7 +36729,8 @@ "bGV" = ( /obj/machinery/vending/assist, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/camera{ c_tag = "Primary Tool Storage"; @@ -36526,6 +36767,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/stack/cable_coil/random, @@ -36617,7 +36859,8 @@ "bHi" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -36861,6 +37104,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, @@ -36887,7 +37131,8 @@ /area/maintenance/starboard2) "bHJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/vending/detdrobe, /turf/simulated/floor/plasteel{ @@ -37144,6 +37389,7 @@ /area/turret_protected/ai) "bIi" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -37219,7 +37465,8 @@ /area/crew_quarters/chief) "bIr" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -37243,7 +37490,8 @@ /obj/item/clipboard, /obj/item/gps/engineering, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -37263,7 +37511,8 @@ "bIv" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -37432,6 +37681,7 @@ "bIQ" = ( /obj/machinery/vending/tool, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow, @@ -37499,7 +37749,8 @@ }, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -37516,7 +37767,8 @@ /area/bridge/meeting_room) "bJb" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -37541,16 +37793,9 @@ }, /area/hallway/primary/central) "bJe" = ( -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/newscaster{ + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -37589,7 +37834,8 @@ /area/crew_quarters/captain) "bJk" = ( /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -37619,7 +37865,8 @@ /area/crew_quarters/captain) "bJn" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -37650,7 +37897,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -37812,6 +38060,7 @@ dir = 4 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -38010,7 +38259,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/door_control{ id = "transitlock"; @@ -38355,7 +38605,8 @@ "bKM" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -38383,7 +38634,8 @@ /area/turret_protected/ai_upload) "bKS" = ( /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) @@ -38474,6 +38726,7 @@ "bLg" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -38619,6 +38872,7 @@ "bLy" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -38732,7 +38986,8 @@ "bLO" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38855,6 +39110,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -39012,6 +39268,7 @@ /area/quartermaster/miningdock) "bMo" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -39044,7 +39301,8 @@ /obj/machinery/light, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 7; @@ -39089,6 +39347,10 @@ /area/engine/break_room) "bMy" = ( /obj/machinery/vending/coffee, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" @@ -39109,6 +39371,7 @@ pixel_y = 32 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, @@ -39123,7 +39386,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/item/clothing/gloves/color/yellow, /obj/item/storage/toolbox/electrical, @@ -39437,7 +39701,8 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -39447,7 +39712,8 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/multitool, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39592,6 +39858,7 @@ /area/hallway/primary/starboard) "bNy" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/east, @@ -39888,7 +40155,8 @@ "bOh" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39963,7 +40231,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -39983,7 +40252,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -39994,7 +40264,8 @@ /obj/item/crowbar, /obj/item/paicard, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -40122,12 +40393,12 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bOK" = ( -/obj/machinery/newscaster{ - pixel_x = 30; - pixel_y = -30 +/obj/structure/extinguisher_cabinet{ + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/wood, -/area/bridge/meeting_room) +/area/medical/psych) "bOL" = ( /obj/structure/cable{ d1 = 1; @@ -40208,6 +40479,7 @@ /area/crew_quarters/captain) "bOV" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/wood, @@ -40318,6 +40590,7 @@ /obj/item/hand_labeler, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -40348,7 +40621,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40357,7 +40631,8 @@ "bPl" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -40665,6 +40940,7 @@ "bPH" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/portable_atmospherics/canister/air, @@ -40818,11 +41094,13 @@ /obj/item/radio, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -40941,7 +41219,8 @@ "bQj" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41056,7 +41335,8 @@ }, /obj/structure/closet/radiation, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -41143,6 +41423,7 @@ /area/storage/primary) "bQC" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/teleport/hub, @@ -41171,6 +41452,7 @@ /area/bridge/meeting_room) "bQF" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/slot_machine, @@ -41184,6 +41466,7 @@ "bQH" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -41208,6 +41491,7 @@ "bQK" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/porta_turret{ @@ -41393,7 +41677,8 @@ "bRd" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -41563,7 +41848,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -42164,7 +42450,8 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -42284,7 +42571,8 @@ /area/hallway/primary/central) "bSW" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -42339,6 +42627,7 @@ /area/turret_protected/aisat) "bTd" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/camera{ @@ -42430,6 +42719,7 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/light{ @@ -42456,14 +42746,16 @@ /obj/item/flashlight/lamp, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light{ dir = 4 }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -42972,6 +43264,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -43040,6 +43333,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; + name = "custom placement"; pixel_x = -26; pixel_y = -26 }, @@ -43378,7 +43672,8 @@ "bUW" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Captain's Desk"; @@ -43398,6 +43693,7 @@ /area/crew_quarters/captain) "bUY" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/carpet/black, @@ -43686,8 +43982,8 @@ network = list("Engineering","SS13") }, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/door_control{ id = "ceprivacy"; @@ -43833,7 +44129,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -43890,7 +44187,8 @@ "bVU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -43906,7 +44204,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -44018,6 +44317,7 @@ /area/security/warden) "bWi" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, @@ -44038,6 +44338,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/photocopier/faxmachine{ @@ -44175,7 +44476,8 @@ /obj/machinery/light, /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -44191,7 +44493,8 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -44202,12 +44505,9 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = -28 - }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, @@ -44267,6 +44567,7 @@ "bWI" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/suit_storage_unit/ce, @@ -44277,7 +44578,8 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -44433,6 +44735,7 @@ "bXf" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -44699,6 +45002,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -44709,7 +45013,8 @@ /obj/machinery/porta_turret, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -44754,7 +45059,8 @@ "bXP" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -44814,9 +45120,16 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bXZ" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall, -/area/engine/engineering) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "bYa" = ( /obj/machinery/light{ dir = 4 @@ -44916,10 +45229,16 @@ "bYo" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/firealarm{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bYp" = ( @@ -44991,7 +45310,8 @@ /area/crew_quarters/captain/bedroom) "bYA" = ( /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) @@ -45529,7 +45849,8 @@ "bZJ" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/computer/library, /turf/simulated/floor/plasteel{ @@ -45573,7 +45894,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45583,6 +45905,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -45600,7 +45923,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45617,6 +45941,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -45629,6 +45954,7 @@ /area/library) "bZT" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -45772,6 +46098,7 @@ /obj/item/pinpointer, /obj/item/disk/nuclear, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/carpet/black, @@ -45838,7 +46165,8 @@ /area/crew_quarters/captain/bedroom) "cau" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -45899,7 +46227,8 @@ "caB" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -45908,6 +46237,7 @@ /area/crew_quarters/courtroom) "caC" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -45940,7 +46270,8 @@ /obj/item/taperecorder, /obj/item/clothing/glasses/sunglasses, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + name = "west bump"; + pixel_x = -30 }, /obj/item/clipboard, /obj/item/toy/figure/crew/lawyer, @@ -45975,11 +46306,13 @@ /area/lawoffice) "caK" = ( /obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 + dir = 4; + name = "east bump"; + pixel_x = 24 }, /obj/structure/closet/secure_closet/iaa, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/storage/secure/briefcase, @@ -46040,6 +46373,7 @@ "caQ" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/flasher_button{ @@ -46049,6 +46383,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "custom placement"; pixel_x = -36; pixel_y = 8 }, @@ -46416,7 +46751,8 @@ /area/engine/engineering) "cbx" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/power/terminal{ dir = 1 @@ -46519,7 +46855,8 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46832,7 +47169,8 @@ /obj/structure/table, /obj/machinery/kitchen_machine/microwave, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/machinery/light{ dir = 8 @@ -47016,6 +47354,7 @@ pixel_y = -7 }, /obj/item/radio/intercom{ + name = "custom placement"; pixel_x = -28; pixel_y = 5 }, @@ -47512,6 +47851,7 @@ "cdV" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -47529,7 +47869,8 @@ "cdX" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ @@ -47600,7 +47941,9 @@ /area/crew_quarters/courtroom) "ceg" = ( /obj/structure/table/wood, -/obj/item/radio/intercom, +/obj/item/radio/intercom{ + name = "custom placement" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -47637,6 +47980,7 @@ "cem" = ( /obj/machinery/light_switch{ dir = 4; + name = "custom placement"; pixel_x = -24; pixel_y = -6 }, @@ -47996,6 +48340,7 @@ "cfh" = ( /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/computer/station_alert, @@ -48081,6 +48426,7 @@ /obj/item/pen, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -48103,7 +48449,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/wood, /area/library) @@ -48128,7 +48475,8 @@ "cfx" = ( /obj/machinery/photocopier, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/wood, /area/library) @@ -48141,13 +48489,15 @@ c_tag = "Library Starboard" }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/wood, /area/library) "cfz" = ( /obj/structure/chair/comfy/red, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/wood, @@ -48159,11 +48509,6 @@ "cfB" = ( /obj/machinery/light/small, /obj/structure/closet/radiation, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26; - pixel_y = -26 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -48288,7 +48633,8 @@ "cfS" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -48358,6 +48704,7 @@ "cgg" = ( /obj/structure/closet, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/window/reinforced{ @@ -48370,13 +48717,15 @@ "cgh" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/carpet, /area/magistrateoffice) "cgi" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/carpet, @@ -48427,6 +48776,7 @@ "cgo" = ( /obj/structure/closet, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -48441,7 +48791,8 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -48454,7 +48805,8 @@ /obj/structure/closet, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -48494,6 +48846,7 @@ "cgC" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/door/firedoor, @@ -48645,7 +48998,8 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/wood, /area/library) @@ -48746,7 +49100,8 @@ "chm" = ( /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/structure/cable{ d1 = 1; @@ -48800,7 +49155,8 @@ "chq" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/cable{ d1 = 1; @@ -49059,7 +49415,8 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -49288,7 +49645,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -49302,6 +49660,7 @@ /obj/structure/bed/dogbed/ian, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /mob/living/simple_animal/pet/dog/corgi/Ian, @@ -49314,7 +49673,8 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/wood, /area/ntrep) @@ -49330,6 +49690,7 @@ "ciH" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -49468,6 +49829,7 @@ "ciP" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -49501,7 +49863,8 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/wood, /area/blueshield) @@ -49549,6 +49912,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "custom placement"; pixel_x = -26; pixel_y = -26 }, @@ -49609,7 +49973,9 @@ /area/crew_quarters/courtroom) "cjg" = ( /obj/structure/table/wood, -/obj/item/radio/intercom, +/obj/item/radio/intercom{ + name = "custom placement" + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -49695,7 +50061,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/structure/closet/crate, /obj/item/target/syndicate, @@ -50036,7 +50403,8 @@ /area/maintenance/fore) "ckm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -50051,6 +50419,11 @@ dir = 1 }, /obj/structure/closet/secure_closet/hop2, +/obj/machinery/light_switch{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "ckp" = ( @@ -50058,7 +50431,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -50148,7 +50522,8 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -50261,7 +50636,9 @@ /area/crew_quarters/courtroom) "ckN" = ( /obj/structure/table/wood, -/obj/item/radio/intercom, +/obj/item/radio/intercom{ + name = "custom placement" + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -50748,7 +51125,8 @@ /obj/item/camera_film, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/structure/window/reinforced{ dir = 1 @@ -50761,15 +51139,12 @@ /obj/structure/bed, /obj/item/bedsheet/hop, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "clJ" = ( -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -50826,6 +51201,7 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/ian, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/wood, @@ -51006,6 +51382,7 @@ "cmf" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -51063,7 +51440,7 @@ /area/hallway/primary/aft) "cmo" = ( /obj/item/radio/intercom{ - dir = 8; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/carpet, @@ -51159,6 +51536,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/gun/energy/laser/practice, @@ -51193,7 +51571,8 @@ "cmM" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -51202,7 +51581,8 @@ /obj/structure/closet/secure_closet/engineering_personal, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/requests_console{ department = "Engineering"; @@ -51231,6 +51611,7 @@ /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -51315,7 +51696,8 @@ /obj/item/radio, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -51356,6 +51738,7 @@ "cne" = ( /obj/structure/dispenser, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -51423,7 +51806,8 @@ /obj/structure/table/wood, /obj/machinery/computer/library/checkout, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -51433,6 +51817,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/carpet, @@ -51456,7 +51841,8 @@ "cnr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -51481,7 +51867,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -51529,7 +51916,8 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -51553,6 +51941,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -52016,6 +52405,7 @@ /obj/item/storage/fancy/donut_box, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -52041,7 +52431,9 @@ /area/crew_quarters/courtroom) "coM" = ( /obj/structure/table/wood, -/obj/item/radio/intercom, +/obj/item/radio/intercom{ + name = "custom placement" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -52474,7 +52866,8 @@ /area/toxins/xenobiology) "cpH" = ( /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood, @@ -52902,7 +53295,8 @@ /obj/machinery/vending/coffee, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -52949,7 +53343,8 @@ /area/crew_quarters/courtroom) "cqv" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -53248,7 +53643,8 @@ /obj/machinery/light, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -53269,6 +53665,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/clipboard, @@ -53925,7 +54322,8 @@ "csB" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/item/clipboard, /obj/item/folder/blue, @@ -54405,7 +54803,8 @@ "ctF" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -54479,7 +54878,8 @@ /area/library) "ctN" = ( /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -54502,6 +54902,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -54749,6 +55150,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -55092,6 +55494,7 @@ "cuV" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/east, @@ -55104,6 +55507,11 @@ }, /obj/item/storage/toolbox/electrical, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -55112,7 +55520,8 @@ "cuX" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel, /area/gateway) @@ -55130,6 +55539,7 @@ }, /obj/machinery/suit_storage_unit/engine, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/warning_stripes/south, @@ -55263,7 +55673,8 @@ "cvo" = ( /obj/structure/cult/archives, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -55296,7 +55707,8 @@ /area/library) "cvr" = ( /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -55322,7 +55734,8 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -55459,7 +55872,8 @@ amount = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/item/storage/toolbox/emergency, /obj/item/flashlight, @@ -55563,6 +55977,7 @@ "cvX" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -55871,6 +56286,7 @@ "cwM" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/filingcabinet, @@ -55893,6 +56309,7 @@ /obj/structure/table/wood, /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/item/folder, @@ -55913,7 +56330,8 @@ "cwQ" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -56168,7 +56586,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plasteel{ @@ -56334,7 +56753,8 @@ "cxI" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, @@ -56421,6 +56841,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/clothing/shoes/magboots{ @@ -56449,7 +56870,8 @@ "cxV" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -56518,7 +56940,8 @@ "cyb" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56713,6 +57136,7 @@ /area/gateway) "cyz" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -56722,7 +57146,8 @@ /area/hallway/primary/central) "cyA" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -56795,6 +57220,7 @@ }, /obj/structure/dispenser/oxygen, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -56933,7 +57359,7 @@ "cyV" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - pixel_x = 28; + name = "north bump"; pixel_y = 28 }, /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, @@ -56996,8 +57422,8 @@ "cza" = ( /obj/machinery/cryopod, /obj/item/radio/intercom{ - pixel_x = 28; - pixel_y = 28 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -57069,18 +57495,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"czj" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 26 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellow" - }, -/area/engine/engineering) "czk" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -57118,6 +57532,7 @@ "czo" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/cleanable/cobweb2, @@ -57439,6 +57854,7 @@ "czT" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -57596,6 +58012,7 @@ "cAj" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -57635,7 +58052,8 @@ /area/crew_quarters/fitness) "cAo" = ( /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -57892,6 +58310,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/storage/fancy/donut_box, @@ -57902,6 +58321,7 @@ "cAU" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -57980,7 +58400,8 @@ /obj/item/wrench, /obj/item/grenade/chem_grenade/metalfoam, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -58051,6 +58472,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/stack/rods{ @@ -58132,7 +58554,8 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/item/storage/belt, /obj/item/radio, @@ -58356,7 +58779,8 @@ "cBV" = ( /obj/structure/chair/office/dark, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -58390,7 +58814,8 @@ "cBY" = ( /obj/machinery/cryopod/right, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -58477,7 +58902,8 @@ /area/engine/engineering) "cCi" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/yellow, @@ -58738,7 +59164,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/light, /turf/simulated/floor/carpet, @@ -58777,6 +59204,7 @@ "cCT" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/item/folder/red, @@ -58797,7 +59225,8 @@ /obj/machinery/cell_charger, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel, @@ -58944,7 +59373,8 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -59052,7 +59482,8 @@ pixel_y = -3 }, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -59131,7 +59562,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -59222,6 +59654,7 @@ "cEb" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -59456,6 +59889,7 @@ /area/hallway/primary/central) "cEM" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -59515,7 +59949,8 @@ /area/hallway/primary/central) "cET" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -59524,7 +59959,8 @@ /area/hallway/primary/central) "cEU" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -59550,7 +59986,8 @@ /area/hallway/primary/central) "cEY" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -61254,7 +61691,8 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -61706,7 +62144,8 @@ "cJs" = ( /obj/structure/closet/secure_closet/medical3, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -61714,6 +62153,7 @@ /area/medical/medbay2) "cJt" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/closet/secure_closet/medical3, @@ -61723,7 +62163,8 @@ /area/medical/medbay2) "cJu" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ @@ -61897,6 +62338,7 @@ "cJU" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow, @@ -61943,7 +62385,8 @@ "cKa" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -62282,6 +62725,7 @@ "cKX" = ( /obj/structure/table, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/item/storage/firstaid/regular, @@ -62483,7 +62927,7 @@ "cLo" = ( /obj/structure/dresser, /obj/item/radio/intercom{ - pixel_x = 28; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/wood, @@ -62494,15 +62938,15 @@ "cLq" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - pixel_x = 28; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/carpet, /area/crew_quarters/fitness) "cLr" = ( /obj/item/radio/intercom{ - pixel_x = 28; - pixel_y = 28 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/cryopod, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -62798,6 +63242,7 @@ /area/toxins/misc_lab) "cMb" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/light{ @@ -63080,7 +63525,8 @@ /obj/item/storage/briefcase, /obj/item/cane, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/carpet, /area/crew_quarters/fitness) @@ -63232,8 +63678,9 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 25; - pixel_y = 28 + pixel_y = 30 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -63761,11 +64208,8 @@ "cOc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = 28 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/wood, /area/medical/psych) @@ -63829,6 +64273,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/storage/firstaid/toxin{ @@ -63884,7 +64329,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/wood, /area/crew_quarters/fitness) @@ -64045,9 +64491,11 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -64113,8 +64561,9 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25; - pixel_y = 28 + pixel_y = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -64124,6 +64573,10 @@ "cOS" = ( /obj/machinery/monkey_recycler, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -64137,10 +64590,6 @@ /obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25; - pixel_y = 28 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 1; @@ -64564,7 +65013,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -64848,7 +65298,8 @@ /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/dropper, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -65023,6 +65474,7 @@ /area/maintenance/apmaint) "cRf" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/cable{ @@ -65128,6 +65580,7 @@ /area/medical/psych) "cRr" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, @@ -66291,7 +66744,8 @@ "cTL" = ( /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Research Chemistry"; @@ -66379,7 +66833,8 @@ /area/hallway/primary/aft) "cTW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -66460,6 +66915,7 @@ "cUe" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -66503,6 +66959,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/carpet, @@ -66520,7 +66977,8 @@ pixel_y = 5 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -66529,6 +66987,7 @@ /area/medical/medbay3) "cUk" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -66998,7 +67457,8 @@ "cVl" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/chem_master, /turf/simulated/floor/engine, @@ -67007,7 +67467,8 @@ /obj/machinery/smartfridge/secure/extract, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -67106,7 +67567,8 @@ /obj/item/wrench, /obj/item/clothing/glasses/welding, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -67150,7 +67612,8 @@ pixel_y = -3 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -67308,7 +67771,8 @@ /area/medical/medbay3) "cVW" = ( /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -67709,6 +68173,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/stock_parts/matter_bin{ @@ -67770,7 +68235,8 @@ /obj/item/storage/bag/bio, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -67812,6 +68278,7 @@ /obj/item/clothing/gloves/color/latex, /obj/item/slime_scanner, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow, @@ -67821,6 +68288,7 @@ /area/toxins/xenobiology) "cXb" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/closet/emcloset, @@ -67884,6 +68352,7 @@ /obj/structure/closet/secure_closet/medical1, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/southwest, @@ -67914,6 +68383,7 @@ /area/medical/medbay3) "cXm" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/computer/crew{ @@ -68266,6 +68736,7 @@ "cYm" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/item/stack/cable_coil/random, @@ -68290,7 +68761,8 @@ /area/toxins/lab) "cYo" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -68500,7 +68972,8 @@ /area/medical/medbay3) "cYW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -68542,7 +69015,8 @@ "cZa" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/camera{ c_tag = "Medbay Break Room"; @@ -68562,6 +69036,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/southeast, @@ -68894,7 +69369,8 @@ /area/medical/medbay) "cZJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -69710,7 +70186,8 @@ /obj/item/hemostat, /obj/structure/table/tray, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -70561,7 +71038,8 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/cell_charger, /obj/machinery/light, @@ -70636,6 +71114,7 @@ "ddq" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/southeast, @@ -70768,7 +71247,8 @@ "ddF" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/item/folder/white, /obj/item/reagent_containers/glass/beaker/large, @@ -70900,6 +71380,7 @@ /area/medical/chemistry) "ddP" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/closet/secure_closet/chemical, @@ -70920,7 +71401,8 @@ "ddQ" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/structure/cable{ d1 = 4; @@ -70976,7 +71458,8 @@ /obj/item/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -71027,7 +71510,8 @@ "ddZ" = ( /obj/machinery/chem_master, /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/structure/sign/nosmoking_2{ pixel_x = -32; @@ -71329,6 +71813,7 @@ "deG" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -71425,7 +71910,8 @@ /obj/item/crowbar, /obj/item/clothing/mask/gas, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -71617,7 +72103,8 @@ /area/crew_quarters/hor) "dfm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -71724,7 +72211,8 @@ "dfC" = ( /obj/machinery/iv_drip, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -71995,7 +72483,8 @@ "dgk" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -72006,7 +72495,8 @@ "dgl" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -72047,11 +72537,6 @@ name = "west bump"; pixel_x = -24 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26; - pixel_y = 26 - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -72088,11 +72573,13 @@ "dgs" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/item/paper_bin, /obj/item/pen, @@ -72122,7 +72609,8 @@ /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -72224,7 +72712,8 @@ pixel_x = 24 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /obj/structure/cable{ d2 = 2; @@ -72263,6 +72752,7 @@ /area/medical/genetics_cloning) "dgK" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/dna_scannernew, @@ -72423,7 +72913,8 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -72591,6 +73082,7 @@ /obj/item/stack/cable_coil/random, /obj/item/stock_parts/scanning_module, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -73060,10 +73552,12 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/cell_charger, @@ -73340,7 +73834,8 @@ /area/medical/medbay) "diM" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -73413,6 +73908,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -73749,13 +74245,9 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -26; - pixel_y = -26 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) @@ -74133,7 +74625,8 @@ "dkm" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/item/stack/packageWrap, /obj/item/stack/sheet/metal{ @@ -74214,6 +74707,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/stock_parts/matter_bin, @@ -74495,7 +74989,8 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -74537,6 +75032,7 @@ "dle" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -74554,6 +75050,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -74906,8 +75403,9 @@ "dlZ" = ( /obj/structure/closet/secure_closet/scientist, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -74964,6 +75462,11 @@ /area/toxins/misc_lab) "dmf" = ( /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74973,6 +75476,7 @@ /area/assembly/chargebay) "dmh" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -74995,6 +75499,7 @@ "dmk" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -75245,7 +75750,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -75610,6 +76116,7 @@ "dnL" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/storage/box/disks{ @@ -75684,7 +76191,8 @@ "dnU" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -75723,6 +76231,7 @@ /obj/structure/table/glass, /obj/item/folder/blue, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/clothing/glasses/hud/health, @@ -75754,7 +76263,8 @@ "doa" = ( /obj/machinery/dna_scannernew, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -75838,7 +76348,8 @@ "dok" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -75949,10 +76460,6 @@ }, /area/medical/research) "doy" = ( -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 26 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -76119,7 +76626,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -76260,7 +76768,8 @@ /obj/structure/closet/paramedic, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -76578,7 +77087,8 @@ "dpK" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -76632,6 +77142,7 @@ /obj/structure/table/reinforced, /obj/machinery/light, /obj/item/radio/intercom{ + name = "custom placement"; pixel_x = -28; pixel_y = -28 }, @@ -76639,7 +77150,8 @@ department = "Research Director's Office" }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/structure/cable{ d1 = 4; @@ -76761,7 +77273,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/west, @@ -76787,7 +77300,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -76798,7 +77312,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -76858,6 +77373,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -77178,6 +77694,7 @@ "drf" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plating, @@ -77185,7 +77702,8 @@ "drg" = ( /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -77263,6 +77781,7 @@ /obj/machinery/portable_atmospherics/pump, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -77399,7 +77918,8 @@ /obj/structure/reagent_dispensers/fueltank, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -77561,6 +78081,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/bed/dogbed{ @@ -77630,6 +78151,7 @@ /area/medical/cmo) "dsi" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/light{ @@ -77841,9 +78363,6 @@ /area/hallway/primary/aft) "dsJ" = ( /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/item/stack/sheet/metal{ amount = 50 }, @@ -77862,6 +78381,11 @@ pixel_y = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77942,6 +78466,7 @@ /area/medical/genetics) "dsQ" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -77990,6 +78515,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -78015,7 +78541,8 @@ /area/medical/genetics) "dsY" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -78028,7 +78555,8 @@ "dsZ" = ( /obj/machinery/dna_scannernew, /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -78071,6 +78599,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -78398,6 +78927,7 @@ /obj/item/crowbar, /obj/item/clothing/mask/gas, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plating, @@ -78469,7 +78999,8 @@ "dtW" = ( /obj/structure/closet/secure_closet/scientist, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -78490,7 +79021,8 @@ /area/crew_quarters/hor) "dtZ" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/structure/cable{ d1 = 1; @@ -78515,11 +79047,13 @@ "dub" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -78547,7 +79081,8 @@ pixel_y = 24 }, /obj/machinery/light_switch{ - pixel_x = 22; + name = "custom placement"; + pixel_x = 24; pixel_y = 36 }, /obj/item/flash, @@ -78593,7 +79128,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -78739,6 +79275,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -78765,6 +79302,7 @@ pixel_x = 12 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/light{ @@ -78787,6 +79325,7 @@ "duE" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -78921,6 +79460,7 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plating, @@ -79031,6 +79571,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -79149,7 +79690,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -79224,7 +79766,8 @@ department = "Chief Medical Officer's Office" }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -79252,8 +79795,9 @@ "dvI" = ( /obj/machinery/light_switch{ dir = 1; - pixel_x = 26; - pixel_y = -26 + name = "custom placement"; + pixel_x = 24; + pixel_y = -24 }, /obj/machinery/keycard_auth{ pixel_x = 38; @@ -79298,7 +79842,8 @@ "dvL" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/holosign_switch{ id = "surgery1"; @@ -79500,6 +80045,7 @@ "dwj" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/rdservercontrol{ @@ -79567,10 +80113,6 @@ /obj/item/stack/cable_coil/random, /obj/item/flash, /obj/item/flash, -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 26 - }, /obj/item/robotanalyzer, /obj/item/mmi/robotic_brain, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -79737,6 +80279,7 @@ "dwK" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -79838,7 +80381,8 @@ /area/crew_quarters/theatre) "dwT" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) @@ -79896,6 +80440,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "custom placement"; pixel_x = -28; pixel_y = 28 }, @@ -79950,10 +80495,12 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ @@ -80024,6 +80571,7 @@ "dxn" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -80032,6 +80580,7 @@ "dxo" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -80376,11 +80925,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/firealarm{ + dir = 4; + name = "east bump"; pixel_x = 24 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "dxQ" = ( @@ -80491,16 +81041,6 @@ icon_state = "cmo" }, /area/medical/cmo) -"dxX" = ( -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cmo" - }, -/area/medical/cmo) "dxY" = ( /obj/structure/dresser, /obj/structure/mirror{ @@ -80600,6 +81140,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/status_display{ @@ -80615,7 +81156,8 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -80674,7 +81216,8 @@ "dyu" = ( /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -80702,6 +81245,11 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/toxin, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -80904,7 +81452,8 @@ "dyT" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -80914,7 +81463,8 @@ "dyU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -81062,7 +81612,8 @@ "dzq" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) @@ -81201,11 +81752,6 @@ }, /area/toxins/mixing) "dzD" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -26; - pixel_y = -26 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -81228,8 +81774,9 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25; - pixel_y = -28 + name = "custom placement"; + pixel_x = -30; + pixel_y = -30 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel{ @@ -81316,7 +81863,8 @@ /area/toxins/storage) "dzL" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/southeast, @@ -81434,7 +81982,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/item/cartridge/signal/toxins{ pixel_x = -6 @@ -81523,7 +82072,8 @@ name = "Robotics Operating Computer" }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -81602,6 +82152,7 @@ "dAh" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -81667,7 +82218,8 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81695,6 +82247,11 @@ "dAs" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, +/obj/machinery/light_switch{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81895,7 +82452,8 @@ "dAM" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -81937,7 +82495,8 @@ "dAS" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/head/hardhat/red, @@ -82012,6 +82571,7 @@ /area/toxins/test_area) "dBa" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/closet/secure_closet/scientist, @@ -82110,7 +82670,8 @@ "dBj" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/structure/cable{ d1 = 1; @@ -82519,6 +83080,7 @@ "dCn" = ( /obj/machinery/bodyscanner, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/status_display{ @@ -82554,7 +83116,8 @@ /obj/item/surgicaldrill, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -82800,7 +83363,8 @@ /obj/item/multitool, /obj/item/clothing/head/welding, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -83207,6 +83771,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -83599,12 +84164,14 @@ "dET" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ dir = 8 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -83669,11 +84236,13 @@ dir = 4 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -84062,6 +84631,7 @@ /area/hallway/primary/aft) "dGn" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/closet/secure_closet/roboticist, @@ -84167,11 +84737,13 @@ "dGx" = ( /obj/structure/table/glass, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/paper_bin, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -84343,6 +84915,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/vending/robodrobe, @@ -84366,7 +84939,8 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -84564,7 +85138,8 @@ /obj/structure/table/glass, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -84588,6 +85163,7 @@ "dHq" = ( /obj/structure/table/glass, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -84642,6 +85218,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -84948,7 +85525,8 @@ "dId" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -85376,7 +85954,8 @@ "dJh" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -85546,7 +86125,8 @@ /area/hallway/secondary/exit) "dJC" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -85618,7 +86198,8 @@ /area/medical/surgery) "dJP" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -85643,7 +86224,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -85747,7 +86329,8 @@ "dKd" = ( /obj/structure/table, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85760,7 +86343,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -85819,6 +86403,7 @@ "dKk" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -85829,7 +86414,8 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -86109,7 +86695,8 @@ "dLa" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/sink{ dir = 8; @@ -86186,6 +86773,7 @@ /area/medical/virology) "dLg" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -86279,6 +86867,7 @@ "dLp" = ( /obj/structure/table, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -86576,7 +87165,8 @@ "dMa" = ( /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_y = -28 + name = "south bump"; + pixel_y = -30 }, /obj/structure/closet/l3closet/virology, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -86587,6 +87177,7 @@ "dMc" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -86971,6 +87562,7 @@ "dMS" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -87083,6 +87675,7 @@ /obj/item/reagent_containers/dropper, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -87177,9 +87770,11 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -87254,7 +87849,8 @@ /area/chapel/office) "dNI" = ( /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/structure/cable{ d1 = 2; @@ -87611,7 +88207,8 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -87740,7 +88337,8 @@ /obj/machinery/iv_drip, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" @@ -87759,7 +88357,8 @@ /obj/item/paper_bin, /obj/item/storage/box/monkeycubes, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/structure/cable{ d1 = 1; @@ -87860,6 +88459,7 @@ "dOZ" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -88146,6 +88746,7 @@ /area/maintenance/apmaint) "dPD" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -88344,6 +88945,7 @@ /obj/structure/morgue, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -88734,7 +89336,8 @@ /obj/item/folder/yellow, /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -88771,7 +89374,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -88911,6 +89515,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/stack/cable_coil/random, @@ -88941,6 +89546,7 @@ "dRp" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -88966,7 +89572,8 @@ /obj/item/clothing/mask/breath, /obj/item/reagent_containers/food/drinks/coffee, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -88976,7 +89583,8 @@ /obj/structure/morgue, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89034,9 +89642,9 @@ "dRA" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ - dir = 1; - pixel_x = 26; - pixel_y = -26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89247,7 +89855,8 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89259,7 +89868,8 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89290,6 +89900,7 @@ /area/chapel/office) "dSk" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -89297,12 +89908,9 @@ }, /area/chapel/office) "dSm" = ( -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 - }, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89459,12 +90067,14 @@ /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /turf/simulated/floor/plating, /area/maintenance/apmaint) "dSJ" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -89486,6 +90096,11 @@ /area/chapel/office) "dSN" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/light_switch{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -89642,6 +90257,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -89695,7 +90311,8 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/status_display{ pixel_y = 32 @@ -89712,7 +90329,8 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -90220,7 +90838,8 @@ /area/engine/engineering) "dUJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /obj/structure/dresser, /turf/simulated/floor/plasteel{ @@ -90260,11 +90879,13 @@ "dUN" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/structure/closet/secure_closet/chaplain, /turf/simulated/floor/plasteel{ @@ -90277,7 +90898,8 @@ /obj/item/toy/figure/crew/chaplain, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -90302,7 +90924,8 @@ }, /obj/item/storage/fancy/candle_box/full, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/carpet, /area/chapel/office) @@ -90329,6 +90952,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -90642,8 +91266,9 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 25; - pixel_y = -28 + pixel_y = -30 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -90655,8 +91280,9 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25; - pixel_y = -28 + pixel_y = -30 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -90668,6 +91294,7 @@ "dWt" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable{ @@ -90682,7 +91309,8 @@ /area/toxins/xenobiology) "dWu" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -90696,7 +91324,8 @@ /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -90873,7 +91502,8 @@ /obj/structure/closet/secure_closet/medical1, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -90989,6 +91619,7 @@ /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/dropper, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -91161,7 +91792,8 @@ pixel_y = -22 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91205,6 +91837,7 @@ /area/maintenance/apmaint) "dXz" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/camera{ @@ -91264,6 +91897,7 @@ /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/camera{ @@ -91281,6 +91915,7 @@ c_tag = "Port Aft Solars" }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/cable{ @@ -91321,14 +91956,16 @@ }, /area/hallway/secondary/exit) "dXK" = ( -/obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 26 - }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dXQ" = ( @@ -91432,7 +92069,8 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/geneticist, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -91447,7 +92085,8 @@ }, /obj/item/storage/box/masks, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -91814,7 +92453,8 @@ /obj/structure/rack, /obj/item/storage/secure/briefcase, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -92145,7 +92785,8 @@ /obj/item/shield/riot, /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -92603,6 +93244,7 @@ /obj/item/restraints/handcuffs, /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -92832,7 +93474,8 @@ /area/assembly/showroom) "gzU" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -93038,7 +93681,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -93385,7 +94029,8 @@ "iaD" = ( /obj/machinery/light_switch{ dir = 8; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -93515,7 +94160,8 @@ /area/crew_quarters/fitness) "iwQ" = ( /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -93580,6 +94226,7 @@ pixel_x = -12 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/light{ @@ -93595,7 +94242,8 @@ /area/medical/surgery2) "iIw" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -93611,14 +94259,16 @@ /obj/item/storage/briefcase, /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/wood, /area/medical/psych) "iKj" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/holosign_switch{ id = "surgery2"; @@ -93865,7 +94515,8 @@ "jqB" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -94132,7 +94783,8 @@ /obj/structure/rack, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/item/ammo_box/shotgun/rubbershot, /obj/item/storage/box/rubbershot, @@ -94166,11 +94818,13 @@ "klk" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = 25 + name = "east bump"; + pixel_x = 30 }, /obj/structure/cable{ d1 = 1; @@ -94374,6 +95028,7 @@ /obj/machinery/dye_generator, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -94488,6 +95143,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/clothing/gloves/color/black, @@ -94726,6 +95382,7 @@ "mmw" = ( /obj/structure/chair/stool, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/cable{ @@ -94796,6 +95453,7 @@ "mqS" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/storage/box/chemimp, @@ -94808,7 +95466,8 @@ /area/security/securearmoury) "mrW" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -95068,7 +95727,8 @@ /area/hallway/secondary/entry) "mYH" = ( /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -95245,7 +95905,8 @@ /area/security/permabrig) "nqC" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -95365,7 +96026,8 @@ /obj/machinery/recharger, /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -95424,7 +96086,8 @@ "nYz" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -95483,7 +96146,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/cable{ d1 = 1; @@ -96230,6 +96894,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -96269,6 +96934,7 @@ /area/maintenance/fore2) "qXF" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/cable{ @@ -96392,7 +97058,8 @@ "rje" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 26 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -96476,7 +97143,8 @@ /obj/structure/table/wood, /obj/item/storage/box/donkpockets, /obj/structure/extinguisher_cabinet{ - pixel_y = 28 + name = "north bump"; + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -96526,6 +97194,7 @@ dir = 4 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -96556,7 +97225,8 @@ "rHU" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -96679,7 +97349,8 @@ "scA" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -96837,7 +97508,8 @@ "suy" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Departure Lounge North"; @@ -96869,7 +97541,8 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/light_switch{ dir = 1; - pixel_y = -26 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -96978,6 +97651,7 @@ "sPS" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/power/solar_control{ @@ -97251,7 +97925,8 @@ /area/hallway/primary/central) "txW" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/structure/cable{ d1 = 4; @@ -97348,6 +98023,7 @@ /area/medical/research) "tNq" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -97357,7 +98033,8 @@ /area/hallway/primary/central) "tNO" = ( /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable{ d1 = 2; @@ -97583,6 +98260,7 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -97834,6 +98512,7 @@ "vnm" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable{ @@ -97949,6 +98628,7 @@ "vDg" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -98091,6 +98771,7 @@ /obj/item/restraints/handcuffs, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -98112,6 +98793,7 @@ /area/hallway/secondary/exit) "vUu" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -98202,6 +98884,7 @@ /area/medical/medbay) "wmQ" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/suit_storage_unit/security, @@ -98368,7 +99051,8 @@ /obj/item/cultivator, /obj/item/reagent_containers/glass/bottle/nutrient/ez, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -98547,6 +99231,7 @@ "xIo" = ( /obj/structure/bed, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plating, @@ -124573,7 +125258,7 @@ cpr cqW ctF cuW -czj +cjU cij cgM czm @@ -125056,7 +125741,7 @@ bpK brK bto buy -aYO +aOg bwY bOg bzW @@ -125072,7 +125757,7 @@ bQq bWK bWK bYo -bXZ +bQr bhL cbp mMt @@ -132312,7 +132997,7 @@ dfc dgp dic djE -dkP +bXZ dmd dnl dIh @@ -134519,7 +135204,7 @@ ajf ant alm ahy -aoZ +apQ apQ apQ arE @@ -135834,7 +136519,7 @@ aRA aRd aRA hly -aIZ +aOI aYZ aYZ aYZ @@ -136091,7 +136776,7 @@ aOG aRe aOG aOG -aXH +aOG aZb baR aZa @@ -136115,7 +136800,7 @@ bCn bDZ bFP bHl -bJe +bQJ bKL bMS bOJ @@ -136372,10 +137057,10 @@ bCx byU bFB bHk -bKN +aXH bKN bMT -bOK +bKN bKM ciB bUU @@ -136632,7 +137317,7 @@ bHk bJg bKN bMU -bKN +bJe bHk ciB ciB @@ -138655,8 +139340,8 @@ aKw aKw aJc aRH -aOI aEF +aoZ aRK aEF aSe @@ -144374,7 +145059,7 @@ jKp tNq klh cLb -cPQ +bOK cOc cPR cRr @@ -144658,7 +145343,7 @@ dti duu dvI dtk -dxX +dvG dzk dAr dmt diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 35016837db3..d6086fe7659 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -423,6 +423,7 @@ /obj/item/plant_analyzer, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/hydroponics/constructable, @@ -498,7 +499,8 @@ /area/security/permabrig) "acP" = ( /obj/item/radio/intercom{ - pixel_x = 25 + name = "east bump"; + pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -590,6 +592,7 @@ pixel_y = 24 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel, @@ -904,7 +907,8 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plating, /area/security/permabrig) @@ -938,6 +942,7 @@ /area/solar/auxstarboard) "adI" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/structure/table/glass, @@ -1154,6 +1159,7 @@ "aev" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -1370,7 +1376,8 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/door_control{ id = "SecJusticeChamber"; @@ -1628,7 +1635,8 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -1666,7 +1674,8 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light{ dir = 4 @@ -1750,7 +1759,7 @@ pixel_x = 5 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1784,7 +1793,9 @@ /area/security/permabrig) "afW" = ( /obj/machinery/light_switch{ - pixel_x = 26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/structure/cable/yellow{ d1 = 1; @@ -1922,7 +1933,8 @@ /area/shuttle/pod_3) "agi" = ( /obj/item/radio/intercom{ - pixel_y = 25 + name = "north bump"; + pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2101,6 +2113,7 @@ pixel_x = 30 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 27; pixel_y = 29 }, @@ -2383,7 +2396,8 @@ /area/security/armoury) "ahf" = ( /obj/machinery/alarm{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/structure/rack, /obj/item/gun/energy/ionrifle, @@ -2855,12 +2869,13 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + name = "west bump"; + pixel_x = -24 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29; - pixel_y = 23 + name = "custom placement"; + pixel_x = -28; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2915,6 +2930,7 @@ /area/security/hos) "aic" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -3051,8 +3067,8 @@ pixel_y = -3 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 30 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3141,7 +3157,8 @@ "aiG" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -3184,6 +3201,7 @@ "aiL" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/chair/comfy/black{ @@ -3254,6 +3272,7 @@ /obj/structure/closet/secure_closet/brig, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -3375,8 +3394,8 @@ "ajd" = ( /obj/structure/closet/secure_closet/brig, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -30 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -3412,7 +3431,8 @@ "ajh" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/rack, /turf/simulated/floor/plasteel{ @@ -3481,6 +3501,7 @@ /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/head/helmet/alt, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -3497,6 +3518,7 @@ }) "ajw" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/rack, @@ -3511,22 +3533,17 @@ "ajx" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, -/obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = -20 - }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching certain areas."; +/obj/machinery/light_switch{ dir = 1; - name = "Head of Security's Monitor"; - network = list("Prison","MiniSat","tcomm"); - pixel_y = -30 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -3719,7 +3736,8 @@ "ajQ" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/light/small{ dir = 1 @@ -3961,6 +3979,7 @@ "aks" = ( /obj/structure/closet/secure_closet/security, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -4012,8 +4031,8 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) @@ -4255,6 +4274,7 @@ /area/security/hos) "akV" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/camera{ @@ -4299,8 +4319,8 @@ dir = 1 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 26 + name = "north bump"; + pixel_y = 28 }, /obj/structure/cable/yellow{ d1 = 4; @@ -4377,7 +4397,8 @@ dir = 1 }, /obj/machinery/firealarm{ - pixel_y = 27 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ @@ -4385,6 +4406,7 @@ }) "alk" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -4678,9 +4700,6 @@ /obj/structure/sign/securearea{ pixel_y = 32 }, -/obj/machinery/light_switch{ - pixel_x = -9 - }, /turf/simulated/wall/r_wall, /area/engine/engineering) "alR" = ( @@ -4716,7 +4735,8 @@ /obj/item/flashlight/seclite, /obj/machinery/firealarm{ dir = 1; - pixel_y = -28 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -5030,7 +5050,8 @@ dir = 1 }, /obj/machinery/alarm{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable/yellow{ d1 = 4; @@ -5549,6 +5570,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -5658,6 +5680,7 @@ /area/security/main) "aod" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -5828,6 +5851,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -6058,7 +6082,8 @@ }) "api" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 30 + name = "east bump"; + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -6161,7 +6186,9 @@ /area/security/evidence) "apx" = ( /obj/machinery/light_switch{ - pixel_x = 25 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -6278,7 +6305,8 @@ "apM" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ @@ -6586,7 +6614,8 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/recharger, /turf/simulated/floor/plasteel{ @@ -6704,7 +6733,7 @@ dir = 1 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/machinery/light/small, @@ -7137,7 +7166,8 @@ "arZ" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -7244,6 +7274,7 @@ "asm" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable/yellow{ @@ -7582,6 +7613,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -7617,6 +7649,7 @@ "atb" = ( /obj/item/flashlight/lamp, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/table, @@ -8102,6 +8135,7 @@ /area/maintenance/disposal) "auh" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -8138,8 +8172,8 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) @@ -8295,7 +8329,7 @@ "auH" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -8376,7 +8410,9 @@ /area/security/warden) "auP" = ( /obj/machinery/light_switch{ - pixel_y = -26 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Fitness Room - Aft"; @@ -8635,7 +8671,8 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -8798,6 +8835,7 @@ "avI" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/hologram/holopad, @@ -8815,6 +8853,7 @@ "avJ" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -8825,10 +8864,9 @@ }) "avK" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; + name = "custom placement"; pixel_x = -28; - pixel_y = 23 + pixel_y = 28 }, /obj/machinery/status_display{ pixel_y = 32 @@ -9073,7 +9111,9 @@ icon_state = "1-2" }, /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9142,7 +9182,8 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -9354,7 +9395,8 @@ "awU" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/structure/cable{ d1 = 1; @@ -9371,6 +9413,7 @@ "awV" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/clothing/under/suit_jacket/burgundy, @@ -9784,8 +9827,8 @@ /obj/structure/table/wood, /obj/item/radio/intercom{ frequency = 1424; - name = "Interrogation Intercom"; - pixel_y = -31 + name = "custom placement"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -9946,12 +9989,7 @@ name = "\improper Recreation Area" }) "axW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, +/obj/effect/spawner/window/reinforced/polarized, /turf/simulated/floor/plating, /area/security/main) "axX" = ( @@ -10082,6 +10120,7 @@ "ayp" = ( /obj/structure/dresser, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -10229,6 +10268,7 @@ "ayE" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/drone_fabricator, @@ -10321,6 +10361,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/northeast, @@ -10578,9 +10619,8 @@ /area/maintenance/starboard) "azv" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_y = 29 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -10655,6 +10695,7 @@ /area/security/brig) "azG" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -10667,7 +10708,8 @@ pixel_x = 32 }, /obj/machinery/firealarm{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -10830,6 +10872,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -10851,7 +10894,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -10926,6 +10970,7 @@ /area/security/brig) "aAe" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -11190,6 +11235,7 @@ "aAJ" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/clothing/under/assistantformal, @@ -11770,6 +11816,7 @@ /area/engine/engineering) "aCi" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/structure/table/wood, @@ -11867,6 +11914,7 @@ }) "aCv" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -11893,7 +11941,8 @@ /area/security/nuke_storage) "aCy" = ( /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; @@ -11902,6 +11951,7 @@ /area/security/nuke_storage) "aCz" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -11920,8 +11970,8 @@ broadcasting = 1; frequency = 1424; listening = 0; - name = "Interrogation Intercom"; - pixel_y = -24 + name = "custom placement"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -11951,6 +12001,7 @@ /area/engine/engineering) "aCE" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -12367,6 +12418,10 @@ pixel_x = 3; pixel_y = -7 }, +/obj/machinery/light_switch{ + name = "north bump"; + pixel_y = 24 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -12433,7 +12488,8 @@ }) "aDA" = ( /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -12701,6 +12757,7 @@ "aDZ" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/filingcabinet, @@ -12708,7 +12765,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_y = 25 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -13035,9 +13093,8 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -13310,7 +13367,8 @@ "aFf" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -13394,7 +13452,8 @@ "aFq" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13446,6 +13505,7 @@ "aFx" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/secure_data{ @@ -13515,9 +13575,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/light_switch{ - pixel_y = 38 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -13585,10 +13642,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 28 - }, /obj/item/clothing/accessory/waistcoat, /obj/item/clothing/under/suit_jacket/red, /obj/item/clothing/accessory/black, @@ -13696,8 +13749,8 @@ /area/engine/engineering) "aGb" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Engineering - Fore" @@ -13719,6 +13772,7 @@ "aGc" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, @@ -13745,9 +13799,8 @@ }) "aGh" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/camera{ c_tag = "Mining Office"; @@ -13814,6 +13867,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/spawner/lootdrop/maintenance, @@ -14010,7 +14064,8 @@ /area/security/detectives_office) "aGH" = ( /obj/machinery/newscaster{ - pixel_x = 28 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/computer/med_data{ dir = 8 @@ -14209,12 +14264,12 @@ /area/engine/engineering) "aHh" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (Captain)"; + name = "east bump"; pixel_x = 28 }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/chair{ @@ -14281,6 +14336,7 @@ "aHr" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -14307,6 +14363,7 @@ "aHt" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/closet/secure_closet/miner, @@ -14357,6 +14414,7 @@ "aHx" = ( /obj/structure/closet/crate, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -14439,7 +14497,8 @@ "aHL" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14460,6 +14519,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -14582,9 +14642,8 @@ dir = 8 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = -2 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -14600,6 +14659,7 @@ icon_state = "2-4" }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -14747,6 +14807,7 @@ /area/crew_quarters/sleep) "aIm" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/chair/office/light, @@ -14766,6 +14827,7 @@ /area/crew_quarters/sleep) "aIo" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/structure/closet/secure_closet/mime, @@ -14785,12 +14847,15 @@ /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aIr" = ( -/obj/machinery/firealarm{ +/obj/structure/chair, +/obj/machinery/button/windowtint{ dir = 4; - pixel_x = 28 + pixel_x = -26 }, -/turf/simulated/wall, -/area/crew_quarters/sleep) +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/security/main) "aIs" = ( /obj/item/flag/mime, /turf/simulated/floor/mineral/tranquillite, @@ -15065,8 +15130,8 @@ "aIV" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -30 + name = "west bump"; + pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -15119,6 +15184,7 @@ "aJa" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -15301,6 +15367,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -15344,6 +15411,7 @@ "aJv" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -15498,6 +15566,7 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -15596,11 +15665,9 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, -/obj/machinery/light_switch{ - pixel_x = -38 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) @@ -15872,6 +15939,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -16063,8 +16131,8 @@ "aKS" = ( /obj/machinery/light/small, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -16080,6 +16148,7 @@ "aKV" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -16092,6 +16161,7 @@ dir = 8 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/machinery/door_control{ @@ -16142,9 +16212,11 @@ "aLc" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -16186,6 +16258,7 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -16218,6 +16291,7 @@ /area/crew_quarters/sleep) "aLj" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light/small{ @@ -16295,6 +16369,11 @@ /obj/item/wrench, /obj/item/storage/box/lights/mixed, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aLr" = ( @@ -16490,7 +16569,8 @@ /area/quartermaster/storage) "aLQ" = ( /obj/machinery/firealarm{ - pixel_y = 27 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -16506,7 +16586,8 @@ /area/quartermaster/storage) "aLT" = ( /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -16566,6 +16647,7 @@ "aMb" = ( /obj/structure/closet/secure_closet/miner, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -16670,7 +16752,9 @@ /area/security/processing) "aMp" = ( /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -16778,8 +16862,8 @@ /area/crew_quarters/sleep) "aMB" = ( /obj/machinery/newscaster{ - pixel_x = 29; - pixel_y = 1 + name = "east bump"; + pixel_x = 32 }, /obj/structure/table/wood, /obj/item/flashlight/lamp/bananalamp, @@ -16911,6 +16995,7 @@ "aMR" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/west, @@ -17306,7 +17391,8 @@ "aNu" = ( /obj/structure/closet/secure_closet/courtroom, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/item/gavelblock, /obj/item/gavelhammer, @@ -17320,8 +17406,8 @@ /area/crew_quarters/courtroom) "aNw" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /obj/effect/landmark/start/magistrate, /turf/simulated/floor/plasteel, @@ -17343,7 +17429,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/camera{ c_tag = "Storage Wing - Security Access Door"; @@ -17389,6 +17476,7 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -17460,8 +17548,8 @@ }) "aNL" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -17600,6 +17688,11 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, /obj/effect/decal/warning_stripes/east, +/obj/machinery/light_switch{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aOh" = ( @@ -17614,6 +17707,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/reagent_dispensers/peppertank{ @@ -17650,6 +17744,7 @@ "aOk" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -17683,6 +17778,7 @@ dir = 8 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/machinery/door_control{ @@ -17773,6 +17869,7 @@ /area/crew_quarters/courtroom) "aON" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -17823,8 +17920,7 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /obj/effect/landmark/start/internal_affairs, @@ -17863,6 +17959,7 @@ }) "aOX" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/effect/decal/warning_stripes/west, @@ -18006,7 +18103,8 @@ "aPq" = ( /obj/machinery/biogenerator, /obj/machinery/firealarm{ - pixel_y = 27 + name = "north bump"; + pixel_y = 24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -18016,8 +18114,8 @@ "aPr" = ( /obj/structure/table, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel, @@ -18085,10 +18183,12 @@ "aPx" = ( /obj/machinery/vending/cigarette, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -18156,7 +18256,9 @@ dir = 4 }, /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel, /area/construction) @@ -18209,6 +18311,7 @@ "aPI" = ( /obj/machinery/seed_extractor, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/south, @@ -18362,7 +18465,8 @@ maxcharge = 15000 }, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -18425,6 +18529,7 @@ /area/turret_protected/ai_upload) "aQk" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -18434,6 +18539,7 @@ "aQp" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -18574,7 +18680,8 @@ dir = 1 }, /obj/machinery/firealarm{ - pixel_y = 27 + name = "north bump"; + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -18625,7 +18732,9 @@ pixel_y = 2 }, /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -18923,8 +19032,8 @@ }) "aRC" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -18934,6 +19043,7 @@ "aRD" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -18964,8 +19074,8 @@ icon_state = "1-8" }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Storage Wing"; @@ -19055,6 +19165,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -19084,9 +19195,8 @@ "aRR" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/item/t_scanner, /turf/simulated/floor/plasteel{ @@ -19332,7 +19442,8 @@ pixel_y = 32 }, /obj/machinery/newscaster{ - pixel_x = -31 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/wood, /area/lawoffice) @@ -19405,6 +19516,7 @@ dir = 8 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/machinery/door_control{ @@ -19423,6 +19535,7 @@ }) "aSK" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/filingcabinet/chestdrawer, @@ -19592,6 +19705,7 @@ dir = 4 }, /obj/machinery/newscaster{ + name = "east bump"; pixel_x = 32 }, /obj/machinery/door_control{ @@ -19637,6 +19751,7 @@ "aTm" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/table, @@ -20005,12 +20120,6 @@ /area/quartermaster/qm) "aUa" = ( /obj/structure/table/wood, -/obj/item/radio/intercom{ - broadcasting = 1; - dir = 8; - listening = 0; - name = "Station Intercom (Court)" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -20039,10 +20148,13 @@ /area/quartermaster/storage) "aUe" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light_switch{ - pixel_x = -25 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -20059,6 +20171,7 @@ }, /obj/structure/table, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/effect/decal/warning_stripes/south, @@ -20192,6 +20305,7 @@ "aUq" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -20338,8 +20452,8 @@ }) "aUH" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/structure/window/reinforced{ dir = 1 @@ -20442,7 +20556,8 @@ /area/space/nearstation) "aUW" = ( /obj/item/radio/intercom{ - pixel_x = 25 + name = "east bump"; + pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -20570,8 +20685,8 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/scrubber, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 26 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/light/small{ dir = 1 @@ -20661,6 +20776,7 @@ "aVv" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable/yellow{ @@ -20725,10 +20841,8 @@ /area/turret_protected/ai_upload) "aVz" = ( /obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1447; - name = "Private AI Channel"; - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera/motion{ c_tag = "AI Upload Chamber - Starboard"; @@ -20918,6 +21032,7 @@ /obj/item/clothing/mask/balaclava, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -20993,6 +21108,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -21027,6 +21143,7 @@ /area/quartermaster/qm) "aWi" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel, @@ -21062,7 +21179,9 @@ "aWl" = ( /obj/structure/closet/lawcloset, /obj/machinery/light_switch{ - pixel_y = -28 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/wood, /area/lawoffice) @@ -21177,8 +21296,8 @@ /area/maintenance/fore) "aWw" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/structure/table, /obj/machinery/cell_charger, @@ -21215,6 +21334,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -21300,7 +21420,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/computer/atmos_alert, /turf/simulated/floor/plasteel{ @@ -21309,7 +21430,9 @@ /area/engine/engineering) "aWO" = ( /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/computer/supplycomp{ dir = 4 @@ -21324,7 +21447,7 @@ dir = 8 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -21495,9 +21618,8 @@ icon_state = "1-2" }, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/structure/table, /obj/item/folder/yellow, @@ -21756,6 +21878,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -21771,7 +21894,9 @@ }) "aXT" = ( /obj/machinery/light_switch{ - pixel_y = -25 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel, /area/construction) @@ -21818,6 +21943,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants, @@ -22035,13 +22161,13 @@ /turf/simulated/floor/plating, /area/crew_quarters/courtroom) "aYC" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22153,6 +22279,7 @@ "aYP" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -22226,6 +22353,8 @@ icon_state = "0-4" }, /obj/machinery/light_switch{ + dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/power/smes/engineering, @@ -22499,6 +22628,7 @@ /obj/structure/table, /obj/item/hatchet, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/item/paper/hydroponics, @@ -22524,6 +22654,7 @@ "aZC" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/table, @@ -22583,6 +22714,7 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22735,6 +22867,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/book/manual/security_space_law{ @@ -22747,6 +22880,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -22756,6 +22890,7 @@ "aZY" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22938,7 +23073,9 @@ /area/crew_quarters/bar) "bav" = ( /obj/machinery/light_switch{ - pixel_x = 26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel, /area/construction) @@ -22991,6 +23128,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -23121,8 +23259,8 @@ /area/crew_quarters/bar) "baO" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -23206,9 +23344,8 @@ /area/quartermaster/office) "bbb" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -23220,8 +23357,8 @@ /area/quartermaster/office) "bbe" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Locker Room Port"; @@ -23307,6 +23444,7 @@ /area/turret_protected/ai_upload_foyer) "bbm" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/twohanded/required/kirbyplants{ @@ -23378,6 +23516,7 @@ /area/hallway/primary/central) "bbt" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -23388,6 +23527,7 @@ "bbu" = ( /obj/machinery/light, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -23396,6 +23536,7 @@ /area/crew_quarters/locker) "bbv" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -23657,7 +23798,9 @@ /area/maintenance/maintcentral) "bcd" = ( /obj/machinery/light_switch{ - pixel_x = 28 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -23758,9 +23901,9 @@ /obj/item/radio/intercom{ broadcasting = 1; frequency = 1447; - name = "Private AI Channel"; - pixel_x = -24; - pixel_y = 24 + name = "custom placement"; + pixel_x = -28; + pixel_y = 28 }, /obj/structure/cable/yellow{ d2 = 4; @@ -23813,6 +23956,7 @@ network = list("SS13","RD","AIUpload") }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/computer/security/telescreen{ @@ -23874,6 +24018,7 @@ }) "bcz" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/machinery/vending/coffee, @@ -23990,7 +24135,8 @@ /area/hallway/primary/central) "bcL" = ( /obj/machinery/firealarm{ - pixel_y = 32 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -24048,6 +24194,11 @@ }, /obj/item/rcs, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcX" = ( @@ -24238,8 +24389,8 @@ /area/storage/tech) "bdy" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -24277,8 +24428,8 @@ "bdB" = ( /obj/structure/chair, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -24323,6 +24474,7 @@ pixel_y = 32 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/computer/card/minor/ce, @@ -24429,8 +24581,8 @@ }) "bdQ" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -24489,6 +24641,7 @@ "bdX" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -24546,7 +24699,9 @@ icon_state = "1-2" }, /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -24850,8 +25005,8 @@ /area/storage/tech) "beH" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -24928,6 +25083,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/light_switch{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -24957,6 +25117,7 @@ }) "beR" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/item/twohanded/required/kirbyplants{ @@ -24969,6 +25130,7 @@ /area/hallway/primary/central) "beS" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/disposal, @@ -25086,11 +25248,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bfh" = ( -/obj/machinery/light_switch{ - pixel_x = -38 - }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable/yellow{ @@ -25275,6 +25435,7 @@ /area/turret_protected/ai) "bfD" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -25366,6 +25527,7 @@ "bfO" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -25375,6 +25537,7 @@ "bfR" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -25402,6 +25565,7 @@ "bfW" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -25429,6 +25593,7 @@ "bfZ" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/door/firedoor, @@ -25452,21 +25617,24 @@ name = "Arrivals" }) "bgb" = ( +/obj/machinery/washing_machine, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -27; - pixel_y = -29 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + icon_state = "barber" }, -/area/hallway/primary/central) +/area/crew_quarters/sleep) "bgd" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway - Fore - Starboard Corner"; dir = 8 }, +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -25510,6 +25678,7 @@ /area/storage/tools) "bgh" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/camera{ @@ -25574,8 +25743,8 @@ dir = 8 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/light/small{ dir = 4 @@ -25721,6 +25890,7 @@ "bgy" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -25740,6 +25910,7 @@ icon_state = "2-8" }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel, @@ -25773,8 +25944,8 @@ /area/quartermaster/storage) "bgF" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -25807,7 +25978,7 @@ /area/security/brig) "bgK" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/structure/cable/yellow{ @@ -26026,7 +26197,7 @@ /obj/item/flash, /obj/item/flash, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -26055,10 +26226,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 26 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -26135,8 +26302,8 @@ pixel_y = 32 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/item/clothing/glasses/meson/engine, /obj/effect/decal/warning_stripes/yellow, @@ -26224,6 +26391,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -26285,7 +26453,9 @@ }, /obj/structure/closet/jcloset, /obj/machinery/light_switch{ - pixel_x = 23 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel, /area/janitor) @@ -26448,6 +26618,7 @@ maxcharge = 15000 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/light/small{ @@ -26467,6 +26638,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -26542,6 +26714,7 @@ "bit" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable/yellow{ @@ -26588,8 +26761,8 @@ }) "bix" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost","Telecomms") @@ -26630,7 +26803,7 @@ /area/atmos) "biA" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "north bump"; pixel_y = 28 }, /obj/structure/rack, @@ -26719,7 +26892,8 @@ /area/quartermaster/storage) "biJ" = ( /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 6 @@ -26818,6 +26992,7 @@ "biX" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -26848,6 +27023,7 @@ "bja" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/disposalpipe/segment{ @@ -26984,6 +27160,7 @@ }) "bjl" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/light{ @@ -27009,7 +27186,9 @@ /obj/structure/table, /obj/item/storage/toolbox/emergency, /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -27100,6 +27279,7 @@ /obj/item/plant_analyzer, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -27126,6 +27306,7 @@ "bjA" = ( /obj/machinery/light, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -27152,6 +27333,7 @@ /obj/machinery/cell_charger, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/stock_parts/cell/high{ @@ -27164,6 +27346,7 @@ /area/storage/tech) "bjD" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -27182,7 +27365,7 @@ "bjF" = ( /obj/structure/closet/toolcloset, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -27225,6 +27408,7 @@ "bjI" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/closet/secure_closet/engineering_chief, @@ -27342,6 +27526,7 @@ pixel_y = -28 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/landmark{ @@ -27614,7 +27799,9 @@ /area/engine/engineering) "bkx" = ( /obj/machinery/light_switch{ - pixel_x = -25 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -27632,6 +27819,7 @@ "bkz" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -27994,7 +28182,8 @@ /area/engine/break_room) "blA" = ( /obj/item/radio/intercom{ - pixel_y = 25 + name = "north bump"; + pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -28065,8 +28254,8 @@ /area/turret_protected/ai) "blI" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /obj/machinery/status_display{ layer = 4; @@ -28085,6 +28274,7 @@ pixel_y = -28 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/landmark{ @@ -28096,7 +28286,9 @@ /area/turret_protected/ai) "blK" = ( /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -28128,7 +28320,8 @@ pixel_y = -10 }, /obj/item/radio/intercom{ - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/effect/landmark/start/ai, /turf/simulated/floor/bluegrid, @@ -28140,7 +28333,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/suit/storage/hazardvest, @@ -28234,6 +28428,7 @@ "blX" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/closet, @@ -28307,6 +28502,7 @@ "bmc" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -28427,6 +28623,7 @@ /area/quartermaster/office) "bml" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28440,7 +28637,8 @@ "bmm" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -28453,7 +28651,8 @@ /area/engine/chiefs_office) "bmn" = ( /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28672,7 +28871,8 @@ icon_state = "1-2" }, /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -28791,7 +28991,9 @@ /area/crew_quarters/kitchen) "bmP" = ( /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 30 @@ -28844,6 +29046,7 @@ }) "bmT" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -28861,8 +29064,7 @@ pixel_y = 4 }, /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (Captain)"; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/carpet, @@ -28871,7 +29073,9 @@ }) "bmV" = ( /obj/machinery/light_switch{ - pixel_y = -25 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/flask/gold, @@ -28948,7 +29152,8 @@ /area/hallway/primary/starboard) "bnh" = ( /obj/machinery/firealarm{ - pixel_y = 32 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -29004,6 +29209,7 @@ /area/hallway/primary/central) "bnn" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -29025,6 +29231,7 @@ /area/hallway/primary/starboard) "bnq" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -29054,6 +29261,7 @@ "bnu" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -29148,7 +29356,9 @@ }) "bnE" = ( /obj/machinery/light_switch{ - pixel_x = 28 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/structure/dresser, /obj/item/storage/secure/safe{ @@ -29196,7 +29406,9 @@ /obj/item/multitool, /obj/item/clothing/glasses/meson, /obj/machinery/light_switch{ - pixel_y = -28 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -29224,7 +29436,7 @@ /area/maintenance/starboard) "bnM" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/machinery/disposal, @@ -29442,6 +29654,7 @@ "bog" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/table/reinforced, @@ -29469,7 +29682,9 @@ pixel_y = 3 }, /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/item/rcs, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -29700,9 +29915,8 @@ pixel_y = 5 }, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_x = -27 + name = "west bump"; + pixel_x = -28 }, /obj/item/paper/safe_code{ owner = "captain" @@ -29939,7 +30153,8 @@ "bpg" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -30214,7 +30429,7 @@ "bpN" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/machinery/camera{ @@ -30274,6 +30489,7 @@ "bpP" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/storage/box, @@ -30293,6 +30509,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -30371,8 +30588,8 @@ /obj/structure/table, /obj/item/toner, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 30 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -30509,7 +30726,9 @@ }, /obj/machinery/light, /obj/machinery/light_switch{ - pixel_y = -25 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/effect/landmark/start/captain, /turf/simulated/floor/plasteel{ @@ -30544,6 +30763,7 @@ "bqs" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/landmark/start/captain, @@ -30609,8 +30829,8 @@ /area/hallway/primary/starboard) "bqA" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -30650,6 +30870,7 @@ "bqE" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -30932,8 +31153,8 @@ /area/shuttle/arrival/station) "brq" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) @@ -31246,6 +31467,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -31256,6 +31478,7 @@ "brP" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/paper_bin{ @@ -31476,7 +31699,8 @@ /obj/item/multitool, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/cable/yellow{ d1 = 1; @@ -31527,7 +31751,9 @@ /area/maintenance/starboard) "bss" = ( /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -31616,8 +31842,7 @@ "bsE" = ( /obj/machinery/light/small, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/vehicle/janicart, @@ -31659,7 +31884,9 @@ }, /obj/item/bikehorn/rubberducky, /obj/machinery/light_switch{ - pixel_x = -28 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/item/card/id/captains_spare, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31777,6 +32004,7 @@ }) "bsV" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -31787,6 +32015,7 @@ "bsW" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/teleporter, @@ -31813,7 +32042,9 @@ icon_state = "2-4" }, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -31886,6 +32117,7 @@ layer = 2 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/portable_atmospherics/canister/air, @@ -31985,7 +32217,8 @@ /area/hallway/primary/port) "btu" = ( /obj/machinery/firealarm{ - pixel_y = 32 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -32044,8 +32277,8 @@ /area/hallway/primary/central) "btD" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/light{ dir = 1 @@ -32102,7 +32335,8 @@ /area/hallway/primary/central) "btL" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 30 + name = "east bump"; + pixel_x = 27 }, /obj/structure/sign/double/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -32140,8 +32374,8 @@ "btO" = ( /obj/structure/table, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /obj/item/storage/firstaid/regular, /obj/machinery/power/apc{ @@ -32171,7 +32405,8 @@ "btR" = ( /obj/machinery/autolathe, /obj/machinery/newscaster{ - pixel_x = 28 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -32272,9 +32507,8 @@ /area/bridge) "btY" = ( /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_y = 29 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -32330,6 +32564,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -32339,6 +32574,7 @@ "buc" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/storage/fancy/donut_box, @@ -32399,8 +32635,7 @@ }) "buh" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (Captain)"; + name = "east bump"; pixel_x = 28 }, /obj/machinery/ai_status_display{ @@ -32426,8 +32661,7 @@ }) "buj" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /obj/machinery/camera{ @@ -32489,7 +32723,9 @@ /area/civilian/barber) "buo" = ( /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -32601,6 +32837,7 @@ "buD" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -32743,6 +32980,7 @@ dir = 1 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -32778,7 +33016,9 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = 23 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 1 @@ -32812,6 +33052,7 @@ }) "buV" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -32845,7 +33086,9 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/camera/motion{ c_tag = "Mini Satellite Antechamber"; @@ -32927,7 +33170,9 @@ network = list("SS13","MiniSat") }, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/ai_slipper, /obj/effect/decal/warning_stripes/north, @@ -32956,8 +33201,8 @@ }) "bvg" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /obj/structure/showcase{ density = 0; @@ -33112,6 +33357,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/camera{ @@ -33137,6 +33383,7 @@ /area/hallway/primary/central) "bvt" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/camera{ @@ -33147,6 +33394,7 @@ /area/engine/break_room) "bvu" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table, @@ -33155,6 +33403,7 @@ pixel_y = 10 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -33179,6 +33428,7 @@ "bvw" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/showcase{ @@ -33272,8 +33522,8 @@ "bvE" = ( /obj/machinery/vending/cola, /obj/machinery/newscaster{ - pixel_x = -28; - pixel_y = 1 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -33556,8 +33806,8 @@ }) "bwb" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -33703,6 +33953,7 @@ /area/bridge) "bwo" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -33810,7 +34061,8 @@ "bwA" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start/barber, @@ -34151,6 +34403,7 @@ "bxn" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable/yellow{ @@ -34203,6 +34456,7 @@ "bxr" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -34460,8 +34714,8 @@ icon_state = "1-8" }, /obj/machinery/newscaster{ - pixel_x = 28; - pixel_y = 1 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -34528,7 +34782,7 @@ /area/hallway/primary/port) "bxS" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -34558,6 +34812,7 @@ "bxX" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -34588,8 +34843,8 @@ req_access_txt = "57" }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/wood, /area/crew_quarters/heads) @@ -34605,6 +34860,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -34680,7 +34936,9 @@ req_access_txt = "28" }, /obj/machinery/light_switch{ - pixel_x = -25; + dir = 4; + name = "custom placement"; + pixel_x = -24; pixel_y = 5 }, /turf/simulated/floor/carpet, @@ -34736,6 +34994,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/rack, @@ -34753,7 +35012,9 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_y = -25 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/machinery/vending/cola{ pixel_x = 2 @@ -34801,6 +35062,7 @@ /obj/structure/closet/secure_closet/hop, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -34833,7 +35095,8 @@ /obj/item/wrench, /obj/item/multitool, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -34841,8 +35104,8 @@ /area/bridge) "byy" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/structure/rack, /obj/item/assembly/signaler, @@ -34879,7 +35142,9 @@ pixel_y = 3 }, /obj/machinery/light_switch{ - pixel_x = 28 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ @@ -35130,14 +35395,15 @@ "byY" = ( /obj/machinery/light/small, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -30 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byZ" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35748,8 +36014,9 @@ /area/crew_quarters/heads) "bAb" = ( /obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = -26 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -35847,6 +36114,7 @@ }) "bAr" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/item/storage/box/donkpockets, @@ -35937,6 +36205,7 @@ "bAA" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -36027,14 +36296,9 @@ }) "bAU" = ( /obj/machinery/light/small, -/obj/machinery/light_switch{ - pixel_x = -8; - pixel_y = -24 - }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 5; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /obj/structure/rack, /obj/item/wrench, @@ -36054,6 +36318,11 @@ /obj/structure/rack, /obj/item/clothing/mask/gas, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36061,6 +36330,7 @@ "bAW" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/power/apc{ @@ -36186,6 +36456,7 @@ /obj/structure/window/reinforced, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small, @@ -36214,9 +36485,8 @@ }, /obj/machinery/light, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 5; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -36266,7 +36536,9 @@ }) "bBn" = ( /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/cryopod/robot, /obj/machinery/computer/cryopod/robot{ @@ -36281,6 +36553,7 @@ }) "bBp" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -36503,6 +36776,8 @@ /area/bridge) "bBV" = ( /obj/machinery/light_switch{ + dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/disposal, @@ -36590,7 +36865,9 @@ /obj/structure/table/wood, /obj/structure/window/reinforced, /obj/machinery/light_switch{ - pixel_x = -28 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/item/storage/secure/briefcase{ pixel_x = -2; @@ -36614,9 +36891,8 @@ /obj/item/hand_tele, /obj/structure/window/reinforced, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ @@ -36818,9 +37094,8 @@ icon_state = "1-2" }, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_x = -26 + name = "west bump"; + pixel_x = -28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -36829,6 +37104,7 @@ "bCB" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -36885,6 +37161,7 @@ "bCJ" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/arcade, @@ -37052,7 +37329,8 @@ /area/tcommsat/computer) "bDg" = ( /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/structure/showcase{ density = 0; @@ -37071,9 +37349,8 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (Telecoms)"; - pixel_y = 30 + name = "north bump"; + pixel_y = 28 }, /obj/structure/table/wood, /obj/item/phone{ @@ -37170,6 +37447,7 @@ }) "bDq" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37182,6 +37460,7 @@ "bDr" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -37220,6 +37499,7 @@ "bDu" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -37243,6 +37523,7 @@ "bDw" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/item/folder, @@ -37257,6 +37538,7 @@ "bDx" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -37266,6 +37548,8 @@ /area/hallway/primary/port) "bDy" = ( /obj/machinery/firealarm{ + dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -37302,6 +37586,7 @@ "bDB" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -37422,6 +37707,7 @@ /obj/machinery/vending/cigarette, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -37446,8 +37732,7 @@ "bDM" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; + name = "north bump"; pixel_y = 28 }, /obj/item/flashlight/lamp/green{ @@ -37485,7 +37770,9 @@ pixel_y = 5 }, /obj/machinery/light_switch{ - pixel_x = 28 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -37522,7 +37809,8 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/machinery/chem_dispenser/soda, /obj/structure/sign/barsign{ @@ -37536,7 +37824,8 @@ /obj/structure/table/wood, /obj/item/folder/yellow, /obj/machinery/firealarm{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/item/book/manual/security_space_law{ pixel_y = 3 @@ -37586,6 +37875,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -37659,6 +37949,7 @@ "bEn" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -37695,6 +37986,7 @@ "bEp" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -37707,6 +37999,7 @@ dir = 1 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -37791,7 +38084,8 @@ "bEB" = ( /obj/structure/piano, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/structure/window/reinforced{ dir = 8 @@ -37828,7 +38122,9 @@ pixel_y = 28 }, /obj/machinery/light_switch{ - pixel_x = 25 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -37859,13 +38155,14 @@ /area/hallway/primary/starboard) "bEK" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -30 + name = "west bump"; + pixel_x = -28 }, /obj/item/crowbar/red, /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table, @@ -37924,14 +38221,15 @@ icon_state = "0-4" }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bEP" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/structure/cable/yellow{ d1 = 4; @@ -37949,6 +38247,7 @@ "bEQ" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -38033,6 +38332,7 @@ /area/atmos) "bEY" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -38059,6 +38359,7 @@ /area/atmos) "bFa" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/light{ @@ -38098,8 +38399,8 @@ /area/tcommsat/computer) "bFe" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Arrivals - Middle Arm - Far"; @@ -38112,9 +38413,8 @@ }) "bFf" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 5; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/computer/monitor{ dir = 1; @@ -38271,9 +38571,8 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -38297,8 +38596,8 @@ /area/library) "bFA" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -30 + name = "west bump"; + pixel_x = -28 }, /obj/machinery/light{ dir = 8 @@ -38377,8 +38676,8 @@ }) "bFJ" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -38455,6 +38754,7 @@ "bFS" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/vending/cigarette{ @@ -38484,6 +38784,7 @@ "bFV" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -38515,6 +38816,7 @@ "bFY" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "west bump"; pixel_x = -32 }, /turf/simulated/floor/wood, @@ -38524,9 +38826,8 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_x = -26 + name = "west bump"; + pixel_x = -28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38553,6 +38854,7 @@ }) "bGc" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -38669,6 +38971,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/clothing/head/sombrero, @@ -38817,6 +39120,7 @@ "bGD" = ( /obj/machinery/space_heater, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/west, @@ -38909,7 +39213,9 @@ }, /obj/structure/table, /obj/machinery/light_switch{ - pixel_x = 26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -39002,10 +39308,13 @@ pixel_y = 3 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39052,6 +39361,7 @@ "bHi" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/message_monitor{ @@ -39141,8 +39451,8 @@ }) "bHq" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -39268,6 +39578,7 @@ /area/atmos) "bHH" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/carpet, @@ -39385,6 +39696,7 @@ "bHY" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/table/wood, @@ -39586,9 +39898,8 @@ /area/atmos) "bIy" = ( /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ @@ -39703,6 +40014,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/folder/red, @@ -39731,6 +40043,7 @@ "bIX" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -39932,6 +40245,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/paper_bin{ @@ -40047,7 +40361,9 @@ "bJu" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_x = -28 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/item/folder, /turf/simulated/floor/wood, @@ -40099,6 +40415,7 @@ "bJz" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/item/clipboard, @@ -40120,6 +40437,7 @@ specialfunctions = 4 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel, @@ -40128,6 +40446,7 @@ }) "bJB" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -40306,8 +40625,8 @@ pixel_y = 5 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/camera{ c_tag = "Theatre - Stage"; @@ -40500,6 +40819,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -40631,6 +40951,7 @@ pixel_y = 5 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/structure/table/wood, @@ -40692,6 +41013,7 @@ "bKE" = ( /obj/machinery/vending/coffee, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/light{ @@ -40766,6 +41088,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40784,6 +41107,7 @@ pixel_y = 5 }, /obj/machinery/newscaster{ + name = "west bump"; pixel_x = -32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -40797,6 +41121,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -40850,7 +41175,8 @@ icon_state = "4-8" }, /obj/machinery/newscaster{ - pixel_y = -29 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -40980,7 +41306,8 @@ icon_state = "1-4" }, /obj/machinery/newscaster{ - pixel_y = -29 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -41034,6 +41361,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -41309,8 +41637,8 @@ }) "bLS" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41367,6 +41695,7 @@ "bLW" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/door_control{ @@ -41685,8 +42014,8 @@ /area/security/vacantoffice) "bMF" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Command Hallway - Starboard" @@ -42011,8 +42340,8 @@ /area/medical/medbay3) "bNA" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -42042,7 +42371,9 @@ /area/crew_quarters/kitchen) "bNC" = ( /obj/machinery/light_switch{ - pixel_y = -26 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -42055,6 +42386,7 @@ "bND" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -42113,6 +42445,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -42323,6 +42656,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -42419,6 +42753,7 @@ specialfunctions = 4 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel, @@ -42466,9 +42801,8 @@ pixel_y = 9 }, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -42512,8 +42846,8 @@ "bOA" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light_switch{ - pixel_x = -8; - pixel_y = 30 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -42603,6 +42937,7 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/camera{ @@ -42626,6 +42961,7 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -42751,7 +43087,8 @@ "bOY" = ( /obj/machinery/vending/cigarette, /obj/machinery/newscaster{ - pixel_y = -29 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -42789,7 +43126,8 @@ "bPb" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ @@ -42811,6 +43149,7 @@ specialfunctions = 4 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plating, @@ -42828,7 +43167,9 @@ /area/crew_quarters/theatre) "bPe" = ( /obj/machinery/light_switch{ - pixel_y = -28 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/machinery/light, /turf/simulated/floor/carpet, @@ -42849,6 +43190,7 @@ "bPi" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -42933,6 +43275,7 @@ "bPq" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/closet/crate, @@ -43077,7 +43420,8 @@ /area/space/nearstation) "bPI" = ( /obj/item/radio/intercom{ - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/engine, /area/toxins/xenobiology{ @@ -43113,8 +43457,8 @@ /area/crew_quarters/kitchen) "bPR" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /turf/simulated/floor/wood, /area/security/vacantoffice) @@ -43140,6 +43484,7 @@ "bPV" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -43150,6 +43495,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -43206,6 +43552,7 @@ "bQc" = ( /obj/structure/closet/secure_closet/exile, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -43258,6 +43605,7 @@ /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -43322,7 +43670,9 @@ /area/blueshield) "bQp" = ( /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/wood, /area/blueshield) @@ -43331,7 +43681,9 @@ /area/ntrep) "bQu" = ( /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/wood, /area/ntrep) @@ -43386,10 +43738,12 @@ /obj/structure/table, /obj/item/clothing/head/cakehat, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -43407,7 +43761,7 @@ /area/gateway) "bQE" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -43509,7 +43863,8 @@ "bQP" = ( /obj/machinery/vending/snack, /obj/machinery/newscaster{ - pixel_y = -29 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) @@ -43517,6 +43872,7 @@ /obj/machinery/vending/coffee, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/carpet, @@ -43557,7 +43913,7 @@ /area/crew_quarters/theatre) "bQV" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 6; + name = "south bump"; pixel_y = -30 }, /obj/machinery/keycard_auth{ @@ -43835,6 +44191,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -43962,6 +44319,7 @@ /area/library) "bRO" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -44099,20 +44457,16 @@ /turf/simulated/floor/wood, /area/blueshield) "bSa" = ( -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bSb" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bSc" = ( /obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -1 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/wood, /area/blueshield) @@ -44131,8 +44485,8 @@ /area/ntrep) "bSg" = ( /obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -1 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/wood, /area/ntrep) @@ -44230,6 +44584,7 @@ "bSq" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -44326,7 +44681,9 @@ /area/crew_quarters/kitchen) "bSz" = ( /obj/machinery/light_switch{ - pixel_x = 28 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/libraryscanner, /turf/simulated/floor/wood, @@ -44447,6 +44804,7 @@ /area/atmos) "bSN" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -44554,6 +44912,7 @@ /area/hallway/primary/central) "bSX" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light/small{ @@ -44594,6 +44953,7 @@ /area/medical/morgue) "bTb" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/morgue, @@ -44760,6 +45120,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable/yellow{ @@ -44825,6 +45186,7 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -44845,13 +45207,16 @@ /area/library) "bTz" = ( /obj/machinery/light_switch{ - pixel_y = -28 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/wood, /area/library) "bTA" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -44911,6 +45276,7 @@ /area/gateway) "bTH" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -44931,6 +45297,7 @@ "bTK" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -44940,6 +45307,7 @@ "bTL" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -44957,6 +45325,7 @@ "bTO" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -44967,13 +45336,16 @@ "bTP" = ( /obj/structure/dresser, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bTQ" = ( /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -44986,6 +45358,7 @@ /obj/structure/closet/secure_closet/medical1, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -45030,8 +45403,7 @@ /area/maintenance/maintcentral) "bTW" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -45064,6 +45436,7 @@ "bUf" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/vending/dinnerware, @@ -45114,8 +45487,8 @@ "bUo" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -26 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Atmospherics - Central"; @@ -45340,6 +45713,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -45388,8 +45762,8 @@ /area/gateway) "bUW" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -45408,9 +45782,7 @@ pixel_x = 7; pixel_y = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bUY" = ( /obj/structure/table/wood, @@ -45421,9 +45793,7 @@ pixel_y = 6 }, /obj/item/paper/blueshield, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bVa" = ( /obj/machinery/photocopier, @@ -45482,9 +45852,8 @@ "bVf" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/item/hand_labeler, /obj/item/stack/packageWrap, @@ -45525,9 +45894,8 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 0; - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -45613,6 +45981,7 @@ /area/crew_quarters/sleep) "bVp" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/structure/closet/secure_closet/freezer/meat, @@ -45646,12 +46015,13 @@ id = "kitchen"; name = "Kitchen Shutters Control"; pixel_x = -4; - pixel_y = 26; + pixel_y = 24; req_access_txt = "28" }, /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = 6; - pixel_y = 26 + pixel_y = 24 }, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ @@ -45683,6 +46053,7 @@ /area/crew_quarters/kitchen) "bVv" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/cable/yellow{ @@ -45854,6 +46225,7 @@ }) "bVQ" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/atmospherics/binary/pump{ @@ -46025,6 +46397,7 @@ "bWh" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/southwest, @@ -46145,6 +46518,7 @@ "bWz" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -46235,15 +46609,11 @@ dir = 4 }, /obj/effect/landmark/start/blueshield, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bWI" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bWJ" = ( /obj/structure/chair/comfy/black{ @@ -46251,9 +46621,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "bWK" = ( /obj/item/flag/nt, @@ -46415,6 +46783,7 @@ /area/gateway) "bXb" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/closet/secure_closet/freezer/fridge, @@ -46503,7 +46872,8 @@ /obj/machinery/icemachine, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -46522,6 +46892,7 @@ /obj/item/clothing/mask/cigarette/pipe, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -46545,11 +46916,12 @@ "bXr" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -46605,6 +46977,7 @@ "bXy" = ( /obj/structure/cult/archives, /obj/machinery/newscaster{ + name = "west bump"; pixel_x = -32 }, /obj/item/clothing/under/suit_jacket/red, @@ -46741,6 +47114,7 @@ /area/space/nearstation) "bXP" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -46762,7 +47136,8 @@ /obj/item/taperecorder, /obj/item/camera, /obj/item/radio/intercom{ - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -46779,9 +47154,8 @@ /area/library) "bXT" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -46844,6 +47218,7 @@ /obj/structure/closet/secure_closet/blueshield, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -46905,6 +47280,7 @@ "bYi" = ( /obj/machinery/hologram/holopad, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/wood, @@ -46913,6 +47289,7 @@ /obj/structure/closet/secure_closet/ntrep, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -46994,6 +47371,7 @@ "bYr" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -47179,6 +47557,7 @@ /obj/item/storage/fancy/donut_box, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -47357,6 +47736,7 @@ "bZb" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/power/apc{ @@ -47414,9 +47794,8 @@ /area/library) "bZg" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -47425,6 +47804,7 @@ "bZh" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -47447,6 +47827,7 @@ /area/civilian/barber) "bZj" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/kitchen_machine/oven, @@ -47594,6 +47975,7 @@ "bZD" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -47606,6 +47988,7 @@ "bZG" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/portables_connector{ @@ -47704,6 +48087,7 @@ /area/maintenance/aft) "bZW" = ( /obj/machinery/newscaster{ + name = "west bump"; pixel_x = -32 }, /turf/simulated/floor/wood, @@ -47724,6 +48108,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -47731,6 +48116,7 @@ "caa" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera/autoname{ @@ -47840,7 +48226,8 @@ }) "can" = ( /obj/machinery/firealarm{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -47919,7 +48306,8 @@ "caA" = ( /obj/machinery/vending/snack, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -48044,6 +48432,7 @@ }) "caL" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/northeastcorner, @@ -48079,8 +48468,8 @@ /area/hallway/primary/central) "caP" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel, @@ -48177,7 +48566,8 @@ /area/maintenance/starboard) "cba" = ( /obj/item/radio/intercom{ - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Kitchen"; @@ -48190,8 +48580,8 @@ /area/crew_quarters/kitchen) "cbb" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -48263,6 +48653,7 @@ /area/hallway/primary/central) "cbj" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/effect/decal/warning_stripes/northwestcorner, @@ -48746,9 +49137,8 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plating, /area/maintenance/portsolar) @@ -48782,8 +49172,8 @@ dir = 8 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 29 + name = "north bump"; + pixel_y = 28 }, /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, @@ -48940,6 +49330,7 @@ "ccI" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -48988,6 +49379,7 @@ "ccU" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -49083,7 +49475,8 @@ /area/maintenance/portsolar) "cdk" = ( /obj/machinery/firealarm{ - pixel_y = 29 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -49322,6 +49715,7 @@ "cdE" = ( /obj/machinery/light, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/camera{ @@ -49351,6 +49745,7 @@ "cdI" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/item/storage/backpack/satchel_hyd, @@ -49511,6 +49906,7 @@ "cei" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/twohanded/required/kirbyplants{ @@ -49522,7 +49918,8 @@ /area/hallway/primary/central) "cej" = ( /obj/machinery/newscaster{ - pixel_y = -29 + name = "south bump"; + pixel_y = -32 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -49647,6 +50044,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -49848,6 +50246,7 @@ /area/quartermaster/office) "ceY" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table, @@ -49961,6 +50360,7 @@ /area/bridge) "cfi" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants{ @@ -49997,6 +50397,7 @@ /obj/item/seeds/potato, /obj/item/seeds/apple, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/light{ @@ -50026,6 +50427,7 @@ pixel_y = 5 }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/effect/spawner/lootdrop/maintenance, @@ -50135,11 +50537,8 @@ /area/maintenance/starboard) "cfz" = ( /obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1485; - listening = 0; - name = "Station Intercom (Medbay)"; - pixel_y = 30 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/vending/medidrobe, /turf/simulated/floor/plasteel{ @@ -50194,6 +50593,7 @@ /area/maintenance/aft) "cfF" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -50203,6 +50603,7 @@ /area/medical/paramedic) "cfG" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/structure/table/glass, @@ -50235,9 +50636,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cfK" = ( /turf/simulated/wall, @@ -50258,7 +50657,9 @@ "cfM" = ( /obj/machinery/biogenerator, /obj/machinery/light_switch{ - pixel_x = 26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -50300,7 +50701,9 @@ "cfS" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/item/storage/backpack/satchel_hyd, /turf/simulated/floor/plasteel{ @@ -50310,6 +50713,7 @@ "cfT" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -50519,6 +50923,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -50635,8 +51040,8 @@ /obj/structure/closet/paramedic, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = 5 + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -50678,6 +51083,7 @@ "cgM" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/sink{ @@ -50874,8 +51280,8 @@ /area/maintenance/incinerator) "chg" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -30 + name = "west bump"; + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -51135,7 +51541,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable/yellow{ d1 = 4; @@ -51186,6 +51593,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -51241,6 +51649,7 @@ "chZ" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/crew{ @@ -51357,7 +51766,8 @@ dir = 1 }, /obj/item/radio/intercom{ - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -51615,7 +52025,9 @@ /area/atmos) "ciP" = ( /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/light/small{ dir = 8 @@ -51759,7 +52171,9 @@ }) "ciZ" = ( /obj/machinery/light_switch{ - pixel_y = -28 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/machinery/disposal{ pixel_x = -2; @@ -51874,7 +52288,8 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister, /obj/structure/extinguisher_cabinet{ - pixel_x = 31 + name = "east bump"; + pixel_x = 27 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -51937,6 +52352,7 @@ }) "cjw" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/bed/roller, @@ -52023,6 +52439,7 @@ /obj/item/storage/toolbox/emergency, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -52178,6 +52595,7 @@ "cjZ" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/hydroponics/constructable, @@ -52250,9 +52668,8 @@ "ckf" = ( /obj/structure/bed/roller, /obj/item/radio/intercom{ - frequency = 1485; - name = "Station Intercom (Medbay)"; - pixel_y = -30 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -52379,6 +52796,7 @@ "cku" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/plantgenes, @@ -52458,8 +52876,8 @@ /area/maintenance/aft) "ckE" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -30 + name = "south bump"; + pixel_y = -28 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -52663,8 +53081,8 @@ /obj/structure/table, /obj/item/paicard, /obj/machinery/newscaster{ - pixel_x = -1; - pixel_y = -29 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -52700,6 +53118,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/sink{ @@ -52856,7 +53275,9 @@ icon_state = "0-4" }, /obj/machinery/light_switch{ - pixel_x = -26 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/light/small, /obj/structure/table/glass, @@ -52952,7 +53373,7 @@ /area/space/nearstation) "clI" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/optable, @@ -53088,6 +53509,7 @@ "clY" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet/secure_closet/medical3, @@ -53162,6 +53584,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -53288,6 +53711,7 @@ /area/toxins/explab) "cmD" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table/glass, @@ -53512,6 +53936,7 @@ "cnd" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -53605,7 +54030,8 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -28 + name = "south bump"; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -53821,11 +54247,12 @@ /area/medical/research) "cnH" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -31 + name = "west bump"; + pixel_x = -27 }, /obj/machinery/computer/turbine_computer{ dir = 1; @@ -53872,7 +54299,8 @@ /area/toxins/explab) "cnN" = ( /obj/item/radio/intercom{ - pixel_y = 25 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/engine, /area/toxins/explab) @@ -54148,7 +54576,9 @@ /area/maintenance/incinerator) "cot" = ( /obj/machinery/light_switch{ - pixel_x = 23 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -54214,6 +54644,7 @@ dir = 1 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/wood, @@ -54314,7 +54745,9 @@ /area/medical/exam_room) "coG" = ( /obj/machinery/light_switch{ - pixel_x = 23 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/wall/r_wall, /area/hallway/primary/aft) @@ -54418,6 +54851,7 @@ "coV" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/vending/cola, @@ -54699,7 +55133,8 @@ /area/maintenance/aft) "cpC" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 24 + name = "east bump"; + pixel_x = 27 }, /obj/machinery/disposal{ pixel_x = 5 @@ -54735,9 +55170,8 @@ }) "cpF" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -54877,6 +55311,7 @@ name = "Robotics Operating Table" }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/camera{ @@ -54898,7 +55333,8 @@ "cpT" = ( /obj/structure/chair/stool, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -55138,6 +55574,7 @@ "cqs" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/sink{ @@ -55154,6 +55591,7 @@ "cqv" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/rdconsole/core{ @@ -55165,8 +55603,8 @@ "cqw" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -55180,6 +55618,7 @@ /obj/structure/closet/firecloset, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, @@ -55651,6 +56090,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -55700,6 +56140,7 @@ "crO" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/closet/firecloset, @@ -55748,7 +56189,9 @@ network = list("SS13","RD") }, /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/structure/table, /obj/item/stack/cable_coil, @@ -55776,11 +56219,8 @@ /area/medical/surgery1) "crW" = ( /obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1485; - listening = 0; - name = "Station Intercom (Medbay)"; - pixel_y = -30 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -56427,8 +56867,7 @@ /area/hallway/primary/aft) "csU" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /obj/machinery/light{ @@ -56810,6 +57249,7 @@ /area/medical/reception) "ctQ" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -56827,6 +57267,7 @@ /area/toxins/explab) "ctT" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/closet/crate/freezer/iv_storage, @@ -57014,8 +57455,8 @@ /area/medical/research) "cut" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -57047,6 +57488,7 @@ /area/medical/research) "cux" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/requests_console{ @@ -57267,6 +57709,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -57823,7 +58266,8 @@ /area/maintenance/aft) "cvX" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 29 + name = "north bump"; + pixel_y = 30 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -57858,7 +58302,8 @@ "cwc" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -57905,6 +58350,7 @@ /area/medical/surgery1) "cwh" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/effect/decal/warning_stripes/west, @@ -58022,6 +58468,7 @@ /obj/structure/table, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -58042,13 +58489,16 @@ name = "Surgery Cleaner" }, /obj/machinery/light_switch{ - pixel_x = 5; - pixel_y = -27 + dir = 1; + name = "custom placement"; + pixel_x = 4; + pixel_y = -24 }, /obj/machinery/holosign_switch{ + dir = 1; id = "surgery2"; - pixel_x = -5; - pixel_y = -27 + pixel_x = -4; + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -58107,6 +58557,7 @@ "cwK" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/sink{ @@ -58122,6 +58573,7 @@ "cwL" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -58229,8 +58681,8 @@ /area/toxins/explab) "cxa" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Experimentation Lab"; @@ -58402,8 +58854,8 @@ "cxE" = ( /obj/structure/bed/roller, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -58657,6 +59109,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/stack/cable_coil, @@ -58673,6 +59126,7 @@ "cyb" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/west, @@ -58787,7 +59241,9 @@ /area/medical/surgery1) "cyr" = ( /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -59098,7 +59554,8 @@ department = "Chief Medical Officer's Office" }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/machinery/camera{ c_tag = "Medbay Surgery 1 North" @@ -59163,6 +59620,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -59382,6 +59840,7 @@ }, /obj/structure/cable/yellow, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -59392,6 +59851,7 @@ "czB" = ( /obj/structure/closet/secure_closet/CMO, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -59588,6 +60048,7 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -59745,8 +60206,8 @@ }, /obj/item/storage/box/bodybags, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ @@ -59770,6 +60231,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/sign/nosmoking_2{ @@ -59840,6 +60302,7 @@ "cAA" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -59976,6 +60439,7 @@ /obj/item/storage/secure/briefcase, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -60118,7 +60582,8 @@ pixel_x = 32 }, /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -60286,8 +60751,8 @@ pixel_y = 2 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ @@ -60364,7 +60829,9 @@ "cBI" = ( /obj/machinery/portable_atmospherics/scrubber/huge, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -60563,8 +61030,8 @@ "cBY" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -60621,6 +61088,7 @@ /obj/item/reagent_containers/glass/beaker/large, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/reagent_containers/glass/beaker/large, @@ -60729,6 +61197,7 @@ "cCo" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/trunk{ @@ -60741,8 +61210,8 @@ /area/medical/reception) "cCp" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -61047,7 +61516,9 @@ pixel_y = 2 }, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -61073,6 +61544,7 @@ "cCP" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -61085,6 +61557,7 @@ /area/medical/research) "cCQ" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -61104,6 +61577,7 @@ "cCT" = ( /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -61113,11 +61587,12 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -61128,6 +61603,7 @@ /obj/machinery/portable_atmospherics/canister/toxins, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light/small, @@ -61219,7 +61695,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/vending/atmosdrobe, /obj/effect/decal/warning_stripes/south, @@ -61405,7 +61882,9 @@ "cDA" = ( /obj/machinery/dna_scannernew, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -61462,6 +61941,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -61496,6 +61976,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -61513,7 +61994,9 @@ }, /obj/structure/cable/yellow, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/item/twohanded/required/kirbyplants/dead, /turf/simulated/floor/plasteel{ @@ -61546,7 +62029,9 @@ "cDO" = ( /obj/structure/bed/dogbed, /obj/machinery/light_switch{ - pixel_y = -25 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /mob/living/simple_animal/pet/cat/Runtime, /turf/simulated/floor/plasteel{ @@ -61765,6 +62250,7 @@ "cEs" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -61865,7 +62351,9 @@ "cEH" = ( /obj/item/cigbutt, /obj/machinery/light_switch{ - pixel_y = -23 + dir = 1; + name = "south bump"; + pixel_y = -24 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -62004,6 +62492,7 @@ "cEX" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -62047,8 +62536,8 @@ /area/medical/surgery2) "cFb" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/structure/sink{ dir = 4; @@ -62085,9 +62574,11 @@ "cFf" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/paper_bin{ @@ -62164,10 +62655,6 @@ pixel_x = -26; pixel_y = 6 }, -/obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = -2 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -62186,8 +62673,8 @@ /area/assembly/chargebay) "cFo" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/computer/mech_bay_power_console, /turf/simulated/floor/bluegrid{ @@ -62348,6 +62835,7 @@ dir = 1 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -62480,8 +62968,8 @@ /area/medical/genetics_cloning) "cGe" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -26 + name = "west bump"; + pixel_x = -28 }, /obj/machinery/light{ dir = 8 @@ -62498,6 +62986,7 @@ /obj/item/paper, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/table/glass, @@ -62522,6 +63011,7 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -62531,6 +63021,7 @@ "cGi" = ( /obj/structure/table, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -62592,7 +63083,7 @@ pixel_x = 11 }, /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -62609,13 +63100,14 @@ name = "Surgery Cleaner" }, /obj/machinery/light_switch{ - pixel_x = -5; - pixel_y = 27 + name = "custom placement"; + pixel_x = -4; + pixel_y = 24 }, /obj/machinery/holosign_switch{ id = "surgery1"; - pixel_x = 5; - pixel_y = 27 + pixel_x = 4; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -62677,11 +63169,8 @@ /area/assembly/chargebay) "cGw" = ( /obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1485; - listening = 0; - name = "Station Intercom (Medbay)"; - pixel_y = -30 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/unary/portables_connector{ @@ -62694,7 +63183,8 @@ "cGx" = ( /obj/structure/closet/secure_closet/scientist, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -62703,6 +63193,7 @@ }) "cGy" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/unary/thermomachine/freezer, @@ -62869,7 +63360,8 @@ }) "cGQ" = ( /obj/item/radio/intercom{ - pixel_y = 25 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister, @@ -62903,6 +63395,7 @@ dir = 8 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/portable_atmospherics/canister, @@ -62964,6 +63457,8 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light_switch{ + dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/southeast, @@ -63191,7 +63686,8 @@ /obj/structure/reagent_dispensers/fueltank, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + name = "east bump"; + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -63303,7 +63799,9 @@ /obj/item/target/syndicate, /obj/item/target/syndicate, /obj/machinery/light_switch{ - pixel_x = -25 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -63504,6 +64002,7 @@ }) "cHT" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -63579,10 +64078,12 @@ /area/medical/cryo) "cIe" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/portable_atmospherics/scrubber, /obj/effect/decal/warning_stripes/northwest, @@ -63744,8 +64245,8 @@ /area/medical/surgery2) "cIt" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" @@ -63797,7 +64298,8 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/item/storage/box/donkpockets{ pixel_x = 3; @@ -63811,7 +64313,8 @@ /area/medical/medbreak) "cIB" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -29 + name = "south bump"; + pixel_y = -30 }, /obj/machinery/camera{ c_tag = "Medbay Break Room"; @@ -63843,6 +64346,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/item/folder/white, @@ -63867,6 +64371,7 @@ pixel_x = -32 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -64189,8 +64694,8 @@ "cJk" = ( /obj/machinery/mecha_part_fabricator, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/light/small{ dir = 1 @@ -64242,14 +64747,16 @@ /area/assembly/robotics) "cJo" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 22 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/light/small{ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/northwest, @@ -64369,14 +64876,11 @@ name = "\improper Toxins Lab" }) "cJB" = ( -/obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1485; - listening = 0; - name = "Station Intercom (Medbay)"; - pixel_x = 30 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64464,6 +64968,7 @@ /area/medical/virology) "cJO" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/smartfridge/secure/chemistry/virology/preloaded, @@ -64539,6 +65044,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -64558,8 +65064,8 @@ "cKh" = ( /obj/structure/table, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -25 + name = "south bump"; + pixel_y = -28 }, /obj/item/clothing/glasses/science, /obj/effect/decal/warning_stripes/southwest, @@ -64638,8 +65144,8 @@ /area/assembly/robotics) "cKq" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -26 + name = "west bump"; + pixel_x = -28 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -64648,7 +65154,7 @@ /area/hallway/primary/aft) "cKr" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/structure/dispenser, @@ -64739,6 +65245,7 @@ }) "cKz" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/closet/crate/freezer/iv_storage, @@ -64983,6 +65490,7 @@ "cKY" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -65014,10 +65522,13 @@ dir = 8 }, /obj/machinery/light_switch{ + dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -65035,10 +65546,13 @@ /obj/item/folder/white, /obj/item/clothing/accessory/stethoscope, /obj/machinery/light_switch{ + dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -65055,8 +65569,8 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = 5 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -65068,6 +65582,7 @@ "cLg" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -65494,8 +66009,7 @@ }) "cMb" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -65529,6 +66043,7 @@ amount = 50 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/item/stack/packageWrap, @@ -65550,8 +66065,8 @@ "cMi" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = 5 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light{ dir = 4 @@ -65616,6 +66131,7 @@ "cMq" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -66119,6 +66635,7 @@ /area/maintenance/aft) "cMZ" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -66179,7 +66696,9 @@ }) "cNe" = ( /obj/machinery/light_switch{ - pixel_x = 27 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -66193,6 +66712,7 @@ "cNf" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -66312,6 +66832,7 @@ "cNw" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -66322,6 +66843,7 @@ /area/medical/virology) "cNy" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/camera{ @@ -66482,6 +67004,7 @@ /area/maintenance/aft) "cNS" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -66706,7 +67229,8 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -66786,6 +67310,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/northwestcorner, @@ -67147,8 +67672,8 @@ /area/medical/research) "cPb" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/light{ dir = 4 @@ -67334,8 +67859,8 @@ /area/medical/virology) "cPv" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -67346,6 +67871,7 @@ /area/medical/medbay3) "cPz" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/light/small{ @@ -67548,8 +68074,8 @@ /obj/item/retractor, /obj/item/hemostat, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -29 + name = "west bump"; + pixel_x = -28 }, /obj/item/cautery, /obj/item/bonesetter, @@ -67644,6 +68170,7 @@ "cPZ" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/filingcabinet/chestdrawer, @@ -67655,7 +68182,7 @@ }) "cQa" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; + name = "south bump"; pixel_y = -28 }, /obj/machinery/computer/rdservercontrol{ @@ -67860,12 +68387,14 @@ /area/medical/virology) "cQt" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/table/glass, /obj/item/hand_labeler, /obj/item/radio/headset/headset_med, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -67880,8 +68409,8 @@ /area/medical/virology) "cQu" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/structure/table/glass, /obj/machinery/kitchen_machine/microwave{ @@ -67970,7 +68499,8 @@ /obj/structure/rack, /obj/item/crowbar/red, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/item/wrench, /obj/item/restraints/handcuffs/cable/zipties, @@ -68025,7 +68555,9 @@ }) "cQN" = ( /obj/machinery/light_switch{ - pixel_x = 26 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light{ dir = 4 @@ -68192,6 +68724,7 @@ "cRg" = ( /obj/structure/closet/emcloset, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -68520,6 +69053,7 @@ "cRO" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/northeast, @@ -68592,7 +69126,9 @@ "cRX" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_x = -23 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /obj/item/paper_bin{ pixel_y = 5 @@ -68610,6 +69146,7 @@ /obj/structure/chair/stool, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -68635,6 +69172,7 @@ /area/chapel/office) "cSc" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/disposal, @@ -68874,8 +69412,8 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) @@ -68970,7 +69508,8 @@ "cSK" = ( /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -68988,6 +69527,7 @@ "cSN" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, @@ -69051,8 +69591,9 @@ "cSU" = ( /obj/item/candle, /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = 6; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/table/wood, /obj/machinery/door_control{ @@ -69080,8 +69621,8 @@ }) "cSW" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/door/poddoor/preopen{ id_tag = "xeno_blastdoor"; @@ -69136,7 +69677,8 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + name = "west bump"; + pixel_x = -27 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -69185,6 +69727,7 @@ "cTf" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -69237,6 +69780,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/sign/double/map/right{ @@ -69349,6 +69893,7 @@ "cTv" = ( /obj/structure/closet/l3closet/virology, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -69397,9 +69942,8 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -69448,8 +69992,8 @@ /obj/item/radio/intercom{ broadcasting = 1; frequency = 1480; - name = "Confessional Intercom"; - pixel_x = -25 + name = "custom placement"; + pixel_x = -28 }, /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -69593,6 +70137,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/item/twohanded/required/kirbyplants{ @@ -69715,6 +70260,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -69756,11 +70302,13 @@ /area/chapel/office) "cUm" = ( /obj/item/radio/intercom{ - pixel_y = 25 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ @@ -69866,6 +70414,7 @@ dir = 1 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/camera{ @@ -69931,6 +70480,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -70054,8 +70604,8 @@ /obj/item/radio/intercom{ broadcasting = 1; frequency = 1480; - name = "Confessional Intercom"; - pixel_x = 25 + name = "custom placement"; + pixel_x = 28 }, /obj/structure/chair{ dir = 1 @@ -70437,7 +70987,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_y = 28 + name = "north bump"; + pixel_y = 24 }, /obj/item/paper_bin{ pixel_x = -2; @@ -70490,13 +71041,15 @@ "cWd" = ( /obj/structure/table/glass, /obj/machinery/newscaster{ - pixel_x = -30 + name = "west bump"; + pixel_x = -32 }, /obj/item/folder/white, /obj/item/folder/white, /obj/item/paper, /obj/item/pen/red, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -70514,7 +71067,8 @@ pixel_y = 3 }, /obj/machinery/light_switch{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/camera{ c_tag = "Virology - Break Room"; @@ -70696,6 +71250,7 @@ /obj/structure/closet/l3closet/scientist, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -70898,7 +71453,8 @@ /obj/structure/table, /obj/item/candle, /obj/item/radio/intercom{ - pixel_y = 25 + name = "north bump"; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -70951,8 +71507,8 @@ "cXh" = ( /obj/structure/closet/l3closet/scientist, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ @@ -70987,6 +71543,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -71025,6 +71582,7 @@ c_tag = "Fitness Room - Fore" }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -71175,8 +71733,8 @@ pixel_x = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -32 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -71202,6 +71760,7 @@ "cXE" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -71228,6 +71787,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -71264,8 +71824,10 @@ pixel_y = -25 }, /obj/machinery/light_switch{ + dir = 1; + name = "custom placement"; pixel_x = 6; - pixel_y = -25 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -71320,8 +71882,9 @@ }) "cXS" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = -6; - pixel_y = 26 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -71356,7 +71919,8 @@ network = list("SS13","RD") }, /obj/machinery/firealarm{ - pixel_y = 26 + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable/yellow{ d1 = 4; @@ -71703,6 +72267,7 @@ "cYL" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal, @@ -71794,8 +72359,8 @@ name = "Slime Processor" }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" @@ -71835,7 +72400,9 @@ /area/solar/starboard) "cZa" = ( /obj/machinery/light_switch{ - pixel_x = 28 + dir = 8; + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -71977,6 +72544,7 @@ /obj/structure/closet/secure_closet/chaplain, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -72016,11 +72584,12 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/machinery/iv_drip, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -72067,8 +72636,8 @@ /area/solar/starboard) "cZC" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -72226,6 +72795,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -72295,6 +72865,7 @@ /area/crew_quarters/heads) "daf" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -72314,6 +72885,7 @@ "dak" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/closet/secure_closet/psychiatrist, @@ -72396,8 +72968,8 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 + name = "east bump"; + pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16" @@ -72416,6 +72988,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants, @@ -72692,8 +73265,8 @@ /obj/item/clothing/accessory/stethoscope, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = 5 + name = "east bump"; + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -72723,6 +73296,7 @@ }) "dbp" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/light/small{ @@ -72772,8 +73346,8 @@ }) "dbw" = ( /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 21 + name = "north bump"; + pixel_y = 28 }, /obj/machinery/light/small{ dir = 1 @@ -72924,6 +73498,7 @@ "dbG" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/folder/white, @@ -73227,8 +73802,8 @@ }, /obj/machinery/atmospherics/pipe/simple/visible, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 + name = "south bump"; + pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -73286,6 +73861,7 @@ pixel_y = 5 }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -73371,6 +73947,7 @@ }, /obj/machinery/disposal, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/warning_stripes/southwest, @@ -73450,6 +74027,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -73632,6 +74210,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -73973,7 +74552,9 @@ }) "deL" = ( /obj/machinery/light_switch{ - pixel_x = -27 + dir = 4; + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/carpet, /area/chapel/main) @@ -74337,6 +74918,7 @@ /obj/structure/closet/l3closet, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -75312,9 +75894,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "eQt" = ( /obj/structure/chair/stool{ @@ -75737,7 +76317,8 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26 + name = "west bump"; + pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -76300,6 +76881,7 @@ "hIG" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable/yellow{ @@ -76796,6 +77378,7 @@ "iWv" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel/dark, @@ -78297,9 +78880,7 @@ "odF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "odO" = ( /obj/machinery/blackbox_recorder, @@ -79062,6 +79643,7 @@ "qxn" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -79992,7 +80574,8 @@ /area/construction) "tpg" = ( /obj/machinery/firealarm{ - pixel_y = 29 + name = "north bump"; + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -80675,6 +81258,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/firealarm{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "vHW" = ( @@ -113371,7 +113959,7 @@ aZZ bbB bMR bek -bgb +bfV bfV bjm bCB @@ -113602,7 +114190,7 @@ awd awJ atK avl -awG +aIr axW aze aBE @@ -116435,7 +117023,7 @@ azV aAB aBJ avr -aEm +bgb aHV aGM aIk @@ -118238,7 +118826,7 @@ aEr avv aGU avv -aIr +avv aJK avv aNQ diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 5ac556f1c12..bd01389d7f1 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -46,6 +46,7 @@ /area/ruin/powered/beach) "ai" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = 29 }, /turf/simulated/floor/wood, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index 1da9b38829d..b1bcfe93cdf 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -100,14 +100,9 @@ /obj/structure/bookcase/random, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) -"aw" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/beans, -/turf/simulated/floor/wood, -/area/ruin/powered/snow_cabin) "ax" = ( /obj/structure/table/wood, -/obj/machinery/kitchen_machine/microwave, +/obj/item/reagent_containers/food/snacks/beans, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "ay" = ( @@ -139,7 +134,9 @@ /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aE" = ( -/obj/structure/extinguisher_cabinet, +/obj/structure/extinguisher_cabinet{ + name = "custom placement" + }, /turf/simulated/wall/mineral/wood, /area/ruin/powered/snow_cabin) "aF" = ( @@ -203,6 +200,12 @@ /obj/structure/fans/tiny, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_cabin) +"bj" = ( +/obj/effect/decal/cleanable/blood/writing{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/ruin/powered/snow_cabin) "bl" = ( /turf/simulated/floor/wood/cold, /area/ruin/powered/snow_biodome) @@ -255,19 +258,19 @@ /obj/machinery/light, /turf/simulated/floor/plating/ice/smooth, /area/ruin/powered/snow_biodome) +"cv" = ( +/obj/item/twohanded/required/chainsaw, +/turf/simulated/floor/plating/asteroid/snow/atmosphere, +/area/ruin/powered/snow_biodome) "dS" = ( /obj/machinery/light/small, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"dV" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/sacrificealtar, -/obj/item/kitchen/knife/combat/survival/bone, -/turf/simulated/floor/mineral/silver, -/area/ruin/powered/snow_biodome) -"eg" = ( -/turf/simulated/wall/mineral/silver, -/area/ruin/powered/snow_biodome) +"et" = ( +/obj/item/paper/fluff/ruins/snowbiodome/cabin2, +/obj/effect/decal/cleanable/blood/writing, +/turf/simulated/floor/wood, +/area/ruin/powered/snow_cabin) "gh" = ( /obj/machinery/light/small{ dir = 8 @@ -285,57 +288,54 @@ /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"iA" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/pod/dark, -/area/ruin/powered/snow_biodome) -"iE" = ( -/obj/effect/decal/cleanable/blood/writing{ - dir = 4 - }, -/turf/simulated/floor/plating/asteroid/snow/atmosphere, -/area/ruin/powered/snow_biodome) -"jL" = ( -/obj/effect/decal/cleanable/blood/writing, -/obj/effect/decal/cleanable/blood/writing, -/obj/effect/decal/cleanable/blood/writing{ - dir = 4 - }, -/turf/simulated/floor/plating/asteroid/snow/atmosphere, -/area/ruin/powered/snow_biodome) -"ks" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/plating, -/area/ruin/powered/snow_biodome) -"mh" = ( +"jE" = ( /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) -"mt" = ( +"kw" = ( +/turf/simulated/wall/mineral/wood/nonmetal, +/area/ruin/powered/snow_biodome) +"lq" = ( /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating/asteroid/snow/atmosphere, /area/ruin/powered/snow_biodome) +"lX" = ( +/obj/structure/table/wood, +/obj/machinery/kitchen_machine/microwave, +/turf/simulated/floor/wood, +/area/ruin/powered/snow_cabin) "qt" = ( /obj/machinery/door/airlock/silver, /obj/structure/fans/tiny, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) +"rv" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/plating, +/area/ruin/powered/snow_biodome) "tb" = ( /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) -"th" = ( +"ti" = ( /obj/effect/decal/cleanable/blood/writing{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/wood, -/area/ruin/powered/snow_cabin) +/turf/simulated/floor/plating/asteroid/snow/atmosphere, +/area/ruin/powered/snow_biodome) +"tk" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/mineral/silver, +/area/ruin/powered/snow_biodome) "tl" = ( /turf/simulated/floor/pod/light, /area/ruin/powered/snow_biodome) -"tI" = ( -/obj/item/paper/fluff/ruins/snowbiodome/cabin2, -/obj/effect/decal/cleanable/blood/writing, +"tZ" = ( +/turf/simulated/floor/mineral/silver, +/area/ruin/powered/snow_biodome) +"uz" = ( +/obj/effect/spawner/window, +/obj/structure/barricade/wooden/crude/snow, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "vf" = ( @@ -343,37 +343,23 @@ /obj/structure/fans/tiny, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_cabin) -"xU" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/pod/dark, +"wM" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/turf/simulated/floor/plating, /area/ruin/powered/snow_biodome) -"zD" = ( -/obj/effect/mob_spawn/human/skeleton, -/turf/simulated/floor/mineral/silver, -/area/ruin/powered/snow_biodome) -"zH" = ( +"zT" = ( /obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/footprints, /turf/simulated/floor/mineral/silver, /area/ruin/powered/snow_biodome) -"AJ" = ( -/obj/item/twohanded/required/chainsaw, -/turf/simulated/floor/plating/asteroid/snow/atmosphere, -/area/ruin/powered/snow_biodome) "AM" = ( /obj/machinery/vending/coffee/free, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"BI" = ( -/obj/effect/spawner/window, -/obj/structure/barricade/wooden/crude/snow, -/turf/simulated/floor/wood, -/area/ruin/powered/snow_cabin) -"CD" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open, -/turf/simulated/floor/plating, +"BF" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/writing, +/turf/simulated/floor/plating/asteroid/snow/atmosphere, /area/ruin/powered/snow_biodome) "Dd" = ( /obj/structure/rack, @@ -383,7 +369,12 @@ /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) "Ef" = ( -/obj/structure/flora/rock/icy, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/pod/dark, +/area/ruin/powered/snow_biodome) +"Ex" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude/snow, /turf/simulated/floor/mineral/silver, /area/ruin/powered/snow_biodome) "Ez" = ( @@ -391,29 +382,38 @@ /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"HP" = ( +"FP" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"JB" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude/snow, -/turf/simulated/floor/mineral/silver, -/area/ruin/powered/snow_biodome) -"JZ" = ( -/turf/simulated/floor/mineral/silver, -/area/ruin/powered/snow_biodome) -"LO" = ( +"GS" = ( /obj/item/paper/fluff/ruins/snowbiodome/altar, /turf/simulated/floor/mineral/silver, /area/ruin/powered/snow_biodome) +"Hn" = ( +/obj/effect/decal/cleanable/blood/writing, +/obj/effect/decal/cleanable/blood/writing, +/obj/effect/decal/cleanable/blood/writing{ + dir = 4 + }, +/turf/simulated/floor/plating/asteroid/snow/atmosphere, +/area/ruin/powered/snow_biodome) +"HP" = ( +/turf/simulated/floor/pod/dark, +/area/ruin/powered/snow_biodome) "Mp" = ( /obj/item/clothing/mask/balaclava, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"NO" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/writing, -/turf/simulated/floor/plating/asteroid/snow/atmosphere, +"MA" = ( +/turf/simulated/wall/mineral/silver, +/area/ruin/powered/snow_biodome) +"MU" = ( +/obj/structure/flora/rock/icy, +/turf/simulated/floor/mineral/silver, /area/ruin/powered/snow_biodome) "Oj" = ( /obj/machinery/light{ @@ -421,16 +421,17 @@ }, /turf/simulated/floor/mineral/silver, /area/ruin/powered/snow_biodome) +"Pf" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/structure/sacrificealtar, +/obj/item/kitchen/knife/combat/survival/bone, +/turf/simulated/floor/mineral/silver, +/area/ruin/powered/snow_biodome) "PD" = ( /obj/machinery/door/airlock/hatch, /obj/structure/fans/tiny, /turf/simulated/floor/pod/dark, /area/ruin/powered/snow_biodome) -"PI" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/footprints, -/turf/simulated/floor/mineral/silver, -/area/ruin/powered/snow_biodome) "PK" = ( /obj/structure/table, /obj/item/pen, @@ -456,9 +457,6 @@ /obj/effect/spawner/window, /turf/simulated/floor/plating, /area/ruin/powered/snow_biodome) -"Sj" = ( -/turf/simulated/wall/mineral/wood/nonmetal, -/area/ruin/powered/snow_biodome) "Ub" = ( /obj/structure/filingcabinet, /turf/simulated/floor/pod/dark, @@ -466,6 +464,10 @@ "Wg" = ( /turf/simulated/wall/r_wall, /area/ruin/powered/snow_biodome) +"XR" = ( +/obj/effect/mob_spawn/human/skeleton, +/turf/simulated/floor/mineral/silver, +/area/ruin/powered/snow_biodome) (1,1,1) = {" aa @@ -512,7 +514,7 @@ Wg Wg Wg Dd -xU +FP HP tl gh @@ -549,7 +551,7 @@ HP tl PK gz -iA +Ef Wg ak ak @@ -758,7 +760,7 @@ tb (10,1,1) = {" Wg Wg -CD +wM Wg ak ak @@ -825,9 +827,9 @@ ad af ar bw -tI +et aD -mh +jE aL aq ak @@ -854,12 +856,12 @@ tb (13,1,1) = {" Wg ae -ks +rv aq au au aq -th +bj bz aq ak @@ -885,7 +887,7 @@ tb "} (14,1,1) = {" Wg -ks +rv al aq aq @@ -952,7 +954,7 @@ Wg ag ah as -aw +ax aA aA at @@ -984,11 +986,11 @@ Wg ah af aq -ax +lX aK aF at -mh +jE aq ak aI @@ -1024,8 +1026,8 @@ bz aq aR ak -NO -jL +BF +Hn ak ab ak @@ -1057,7 +1059,7 @@ aq ak ak ak -iE +ti ak ak ak @@ -1082,8 +1084,8 @@ af aq aq aq -BI -BI +uz +uz aq aq bD @@ -1120,7 +1122,7 @@ ak ak ak ak -mt +lq ak aC ak @@ -1154,7 +1156,7 @@ ak aC ak ak -mt +lq ak aI ak @@ -1186,7 +1188,7 @@ ak ak ak ak -iE +ti ak ak ak @@ -1208,7 +1210,7 @@ aa Wg Wg ak -AJ +cv aB ak ak @@ -1216,11 +1218,11 @@ aC ak ak ak -eg +MA ak -iE +ti ak -eg +MA aC ak ak @@ -1248,13 +1250,13 @@ ak aQ ak ak -Ef -mt -JZ +MU +lq +tZ ak aB ak -JZ +tZ ak ak aB @@ -1278,13 +1280,13 @@ az ak ak ak -JZ +tZ bM -Sj -Sj -JB -Sj -Sj +kw +kw +Ex +kw +kw bD ak ak @@ -1311,13 +1313,13 @@ ak ak ak aC -eg -Sj -JZ -PI -zD -Sj -eg +MA +kw +tZ +zT +XR +kw +MA aC ak ak @@ -1341,14 +1343,14 @@ Wg Wg ak bB -JZ +tZ ak aB -Sj -zD -dV -LO -Sj +kw +XR +Pf +GS +kw ak ak ak @@ -1375,12 +1377,12 @@ Wg Wg Wg Wg -JZ -Sj -zH +tZ +kw +tk Oj -JZ -Sj +tZ +kw ap Wg Wg diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 45353b16565..3acbc6f6b7d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -266,7 +266,9 @@ /turf/simulated/floor/plasteel, /area/ruin/powered/animal_hospital) "aG" = ( -/obj/structure/extinguisher_cabinet, +/obj/structure/extinguisher_cabinet{ + name = "custom placement" + }, /turf/simulated/wall/mineral/titanium/nodiagonal, /area/ruin/powered/animal_hospital) "aJ" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 114b513e3a5..5f2ef18b1cc 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -119,6 +119,7 @@ /area/shuttle/freegolem) "z" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/mineral/titanium/purple, @@ -175,6 +176,7 @@ /area/shuttle/freegolem) "E" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/light, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm index f197aac8d94..c3fbd5971d2 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm @@ -378,6 +378,7 @@ /area/djstation) "aP" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, @@ -439,6 +440,7 @@ /area/djstation) "aX" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/vending/cigarette/free{ @@ -479,6 +481,7 @@ /area/djstation) "bb" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/item/twohanded/required/kirbyplants, @@ -544,6 +547,7 @@ /area/djstation) "bj" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -753,6 +757,7 @@ /area/djstation) "bJ" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = 32; pixel_y = 9 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 11f658476d3..4e37f2e2267 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -1106,6 +1106,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/chair{ @@ -1405,6 +1406,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -1458,6 +1460,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -1501,6 +1504,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "custom placement"; pixel_x = -28 }, /obj/effect/decal/cleanable/dirt, @@ -1563,6 +1567,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; + name = "custom placement"; pixel_x = 28 }, /turf/simulated/floor/plasteel, @@ -1600,6 +1605,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/item/twohanded/required/kirbyplants{ @@ -1696,6 +1702,7 @@ "ex" = ( /obj/machinery/firealarm{ dir = 4; + name = "custom placement"; pixel_x = -28 }, /obj/effect/decal/cleanable/dirt, @@ -3126,6 +3133,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "custom placement"; pixel_x = -28 }, /obj/effect/decal/cleanable/dirt, @@ -3367,6 +3375,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; + name = "custom placement"; pixel_x = -28 }, /turf/simulated/floor/plasteel, @@ -3409,6 +3418,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/chair{ @@ -3579,6 +3589,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; + name = "custom placement"; pixel_x = 28 }, /turf/simulated/floor/plasteel, @@ -3717,6 +3728,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable/yellow, @@ -4273,6 +4285,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -4435,6 +4448,7 @@ /obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -4855,6 +4869,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /mob/living/simple_animal/hostile/hivebot, @@ -4871,6 +4886,7 @@ "lj" = ( /obj/machinery/alarm{ dir = 1; + name = "custom placement"; pixel_y = -22 }, /obj/effect/decal/cleanable/dirt, @@ -4920,6 +4936,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -4968,6 +4985,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 47ecd6e16f2..f107b4adeb3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -487,6 +487,7 @@ "fn" = ( /obj/machinery/vending/syndichem, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, @@ -3060,6 +3061,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, @@ -3798,6 +3800,7 @@ /area/ruin/unpowered/syndicate_space_base/virology) "NT" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 89bb39319fa..03ee41aa11b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -515,6 +515,9 @@ "bm" = ( /turf/simulated/wall/mineral/titanium/nodecon/nodiagonal, /area/derelict/crew_quarters) +"bn" = ( +/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal, +/area/derelict/arrival) "bo" = ( /obj/structure/cable{ d2 = 4; @@ -1563,6 +1566,7 @@ /obj/machinery/newscaster{ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station."; layer = 3.3; + name = "custom placement"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -2074,6 +2078,7 @@ /obj/machinery/newscaster{ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station."; layer = 3.3; + name = "custom placement"; pixel_x = 30 }, /obj/item/trash/spentcasing{ @@ -3744,6 +3749,11 @@ icon_state = "dark" }, /area/derelict/crew_quarters) +"hU" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/derelict/crew_quarters) "hV" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -7070,6 +7080,7 @@ /obj/machinery/newscaster{ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station."; layer = 3.3; + name = "custom placement"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -7277,11 +7288,6 @@ /area/derelict/eva{ name = "Derelict Annex" }) -"pC" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/derelict/crew_quarters) "pD" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7642,6 +7648,7 @@ /obj/machinery/newscaster{ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station."; layer = 3.3; + name = "custom placement"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -7974,9 +7981,6 @@ icon_state = "delivery" }, /area/derelict/crew_quarters) -"rn" = ( -/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal, -/area/derelict/arrival) "ro" = ( /obj/structure/sign/greencross, /turf/simulated/wall/mineral/titanium/nodecon/nodiagonal, @@ -9142,12 +9146,12 @@ ac ac ac QN -rn +bn jm -rn -rn +bn +bn lu -rn +bn QN ac ac @@ -9233,14 +9237,14 @@ ac ac ac ac -rn +bn iS jn jS kL hY lK -rn +bn ac ac ac @@ -9323,17 +9327,17 @@ ac ac ac aW -rn -rn -rn +bn +bn +bn iT hY jT kM lv lL -rn -rn +bn +bn aW ac ac @@ -9411,10 +9415,10 @@ ac ac ac aW -rn +bn gJ -rn -rn +bn +bn hI hX iv @@ -9427,8 +9431,8 @@ hY me mu mG -rn -rn +bn +bn mG aW ac @@ -9500,8 +9504,8 @@ ac ac ac aW -rn -rn +bn +bn dO gq gK @@ -9518,12 +9522,12 @@ lw hY mf mv -rn +bn mR ni nw mG -rn +bn mG aW ac @@ -9591,7 +9595,7 @@ ac ac ac aW -rn +bn ff fA dL @@ -9681,16 +9685,16 @@ ac ac ac aW -rn -rn -rn +bn +bn +bn de do do do do hb -rn +bn hK hY ix @@ -9874,7 +9878,7 @@ do do gM hc -rn +bn hM ia iz @@ -9954,7 +9958,7 @@ ac ac ac aW -rn +bn dP dV dV @@ -9966,19 +9970,19 @@ fY do gN hd -rn -rn -rn -rn -rn +bn +bn +bn +bn +bn jr ka kT ly -rn -rn -rn -rn +bn +bn +bn +bn mV nm mS @@ -10044,9 +10048,9 @@ ac ac ac aW -rn -rn -rn +bn +bn +bn dQ do do @@ -10057,21 +10061,21 @@ fE fZ gs dO -rn +bn aW ac ac ac aW -rn +bn kb -rn -rn +bn +bn aW ac ac aW -rn +bn mG ny nK @@ -10135,7 +10139,7 @@ ac ac ac aW -rn +bn dm dA dL @@ -10143,10 +10147,10 @@ do do do eo -rn +bn fh fF -rn +bn fG aW ac @@ -10226,7 +10230,7 @@ ac ac ac aW -rn +bn dd dn do @@ -10235,8 +10239,8 @@ do do ee ep -rn -rn +bn +bn fG aW ac @@ -10317,7 +10321,7 @@ ac ac ac aW -rn +bn cL de do @@ -10327,7 +10331,7 @@ do do ef eq -rn +bn aW ac ac @@ -10408,9 +10412,9 @@ ac ac ac aW -rn -rn -rn +bn +bn +bn df dp dB @@ -10499,10 +10503,10 @@ ac ac ac ac -rn +bn cl cz -rn +bn de dq dC @@ -10690,7 +10694,7 @@ cN cB dr dE -rn +bn dS ac ac @@ -10773,7 +10777,7 @@ ac ac ac ac -rn +bn bF bT co @@ -10781,7 +10785,7 @@ cA cM dg ds -rn +bn aW ac ac @@ -10827,7 +10831,7 @@ mS qC mU qY -rn +bn ac ac ac @@ -10865,12 +10869,12 @@ ac ac ac aW -rn +bn bG bU cp cC -rn +bn dh dt dF @@ -10911,7 +10915,7 @@ ac ac ac ag -rn +bn pT mU mU @@ -10919,7 +10923,7 @@ mS qC mS qZ -rn +bn aW ac ac @@ -11004,15 +11008,15 @@ aj ac ag aW -rn -rn +bn +bn qh qs qD qL -rn +bn ro -rn +bn aW ac ac @@ -11097,7 +11101,7 @@ ag ag ag aW -rn +bn qi qt ka @@ -11105,7 +11109,7 @@ hY ra qy rw -rn +bn ac ac ac @@ -11474,7 +11478,7 @@ re qM hY qw -rn +bn aW ac ac @@ -11567,7 +11571,7 @@ hY hY qy rJ -rn +bn ac ac ac @@ -11652,7 +11656,7 @@ ac ac ac aW -rn +bn qN rf hY @@ -11935,7 +11939,7 @@ hY hY rk rN -rn +bn ac ac ac @@ -12028,7 +12032,7 @@ rq hY rO rZ -rn +bn aW ac ac @@ -12111,7 +12115,7 @@ if if if if -rn +bn qy qR ri @@ -12211,9 +12215,9 @@ rs rz qu rQ -rn -rn -rn +bn +bn +bn sh ac kJ @@ -12295,7 +12299,7 @@ if if if if -rn +bn qw qS rk @@ -12388,7 +12392,7 @@ ac ac ac aW -rn +bn qv hY ru @@ -12396,7 +12400,7 @@ ru hY rS rZ -rn +bn aW ac ac @@ -12487,7 +12491,7 @@ hY hY rk rT -rn +bn ac ac ac @@ -12756,7 +12760,7 @@ ac ac ac aW -rn +bn qN qt hY @@ -12855,7 +12859,7 @@ hY hY qy rX -rn +bn ac ac ac @@ -12946,7 +12950,7 @@ hY hY hY rG -rn +bn aW ac ac @@ -13305,7 +13309,7 @@ ac ag ag aW -rn +bn qm qz jn @@ -13313,7 +13317,7 @@ hY rl rv rD -rn +bn ac ac ac @@ -13762,7 +13766,7 @@ ac ac aV aV -pC +hU pL pX qe @@ -13854,7 +13858,7 @@ ac aV pm pt -pC +hU pM pY db @@ -14659,16 +14663,16 @@ go gV hn aV -pC -pC +hU +hU hT jf -pC +hU kC ll -pC -pC -pC +hU +hU +hU hT bm ng @@ -14752,16 +14756,16 @@ gW gH hH hT -pC +hU iL eD jI kD lm eD -pC -pC -pC +hU +hU +hU mQ ng ng diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index 663cbddb25d..8ed038eab1d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -58,9 +58,7 @@ /turf/simulated/floor/plating, /area/shuttle/abandoned) "aw" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "ax" = ( @@ -142,6 +140,7 @@ /area/shuttle/abandoned) "aP" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = 27 }, /turf/simulated/floor/mineral/titanium, @@ -228,6 +227,7 @@ /area/shuttle/abandoned) "bm" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = 27 }, /obj/machinery/light{ @@ -252,9 +252,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bq" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /obj/item/stack/cable_coil/cut, /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm index e1dd308294d..c6a12bba93a 100644 --- a/_maps/map_files/RandomZLevels/academy.dmm +++ b/_maps/map_files/RandomZLevels/academy.dmm @@ -17,9 +17,7 @@ /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "ae" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "af" = ( @@ -2533,6 +2531,14 @@ }, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) +"he" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/awaymission/academy/academyaft) "hf" = ( /obj/structure/cable{ d1 = 2; @@ -2646,6 +2652,16 @@ }, /turf/simulated/floor/carpet, /area/awaymission/academy/academyaft) +"hs" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "hydrofloor" + }, +/area/awaymission/academy/academyaft) "ht" = ( /obj/structure/cable{ d1 = 2; @@ -2777,16 +2793,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) -"hM" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "hydrofloor" - }, -/area/awaymission/academy/academyaft) "hN" = ( /obj/machinery/light{ dir = 4 @@ -2880,14 +2886,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plasteel, /area/awaymission/academy/academyaft) -"ic" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/awaymission/academy/academyaft) "id" = ( /obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel{ @@ -10504,7 +10502,7 @@ bB bB gI gZ -ic +he hw hc hw @@ -10634,12 +10632,12 @@ gx ge gV gZ -ic -ic +he +he hc -ic +he hc -ic +he hc id hp @@ -10894,7 +10892,7 @@ dv dv gX gZ -hM +hs kX hp id @@ -15184,7 +15182,7 @@ aa aa aa gZ -hM +hs lp hp hp @@ -15444,7 +15442,7 @@ aa aa aa gZ -ic +he hK hc ls diff --git a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm index 9da4f2f38b7..78ed864ade1 100644 --- a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm @@ -308,6 +308,15 @@ }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) +"bO" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plating, +/area/awaymission/BMPship/Aft) "bQ" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -672,6 +681,15 @@ icon_state = "barber" }, /area/awaymission/BMPship/Midship) +"de" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plasteel, +/area/awaymission/BMPship/Aft) "dg" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -874,9 +892,7 @@ }, /area/awaymission/BMPship/Fore) "dI" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "carpet14-8" @@ -947,6 +963,17 @@ icon_state = "bar" }, /area/awaymission/BMPship/Midship) +"dS" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/awaymission/BMPship/Midship) "dT" = ( /obj/structure/cable{ d1 = 2; @@ -1113,17 +1140,6 @@ icon_state = "carpet9-0" }, /area/awaymission/BMPship/Fore) -"ek" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/awaymission/BMPship/Midship) "el" = ( /obj/structure/cable{ d1 = 2; @@ -1181,15 +1197,6 @@ "er" = ( /turf/simulated/wall/r_wall, /area/awaymission/BMPship/Midship) -"es" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel, -/area/awaymission/BMPship/Aft) "et" = ( /obj/machinery/light/small{ dir = 4 @@ -1198,15 +1205,6 @@ icon_state = "showroomfloor" }, /area/awaymission/BMPship/Aft) -"eu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/awaymission/BMPship/Aft) "ev" = ( /obj/item/shard, /turf/simulated/floor/plasteel{ @@ -1215,9 +1213,7 @@ }, /area/awaymission/BMPship/Fore) "ew" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "carpetside" @@ -1485,6 +1481,18 @@ icon_state = "carpet15-14" }, /area/awaymission/BMPship/Fore) +"eZ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "carpet15-15" + }, +/area/awaymission/BMPship/Fore) "fa" = ( /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel{ @@ -1834,6 +1842,17 @@ icon_state = "showroomfloor" }, /area/awaymission/BMPship/Aft) +"fR" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, +/area/awaymission/BMPship/Aft) "fS" = ( /obj/machinery/power/smes/magical{ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; @@ -1859,18 +1878,6 @@ /obj/item/kitchen/knife, /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) -"fV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "carpet15-15" - }, -/area/awaymission/BMPship/Fore) "fW" = ( /obj/structure/closet, /obj/item/clothing/head/bio_hood, @@ -2090,9 +2097,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gE" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -2127,17 +2132,6 @@ icon_state = "bar" }, /area/awaymission/BMPship/Midship) -"gI" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" - }, -/area/awaymission/BMPship/Aft) "gJ" = ( /obj/structure/cable{ d1 = 2; @@ -2164,9 +2158,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) "gN" = ( -/obj/structure/computerframe{ - anchored = 1 - }, +/obj/structure/computerframe, /obj/effect/landmark/burnturf, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -2441,6 +2433,15 @@ /obj/machinery/computer/arcade, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) +"hQ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/turf/simulated/floor/plasteel, +/area/awaymission/BMPship/Aft) "hR" = ( /obj/structure/cable{ d2 = 8; @@ -2571,15 +2572,6 @@ }, /turf/simulated/floor/plating/airless, /area/awaymission) -"im" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel, -/area/awaymission/BMPship/Aft) "in" = ( /obj/structure/cable{ d1 = 1; @@ -9578,7 +9570,7 @@ cX dp ft fI -fV +eZ gi gC gA @@ -9965,7 +9957,7 @@ dr dK ei ex -fV +eZ fu cB fY @@ -10224,7 +10216,7 @@ cM cM cM em -ek +dS cM cM cM @@ -10483,7 +10475,7 @@ cF cF cF dM -ek +dS er er er @@ -10613,7 +10605,7 @@ cI dc dc dN -ek +dS er fd fd @@ -10743,7 +10735,7 @@ cH dc dt dN -ek +dS er fe fd @@ -10873,7 +10865,7 @@ cJ dc dc dO -ek +dS er fd fg @@ -11003,7 +10995,7 @@ cI dc dc dN -ek +dS er ff ff @@ -11133,7 +11125,7 @@ cK cK cK dP -ek +dS eE fg fg @@ -11396,7 +11388,7 @@ cM cM cM fa -ek +dS cM cM gm @@ -11656,7 +11648,7 @@ cM cM cM cM -ek +dS cM cM cM @@ -11912,7 +11904,7 @@ am cQ db dy -ek +dS cM hV cM @@ -11921,7 +11913,7 @@ cM cM hV cM -ek +dS cM cl hH @@ -12042,7 +12034,7 @@ am cP dd dw -ek +dS eq eG fi @@ -12051,7 +12043,7 @@ cM eq gl gH -ek +dS cM cl gY @@ -12172,7 +12164,7 @@ am cM cM cM -ek +dS er eI er @@ -12181,7 +12173,7 @@ fP er gp er -ek +dS cM cl ac @@ -12302,7 +12294,7 @@ jq cM cM cM -ek +dS er eG er @@ -12311,7 +12303,7 @@ cM er go er -ek +dS hd cl hJ @@ -12432,7 +12424,7 @@ jq cM cM cM -ek +dS er eG er @@ -12441,7 +12433,7 @@ cM er go er -ek +dS cM cl hH @@ -12562,7 +12554,7 @@ jq cM cM cM -ek +dS er eG er @@ -12571,7 +12563,7 @@ cM er go er -ek +dS cM cl ac @@ -12692,7 +12684,7 @@ am cS dg cM -ek +dS er eG er @@ -12701,7 +12693,7 @@ cM er go er -ek +dS cM cl gY @@ -12822,7 +12814,7 @@ am cR dg cM -ek +dS er eM er @@ -12831,7 +12823,7 @@ cM er eM er -ek +dS cM cl hL @@ -12952,7 +12944,7 @@ am cU cM cM -ek +dS er eN er @@ -12961,7 +12953,7 @@ cM er eN er -ek +dS hd cl hM @@ -13217,7 +13209,7 @@ cM eK fb cM -ek +dS gc gq cM @@ -13477,7 +13469,7 @@ dj dj fl dj -gI +fR fl dj dj @@ -13486,7 +13478,7 @@ ai dq hP hu -im +hQ dq iA ai @@ -13616,7 +13608,7 @@ ai dq dq dq -im +hQ dq iA ai @@ -13740,13 +13732,13 @@ fp fp eR gk -gI +fR dj hg dq bd dq -im +hQ it dq ai @@ -13870,13 +13862,13 @@ bd fz fD gf -gI +fR dj ai dq dq ie -im +hQ is bd ai @@ -14000,13 +13992,13 @@ bd bd bd gf -gI +fR fG ai ht dq dq -im +hQ dq dq ai @@ -14133,7 +14125,7 @@ gr gJ eo he -es +de hK ic in @@ -14264,7 +14256,7 @@ dj gV ai hu -im +hQ dq dq dq @@ -14394,7 +14386,7 @@ gK gX ai hr -im +hQ ie dq ie @@ -14524,7 +14516,7 @@ ai ai ai hs -im +hQ dq dq dq @@ -14654,7 +14646,7 @@ hh js ai ht -im +hQ dq ai iu @@ -14770,20 +14762,20 @@ cs jo gn jB -es -es +de +de dX -es +de eO eO -es -es -es +de +de +de eO -es -eu +de +bO hf -es +de hS dq ai @@ -15033,7 +15025,7 @@ am ai do dZ -eu +bO eT fj fj @@ -15293,9 +15285,9 @@ aa ai hw ea -eu +bO eU -eu +bO fj fT bd diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index 14b31d59fae..65fee4f02e7 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -2548,7 +2548,9 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_y = 25 + name = "custom placement"; + pixel_y = 25; + dir = 2 }, /obj/structure/chair/comfy/shuttle{ dir = 4 diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm index 5e42040e605..1e34f8829e4 100644 --- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm +++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm @@ -25,50 +25,6 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"ad" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"ae" = ( -/obj/structure/alien/weeds, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"af" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; name = "The Hive"; @@ -78,14 +34,8 @@ poweralm = 0 }) "ag" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, +/obj/structure/alien/weeds, +/obj/structure/alien/egg/burst, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; @@ -107,9 +57,7 @@ poweralm = 0 }) "ai" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ @@ -136,25 +84,7 @@ /obj/structure/alien/weeds{ icon_state = "weeds2" }, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"al" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/bed/nest, +/obj/structure/alien/weeds, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; @@ -167,33 +97,6 @@ "am" = ( /obj/structure/alien/weeds/node, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"an" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/bed/nest, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"ao" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; name = "The Hive"; @@ -216,19 +119,6 @@ icon_state = "gib1_flesh" }, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"aq" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; name = "The Hive"; @@ -238,9 +128,7 @@ poweralm = 0 }) "ar" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /obj/structure/alien/resin/wall, /turf/simulated/floor/plating/asteroid/airless, @@ -258,28 +146,12 @@ name = "Syndicate Outpost" }) "at" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs{ color = "red"; icon_state = "gib1_flesh" }, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"au" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/mob/living/simple_animal/hostile/alien/sentinel, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; name = "The Hive"; @@ -370,9 +242,7 @@ poweralm = 0 }) "aD" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/item/clothing/mask/facehugger{ icon_state = "facehugger_impregnated"; @@ -439,36 +309,13 @@ name = "Syndicate Outpost" }) "aI" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, +/obj/structure/alien/weeds, +/obj/structure/alien/egg/burst, /obj/effect/decal/cleanable/blood/gibs{ color = "red"; icon_state = "gib1_flesh" }, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"aJ" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/effect/decal/cleanable/blood/gibs{ - color = "red"; - icon_state = "gib2_flesh" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; name = "The Hive"; @@ -479,11 +326,7 @@ }) "aK" = ( /obj/structure/alien/weeds, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, +/obj/structure/alien/egg/burst, /obj/effect/decal/cleanable/blood{ color = "red" }, @@ -661,22 +504,6 @@ power_light = 0; poweralm = 0 }) -"ba" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/mob/living/simple_animal/hostile/alien/drone{ - plants_off = 1 - }, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) "bb" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood{ @@ -774,23 +601,6 @@ /obj/structure/alien/weeds, /mob/living/simple_animal/hostile/alien/sentinel, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a5{ - always_unpowered = 1; - name = "The Hive"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"bk" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/effect/decal/cleanable/blood/gibs{ - color = "red"; - icon_state = "gib2_flesh" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a5{ always_unpowered = 1; name = "The Hive"; @@ -1137,7 +947,6 @@ tag = "" }, /obj/machinery/door/airlock/highsecurity{ - icon_state = "door_locked"; locked = 1; name = "Gateway"; req_access_txt = "150" @@ -1234,9 +1043,7 @@ input_dir = 4; output_dir = 8 }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plating/airless{ name = "plating" }, @@ -1253,9 +1060,7 @@ name = "Syndicate Outpost" }) "bZ" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/structure/sign/poster/contraband/syndicate_recruitment{ pixel_y = 32 }, @@ -1281,9 +1086,7 @@ }) "cb" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel/airless{ dir = 4; icon_state = "red"; @@ -1456,7 +1259,6 @@ /obj/machinery/door/airlock/public/glass{ density = 0; emagged = 1; - icon_state = "door_open"; locked = 1; name = "Dormitories" }, @@ -1650,9 +1452,7 @@ /obj/item/stack/rods, /obj/item/stack/rods, /obj/item/shard, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plating/airless{ name = "plating" }, @@ -1712,9 +1512,7 @@ name = "Syndicate Outpost" }) "cL" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel/airless{ dir = 6; icon_state = "red"; @@ -1807,7 +1605,6 @@ /obj/machinery/door/airlock{ density = 0; emagged = 1; - icon_state = "door_open"; id_tag = "awaydorm4"; locked = 1; name = "Dorm 1"; @@ -1856,9 +1653,7 @@ amount = 12 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/airless{ name = "floor" @@ -2031,9 +1826,7 @@ }) "dm" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/yellow/partial, /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/northeastcorner, @@ -2367,9 +2160,7 @@ poweralm = 0 }) "dN" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/item/tank/internals/oxygen, /obj/item/clothing/suit/space/syndicate/orange, @@ -2397,9 +2188,7 @@ poweralm = 0 }) "dO" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -2432,21 +2221,6 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a3{ - always_unpowered = 1; - ambientsounds = list('sound/ambience/ambimine.ogg'); - name = "Khonsu 19"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"dR" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a3{ always_unpowered = 1; ambientsounds = list('sound/ambience/ambimine.ogg'); @@ -2457,9 +2231,7 @@ poweralm = 0 }) "dS" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood{ color = "red" }, @@ -2491,49 +2263,6 @@ /obj/structure/alien/weeds/node, /obj/structure/alien/resin/wall, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a3{ - always_unpowered = 1; - ambientsounds = list('sound/ambience/ambimine.ogg'); - name = "Khonsu 19"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"dV" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a3{ - always_unpowered = 1; - ambientsounds = list('sound/ambience/ambimine.ogg'); - name = "Khonsu 19"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"dW" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a3{ - always_unpowered = 1; - ambientsounds = list('sound/ambience/ambimine.ogg'); - name = "Khonsu 19"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"dX" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a3{ always_unpowered = 1; ambientsounds = list('sound/ambience/ambimine.ogg'); @@ -2628,9 +2357,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -2644,9 +2371,7 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -2672,9 +2397,7 @@ name = "MO19 Research" }) "el" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; @@ -2684,21 +2407,6 @@ icon_state = "tracks" }, /turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"em" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/effect/decal/cleanable/blood/tracks{ - color = "red"; - desc = "Your instincts say you shouldn't be following these."; - dir = 4; - icon = 'icons/effects/blood.dmi'; - icon_state = "tracks" - }, -/turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -2716,11 +2424,7 @@ status = 2 }, /obj/structure/alien/weeds, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, +/obj/structure/alien/egg/burst, /obj/machinery/camera{ c_tag = "Xenobiology Containment North"; network = list("MO19X") @@ -2736,9 +2440,7 @@ name = "Acid-Proof mounted igniter"; pixel_y = 25 }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/awaycontent/a2{ @@ -2760,22 +2462,6 @@ stat = 2 }, /turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"es" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/bed/nest, -/obj/effect/decal/cleanable/blood/tracks{ - color = "red"; - desc = "Your instincts say you shouldn't be following these."; - dir = 4; - icon = 'icons/effects/blood.dmi'; - icon_state = "tracks" - }, -/turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -2801,18 +2487,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"ew" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/simulated/floor/plasteel, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -2895,32 +2569,6 @@ "eC" = ( /obj/structure/alien/weeds/node, /turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"eD" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"eE" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"eF" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -2932,9 +2580,7 @@ name = "MO19 Research" }) "eH" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -2942,17 +2588,6 @@ icon_state = "tracks" }, /turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"eI" = ( -/obj/structure/alien/weeds, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, -/turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -3035,9 +2670,7 @@ pixel_x = 4; pixel_y = 8 }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -3046,34 +2679,18 @@ name = "MO19 Research" }) "eQ" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, +/obj/structure/alien/weeds, +/obj/structure/alien/egg/burst, /turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) "eR" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood{ color = "red" }, /turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"eS" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -3099,9 +2716,7 @@ name = "MO19 Research" }) "eX" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -3216,9 +2831,7 @@ "fh" = ( /obj/structure/table, /obj/machinery/reagentgrinder, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaycontent/a2{ @@ -3226,9 +2839,7 @@ }) "fi" = ( /obj/structure/closet/crate/freezer, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/item/clothing/mask/facehugger{ icon_state = "facehugger_impregnated"; item_state = "facehugger_impregnated"; @@ -3287,9 +2898,7 @@ "fn" = ( /obj/structure/closet/l3closet/scientist, /obj/structure/window/reinforced, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -3318,25 +2927,7 @@ /obj/structure/alien/weeds{ icon_state = "weeds2" }, -/obj/structure/alien/weeds{ - desc = "A large mottled egg."; - icon_state = "egg_hatched"; - name = "egg" - }, -/turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"fq" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/bed/nest, -/obj/item/clothing/mask/facehugger{ - icon_state = "facehugger_impregnated"; - item_state = "facehugger_impregnated"; - stat = 2 - }, +/obj/structure/alien/weeds, /turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" @@ -3385,9 +2976,7 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -3412,24 +3001,21 @@ pixel_y = 23; req_access = null }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel, /area/awaycontent/a2{ name = "MO19 Research" }) "fw" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -26 }, /obj/effect/decal/cleanable/blood/tracks{ desc = "Your instincts say you shouldn't be following these."; icon_state = "ltrails_2" }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -3583,9 +3169,7 @@ dir = 4; name = "Acid-Proof Pipe" }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" @@ -3596,27 +3180,11 @@ dir = 4; name = "Acid-Proof Pipe" }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood{ color = "red" }, /turf/simulated/floor/engine, -/area/awaycontent/a2{ - name = "MO19 Research" - }) -"fI" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; - dir = 4; - name = "Acid-Proof Pipe" - }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/alien/resin/wall, -/turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" }) @@ -3652,9 +3220,7 @@ icon_state = "tube-broken"; status = 2 }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/machinery/camera{ c_tag = "Xenobiology Containment East"; dir = 8; @@ -3706,7 +3272,6 @@ /obj/machinery/door/airlock/research{ density = 0; emagged = 1; - icon_state = "door_open"; locked = 1; name = "Xenobiology Lab"; opacity = 0; @@ -3775,9 +3340,7 @@ /turf/simulated/floor/plating, /area/awaycontent/a7) "fW" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -3844,9 +3407,7 @@ name = "MO19 Research" }) "gd" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood{ color = "red" }, @@ -3859,9 +3420,7 @@ name = "MO19 Research" }) "ge" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -4004,9 +3563,7 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11 @@ -4020,6 +3577,7 @@ "gp" = ( /obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -29 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4052,9 +3610,7 @@ /obj/item/razor{ pixel_y = 5 }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -4132,9 +3688,7 @@ icon_state = "pipe-c"; name = "Acid-Proof disposal pipe" }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" @@ -4266,9 +3820,7 @@ icon_state = "bulb-broken"; status = 2 }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4303,9 +3855,7 @@ info = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554

Report:
The test subject we were provided with truly is alien. It is a small spider-like creature with bony legs, leading to a smooth body. It has a long tail connected to it, and it has shown extremely aggressive behavior by flinging its entire body at the glass and shields to no avail. While doing so, we noticed there was a small pink hole in the middle of the body.

When we sent in a monkey through the crude but effective disposal tube, the alien immediately jumped at its face and latched on. The monkey was quickly suffocated by its constricting tail, unable to pry off the fingers. The monkey at first seemed to be dead, but was observed to be breathing. The recently named alien 'facehugger' fell off, dead, and curled its legs up like a spider moments after it had finished with the monkey's body.

While the monkey appeared to be unharmed, we kept it in the cell for a couple more hours, until we were horrified to discover it screaming out in pain, as a snake-like creature erupted from the monkey's chest! It appears that the 'facehugger' is only the start of this life cycle. The impregnation cycle involving the creatures growing inside the chests of their hosts seems to only be the beginning."; name = "'Facehugger' Xenomorph Physiology & Behavior Observation" }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4318,9 +3868,7 @@ /area/awaycontent/a7) "gM" = ( /obj/structure/table/reinforced, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 @@ -4339,9 +3887,7 @@ desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; name = "Acid-Proof disposal pipe" }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" @@ -4435,9 +3981,7 @@ }) "gV" = ( /obj/machinery/optable, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitehall" @@ -4449,9 +3993,7 @@ /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitehall" @@ -4485,9 +4027,7 @@ name = "MO19 Research" }) "gY" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4506,9 +4046,7 @@ }) "ha" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -4527,9 +4065,7 @@ dir = 1; name = "Acid-Proof disposal pipe" }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/engine, /area/awaycontent/a2{ name = "MO19 Research" @@ -4540,9 +4076,7 @@ icon_state = "tube-broken"; status = 2 }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/machinery/camera{ c_tag = "Xenobiology Containment South"; dir = 1; @@ -4559,9 +4093,7 @@ name = "Acid-Proof mounted igniter"; pixel_y = -25 }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/simulated/floor/engine, /area/awaycontent/a2{ @@ -5244,6 +4776,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -5558,6 +5091,7 @@ }) "iJ" = ( /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -6012,9 +5546,7 @@ /obj/structure/alien/weeds{ icon_state = "weeds2" }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a3{ always_unpowered = 1; @@ -6027,9 +5559,7 @@ }) "jC" = ( /obj/structure/alien/weeds, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a3{ always_unpowered = 1; @@ -6041,9 +5571,7 @@ poweralm = 0 }) "jD" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/structure/alien/weeds/node, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a3{ @@ -6058,7 +5586,6 @@ "jE" = ( /obj/item/twohanded/required/kirbyplants{ desc = "A plastic potted plant."; - layer = 4.1; pixel_y = 3 }, /obj/effect/landmark/burnturf, @@ -6211,6 +5738,7 @@ }) "jU" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/effect/landmark/burnturf, @@ -6221,6 +5749,7 @@ }) "jV" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/effect/decal/cleanable/dirt, @@ -6254,7 +5783,6 @@ /obj/machinery/door/airlock/command{ density = 0; emagged = 1; - icon_state = "door_open"; locked = 1; name = "Research Director's Office"; opacity = 0; @@ -6931,6 +6459,7 @@ }) "lc" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 26 }, /obj/machinery/camera{ @@ -7255,6 +6784,7 @@ /obj/structure/table/wood, /obj/item/lighter/zippo, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -7393,6 +6923,7 @@ }) "me" = ( /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = 30 }, /obj/machinery/light/small{ @@ -7618,6 +7149,7 @@ specialfunctions = 4 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -7913,6 +7445,7 @@ }) "ni" = ( /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -30 }, /obj/machinery/light/small, @@ -8290,6 +7823,7 @@ }) "nV" = ( /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -8419,7 +7953,6 @@ "og" = ( /obj/item/twohanded/required/kirbyplants{ desc = "A plastic potted plant."; - layer = 4.1; pixel_y = 3 }, /turf/simulated/floor/plasteel/airless{ @@ -9731,9 +9264,9 @@ ab ab ab ab -af ac -ad +ac +ac ac ab ab @@ -9843,14 +9376,14 @@ ab ab ab ab -ad -ad -af -ae +ac +ac +ac ag -af -ad -ad +ag +ac +ac +ac ab ab ab @@ -9964,8 +9497,8 @@ ak ah ak ah -af -ad +ac +ac ab ab ab @@ -10071,15 +9604,15 @@ ab ab ab ac -af +ac ak -ao +ah ah ak -ba -aq +aL +ah ag -af +ac ab ab ab @@ -10184,16 +9717,16 @@ ab ab ab ab -af +ac +ah ah -ao aC -al -ao -aq +aj +ah +ah aC ah -ad +ac ab ab ab @@ -10298,11 +9831,11 @@ ab ab ab ab -ad +ac +ah +ah +aj ah -aq -al -aq aS at bi @@ -10414,14 +9947,14 @@ ab ab ac ag -au +bj +ah +ah ah -ao -aq bb -bk -aq -af +av +ah +ac ab ab ab @@ -10526,13 +10059,13 @@ ab ab ab ab -af -an +ac +aj at -ao +ah ah am -aq +ah bj ak ac @@ -10640,16 +10173,16 @@ ab ab ab ab -ad +ac ap aw -aq -ao -ao -aq +ah +ah +ah +ah ak -ao -af +ah +ac ab ab ab @@ -10755,15 +10288,15 @@ ab ab ab ac -ao +ah av -af -ao +ac +ah ah ah aC -ae -ad +ag +ac ab ab ab @@ -10868,31 +10401,31 @@ ab ab ab ab -ad -af -aq -ah -aq -ah -aq -aq -ao -af -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -af ac -ad +ac +ah +ah +ah +ah +ah +ah +ah +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac ac ab ab @@ -10984,13 +10517,13 @@ ab ab ab ac -ae -ao +ag +ah +ah +ah +ah ah -ao ah -aq -ao ac ab ab @@ -11004,10 +10537,10 @@ ab ab ab ac -ad +ac dN aj -af +ac ac ab ab @@ -11097,32 +10630,32 @@ ab ab ab ab -af ac -aq -ao -am -aq +ac +ah +ah +am +ah ah -af -af -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ad ac -ae +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ag dO dS -aq -af +ah +ac ab ab ab @@ -11212,13 +10745,13 @@ ab ab ab ab -af +ac ac ah -aq -ao +ah +ah +ac ac -ad ab ab ab @@ -11230,13 +10763,13 @@ ab ab ab ab -af +ac aj -aq +ah am ah ag -ad +ac ab ab ab @@ -11327,30 +10860,30 @@ ab ab ab ab -af -af -ad -af -af -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ad ac -af -ao +ac +ac +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ah +ah ah -aq aj ac -ad +ac ab ab ab @@ -11457,13 +10990,13 @@ ab ab ac ac -aq +ah ai ah ag ac -af -ad +ac +ac ab ab ab @@ -11555,26 +11088,26 @@ ab ab ab ab -af +ac ah -ao -ad +ah +ac ac ab -ad -ac -af -ac -af -ad ac ac -af +ac +ac +ac +ac +ac +ac +ac +ah ah -ao ac -af -ad +ac +ac ac ab ab @@ -11669,23 +11202,23 @@ ab ab ab ab -ad -aq -aq -ah -af -af ac -aq -ah -aq -ao ah ah -af -ad ah -af +ac +ac +ac +ah +ah +ah +ah +ah +ah +ac +ac +ah +ac ac ab ab @@ -11787,19 +11320,19 @@ ac ac ah ah -ao -af ah -aq -ao +ac +ah +ah +ah +ah +ah ah -aq -ao am -aq ah -ao -ad +ah +ah +ac ab ab ab @@ -11891,29 +11424,29 @@ aa aa aa ab -ad -af ac -ad +ac +ac +ac ab ab ab -ad -af -ao -am -ao -aq +ac +ac +ah +am +ah +ah ah -af ac -af ac -aq -ao -aq ac -ad +ac +ah +ah +ah +ac +ac ab ab ab @@ -12004,29 +11537,29 @@ aa aa aa aa -ad -af +ac +ac ag aj ac -af ac -ad ac -af -aq -ao +ac +ac +ac +ah +ah +ah ah -ao ac -ad +ac bl bl -ad -af +ac +ac ah -ao -af +ah +ac ab ab ab @@ -12119,26 +11652,26 @@ aa aa aa ac -ae +ag ah ai ah -ad -af -aq +ac +ac ah -ao ah -aq -aq -af -ad +ah +ah +ah +ah +ac +ac bl bl bl ac -aq -aq +ah +ah ah ac ab @@ -12232,29 +11765,29 @@ aa aa aa aa -ad +ac ag ah ak am -aq ah -ao -af -ac -ao -af -ac -af -bl -bl -bl -bl -af ah -ao -af -ad +ah +ac +ac +ah +ac +ac +ac +bl +bl +bl +bl +ac +ah +ah +ac +ac ab ab ab @@ -12347,27 +11880,27 @@ aa aa aa ac -af -af -aj -al -ad -af ac -ad -ad +ac +aj +aj +ac +ac +ac +ac +ac ah -ad +ac bl bl bl bl bl bl -af -ao +ac ah -af +ah +ac ab ab ab @@ -12463,36 +11996,36 @@ aa ab ab ac -af -af +ac +ac ac ab ab ab -af +ac aL -af +ac ac bl bl bl bl bl -ad +ac ah dd -ad -af -ad +ac +ac +ac ab ab ab dA dA dA -dR -dV -dV +dQ +dT +dT dA dA dA @@ -12583,8 +12116,8 @@ ab ab ab ab -af -ao +ac +ah ah ac bl @@ -12593,21 +12126,21 @@ bl bl bl ac -aq -ao -aq ah -af +ah +ah +ah +ac +ac ac -af ab dA dA -dW +dQ dQ dT -dV -dV +dT +dT dA dA ab @@ -12695,33 +12228,33 @@ ab ab ab ab -ad -af ac -aq -aq -af -ad -bl -bl -bl -bl -af -af +ac +ac ah -ao -ao ah -aq -ad -af +ac +ac +bl +bl +bl +bl +ac +ac +ah +ah +ah +ah +ah +ac +ac +dQ dQ -dR dU dT -dV -dV -dV +dT +dT +dT dA dA ab @@ -12808,34 +12341,34 @@ ab ab ab ab -ad +ac ac aI ah -aq +ah am -ae +ag ac bl bl bl -ad -af -ah -aq ac -af +ac ah -ao -aq -ad +ah +ac +ac +ah +ah +ah +ac dP dT -dX -dV -dX -dV -dV +dT +dT +dT +dT +dT dA dA dA @@ -12922,34 +12455,34 @@ ab ab ab ab -af +ac aD aK ai ah -ae -al -af +ag +aj +ac bl bl bl ac ah -ao -af +ah +ac +ac +ac ac -ad -af ah am -ad +ac dP -dV -dX dT -dV -dV -dV +dT +dT +dT +dT +dT dA dA dA @@ -13036,35 +12569,35 @@ ab ab ab ab -af +ac +aj +av +ah +aj aj -aJ -ao -an -al -af -ad -bl -bl -bl -af -aq ac -af +ac +bl +bl +bl +ac +ah +ac +ac ab ab ac -af -ad -af -dR +ac +ac +ac +dQ dU -dV -dX -dV -dV -dV -dV +dT +dT +dT +dT +dT +dT dA dA dA @@ -13151,20 +12684,20 @@ ab ab ab ac -ad -af +ac +ac ah -af -af +ac +ac ac bl bl bl bl -ad -ao -af -ad +ac +ah +ac +ac ab ab ab @@ -13172,14 +12705,14 @@ ab ab dA dA -dR +dQ +dT +dT +dT +dT +dT +dT dT -dV -dV -dV -dV -dV -dV dA dA ab @@ -13267,7 +12800,7 @@ ab ab ab ac -ao +ah ac bl bl @@ -13287,13 +12820,13 @@ ab dA dA dQ -dX +dT jC -dV -dV -dV +dT +dT +dT dP -dV +dT dA dA dA @@ -13380,9 +12913,9 @@ ab ab ab ab -ad -ao -af +ac +ah +ac bl bl bl @@ -13390,25 +12923,25 @@ bl bl bl ac -af +ac am -af +ac ab ab ab ab dA dA -dR -dR +dQ +dQ jB -dV -dV -dV -dV -dV -dV -dV +dT +dT +dT +dT +dT +dT +dT dA dA ab @@ -13496,7 +13029,7 @@ ab ab ac am -ad +ac bl bl bl @@ -13504,8 +13037,8 @@ bl bl bl bl -ad -ao +ac +ah ac ab ab @@ -13513,16 +13046,16 @@ ab ab dA dA -dR -dV -dV -dV -dV -dV -dV -dV -dV -dV +dQ +dT +dT +dT +dT +dT +dT +dT +dT +dT dA dA dA @@ -13608,8 +13141,8 @@ ab ab ab ab -af -ao +ac +ah ac bl bl @@ -13618,25 +13151,25 @@ bl bl bl bl -af -aq -af +ac +ah +ac ab ab ab ab dA dA -dV -dV -dV -dV +dT +dT +dT +dT jD -dV -dV -dV -dR -dR +dT +dT +dT +dQ +dQ dA dA dA @@ -13724,14 +13257,14 @@ ab ab ac ah -af +ac bl bl bl bl bl bl -af +ac ac ah ac @@ -13741,15 +13274,15 @@ ab ab dA dA -dV -dV -dV -dV -dV -dV -dV -dV -dR +dT +dT +dT +dT +dT +dT +dT +dT +dQ aZ aZ aZ @@ -13836,34 +13369,34 @@ ab ab ab ab -af -aq -ac -bl -bl -bl -bl -bl -ad ac ah -ao -ad +ac +bl +bl +bl +bl +bl +ac +ac +ah +ah +ac ab ab ab ab dA dA -dV -dV -dV -dV -dV -dV -dV -dV -dR +dT +dT +dT +dT +dT +dT +dT +dT +dQ aZ aZ aZ @@ -13949,35 +13482,35 @@ ab ab ab ab -ad -af -ao -af -ad ac -af -af -ad -af -ao -aq ac -af +ah +ac +ac +ac +ac +ac +ac +ac +ah +ah +ac +ac ab ab ab dA dA dA -dV -dV -dV -dV -dV -dV -dV -dR -dR +dT +dT +dT +dT +dT +dT +dT +dQ +dQ aZ aZ aZ @@ -14062,35 +13595,35 @@ ab ab ab ab -ad -af -aq +ac +ac +ah ah ak ac -af +ac +ah ah -aq bW ah -aq -af -ad +ah +ac +ac ab ab ab ab dA dA -dV -dV +dT +dT dP -dV -dV -dV -dV -dV -dR +dT +dT +dT +dT +dT +dQ aZ aZ aZ @@ -14177,17 +13710,17 @@ ab ab ab ac -al +aj aL -ao ah -aq -ao -ao -ad -af +ah +ah +ah +ah +ac +ac +ac ac -af ac ab ab @@ -14196,15 +13729,15 @@ ab ab dA dA -dV -dV -dV -dV -dV -dV -dV -dR -dR +dT +dT +dT +dT +dT +dT +dT +dQ +dQ aZ aZ aZ @@ -14289,16 +13822,16 @@ ab ab ab ab -af -af +ac +ac ag -aq +ah am ah -ae -af +ag +ac +ac ac -af ab ab ab @@ -14312,12 +13845,12 @@ ab dA dA dA -dV -dV -dV -dV -dR -dR +dT +dT +dT +dT +dQ +dQ aZ aZ aZ @@ -14404,13 +13937,13 @@ ab ab ab ac -ae -aq +ag ah -an -al -af -ad +ah +aj +aj +ac +ac ab ab ab @@ -14426,11 +13959,11 @@ ab ab ab dA -dR +dQ dA dA -dV -dR +dT +dQ aZ aZ aZ @@ -14518,12 +14051,12 @@ ab ab ab ar -af ac -af -ad ac -af +ac +ac +ac +ac ab ab ab @@ -14540,7 +14073,7 @@ ab ab ab ab -dR +dQ dA dA dA @@ -14654,7 +14187,7 @@ ab ab ab ab -dR +dQ ab ab ab @@ -15010,7 +14543,7 @@ ab ab ea eh -ew +eh eJ fk fB @@ -15582,7 +15115,7 @@ ea ea eA eq -eE +eq fG gd gw @@ -15695,7 +15228,7 @@ ab ea el eB -eF +eq en fH ge @@ -15807,15 +15340,15 @@ ab ab ab ea -em +ge eC eH -eS -fI +en +fJ gf -eD +en eC -eF +eq ea dA aZ @@ -15922,13 +15455,13 @@ ab ab ea en -eD +en eQ -eF +eq fJ -eF -eE -eD +eq +eq +en eq ea dA @@ -16036,11 +15569,11 @@ ab ab ec eo -eE +eq eq eq fK -eF +eq eq en hc @@ -16150,11 +15683,11 @@ ab ab ea ep -eF +eq eQ -eE -eE -eF +eq +eq +eq eq eR hd @@ -16267,7 +15800,7 @@ eq eG eR fp -eD +en gg eq en @@ -16379,11 +15912,11 @@ ab ea er eH -eS +en en eR -eD -eS +en +en eC eq ea @@ -16491,14 +16024,14 @@ ab ab ab ea -es -eI +gf +eQ eC -fq +er fL -eI +eQ fp -eE +eq eq ea ab diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm index 758d79e102f..b8e6be0b7eb 100644 --- a/_maps/map_files/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm @@ -186,6 +186,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /obj/item/gun/energy/laser/retro, @@ -287,6 +288,7 @@ /area/awaymission/UO71/plaza) "aS" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -390,6 +392,7 @@ "bf" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -403,6 +406,7 @@ }, /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /obj/item/gun/energy/laser/awaymission_aeg, @@ -724,6 +728,7 @@ "ch" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /turf/simulated/floor/carpet, @@ -738,6 +743,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -977,6 +983,7 @@ /area/awaymission/UO71/science) "cW" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -1173,6 +1180,7 @@ dir = 4 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light/small{ @@ -1693,6 +1701,7 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -1981,6 +1990,7 @@ "fm" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/carpet, @@ -1995,6 +2005,7 @@ /area/awaymission/UO71/plaza) "fo" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, @@ -2003,6 +2014,7 @@ "fp" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -2409,6 +2421,7 @@ /area/awaymission/UO71/science) "gw" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/robot_parts/l_arm, @@ -2487,6 +2500,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -2562,6 +2576,7 @@ /area/awaymission/UO71/centralhall) "gN" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -2939,6 +2954,7 @@ "hD" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3034,6 +3050,7 @@ "hP" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -3595,6 +3612,7 @@ "jt" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -4105,6 +4123,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -4322,6 +4341,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -4443,6 +4463,7 @@ /obj/structure/table, /obj/item/newspaper, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /obj/effect/decal/cleanable/dirt, @@ -4470,6 +4491,7 @@ "ln" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4501,6 +4523,7 @@ dir = 5 }, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -4712,6 +4735,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4849,6 +4873,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -4900,6 +4925,7 @@ "lW" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -5134,6 +5160,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -5168,6 +5195,7 @@ "mE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /obj/item/paper/terrorspiders4, @@ -5268,6 +5296,7 @@ /area/awaymission/UO71/gateway) "mN" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /obj/structure/rack{ @@ -5288,6 +5317,7 @@ /obj/item/clothing/shoes/magboots, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -5424,6 +5454,7 @@ "ne" = ( /obj/structure/table, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /obj/item/book/manual/security_space_law, @@ -6384,6 +6415,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/effect/landmark/burnturf, @@ -6653,6 +6685,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -6675,6 +6708,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -6929,6 +6963,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -7587,6 +7622,7 @@ pixel_y = 5 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/multitool, @@ -7709,6 +7745,7 @@ "rt" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /obj/item/pen, @@ -7723,6 +7760,7 @@ "rv" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /turf/simulated/floor/carpet, @@ -7780,6 +7818,7 @@ "rB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25 }, /turf/simulated/floor/plasteel, @@ -7789,6 +7828,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/effect/decal/cleanable/dirt, @@ -7817,6 +7857,7 @@ /area/awaymission/UO71/eng) "rH" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/dispenser{ @@ -7860,6 +7901,7 @@ pixel_x = 4 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, @@ -7990,6 +8032,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -8577,6 +8620,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump{ @@ -8663,6 +8707,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -9946,6 +9991,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet/secure_closet/miner{ @@ -10425,6 +10471,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -10482,6 +10529,7 @@ "wX" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -10833,6 +10881,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/stack/sheet/mineral/plasma{ @@ -11008,6 +11057,7 @@ on = 1 }, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /obj/structure/cable{ @@ -11538,6 +11588,7 @@ /area/awaymission/UO71/loot) "zu" = ( /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -11674,6 +11725,7 @@ "Ad" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm index ff919b2d5d5..51f9b8561a0 100644 --- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm @@ -501,6 +501,7 @@ }) "bl" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -1097,6 +1098,7 @@ }, /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /turf/simulated/floor/carpet, @@ -1126,6 +1128,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /turf/simulated/floor/carpet, @@ -2568,6 +2571,7 @@ tag = "" }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -2951,6 +2955,7 @@ "fS" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/carpet, @@ -2973,6 +2978,7 @@ }) "fV" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, @@ -3693,6 +3699,7 @@ }) "hr" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -5834,6 +5841,7 @@ }) "kW" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -5974,6 +5982,7 @@ dir = 5 }, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -6704,6 +6713,7 @@ /obj/structure/table, /obj/item/newspaper, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30 }, /obj/effect/decal/cleanable/dirt, @@ -6842,6 +6852,7 @@ "ms" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -6871,6 +6882,7 @@ "mv" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /turf/simulated/floor/carpet, @@ -6957,6 +6969,7 @@ }) "mD" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /obj/structure/rack{ @@ -7128,6 +7141,7 @@ }, /obj/item/pen, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -8399,6 +8413,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -9871,6 +9886,7 @@ "qZ" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /obj/item/pen, @@ -9946,6 +9962,7 @@ "rg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -25 }, /turf/simulated/floor/plasteel, @@ -10023,6 +10040,7 @@ pixel_x = 4 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, @@ -10114,6 +10132,14 @@ initialize_directions = 6 }, /turf/simulated/floor/plasteel, +/area/awaycontent/a3{ + name = "UO45 Engineering" + }) +"rt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor/plasteel, /area/awaycontent/a3{ name = "UO45 Engineering" }) @@ -10672,6 +10698,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/effect/decal/cleanable/dirt, @@ -11242,14 +11269,6 @@ dir = 10 }, /turf/simulated/floor/plasteel, -/area/awaycontent/a3{ - name = "UO45 Engineering" - }) -"sZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor/plasteel, /area/awaycontent/a3{ name = "UO45 Engineering" }) @@ -13748,6 +13767,7 @@ on = 1 }, /obj/machinery/newscaster{ + name = "custom placement"; pixel_y = -28 }, /obj/structure/cable{ @@ -13949,17 +13969,6 @@ /area/awaycontent/a4{ name = "UO45 Mining" }) -"xv" = ( -/obj/structure/closet/cabinet, -/turf/simulated/mineral/random/labormineral, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) "xw" = ( /obj/structure/table, /obj/item/pickaxe, @@ -14220,25 +14229,8 @@ /area/awaycontent/a4{ name = "UO45 Mining" }) -"yf" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/bed/nest, -/obj/effect/mob_spawn/human/miner, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) "yg" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/mob_spawn/human/miner, /obj/effect/decal/cleanable/blood/splatter{ color = "red" @@ -14303,54 +14295,6 @@ "ym" = ( /obj/structure/ore_box, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"yn" = ( -/obj/structure/closet/emcloset, -/turf/simulated/wall/r_wall/rust, -/area/awaycontent/a4{ - name = "UO45 Mining" - }) -"yo" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/effect/mob_spawn/human/miner, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"yp" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/glowshroom/single, -/turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"yq" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/structure/bed/nest, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a7{ always_unpowered = 1; name = "UO45 Caves"; @@ -14360,27 +14304,12 @@ poweralm = 0 }) "yr" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs{ color = "red"; icon_state = "gib2_flesh" }, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"ys" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a7{ always_unpowered = 1; name = "UO45 Caves"; @@ -14404,9 +14333,7 @@ poweralm = 0 }) "yu" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/structure/glowshroom/single, /turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a7{ @@ -14421,25 +14348,6 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"yw" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/effect/decal/cleanable/blood/tracks{ - color = "red"; - desc = "Your instincts say you shouldn't be following these."; - icon = 'icons/effects/blood.dmi'; - icon_state = "tracks" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a7{ always_unpowered = 1; name = "UO45 Caves"; @@ -14454,19 +14362,6 @@ color = "red" }, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"yy" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a7{ always_unpowered = 1; name = "UO45 Caves"; @@ -14487,30 +14382,12 @@ poweralm = 0 }) "yA" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, /obj/effect/mob_spawn/human/miner, /turf/simulated/floor/plating/asteroid/airless, -/area/awaycontent/a7{ - always_unpowered = 1; - name = "UO45 Caves"; - power_environ = 0; - power_equip = 0; - power_light = 0; - poweralm = 0 - }) -"yB" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/obj/effect/decal/cleanable/blood/splatter{ - color = "red" - }, -/turf/simulated/floor/plating/asteroid/airless, /area/awaycontent/a7{ always_unpowered = 1; name = "UO45 Caves"; @@ -14534,9 +14411,7 @@ poweralm = 0 }) "yD" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -14580,9 +14455,7 @@ poweralm = 0 }) "yG" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, +/obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -14645,6 +14518,23 @@ power_light = 0; poweralm = 0 }) +"AO" = ( +/obj/structure/closet/cabinet, +/turf/simulated/mineral/random/labormineral, +/area/awaycontent/a7{ + always_unpowered = 1; + name = "UO45 Caves"; + power_environ = 0; + power_equip = 0; + power_light = 0; + poweralm = 0 + }) +"NE" = ( +/obj/structure/closet/emcloset, +/turf/simulated/wall/r_wall/rust, +/area/awaycontent/a4{ + name = "UO45 Mining" + }) (1,1,1) = {" aa @@ -16263,7 +16153,7 @@ ac ac ac ac -yf +bY yr ac ac @@ -16415,7 +16305,7 @@ ac ac yv yx -yy +gg ac ac ac @@ -16564,7 +16454,7 @@ ac ac ac yu -ys +gg fo yz ac @@ -16714,7 +16604,7 @@ ac ac ac ac -yy +gg fo yC ac @@ -17018,7 +16908,7 @@ ac ac yt fo -ys +gg yH yD ac @@ -17160,7 +17050,7 @@ ac ac ac ac -yf +bY yr eK gC @@ -17168,7 +17058,7 @@ ac ac ac fo -yy +gg fo yz ac @@ -17309,9 +17199,9 @@ ac ac ac ac -yf -yq -ys +bY +yv +gg yg eK ac @@ -17460,7 +17350,7 @@ ac ac ac ac -yp +yu fo fo gg @@ -17763,10 +17653,10 @@ ac ac ac fo -yw bX -yw -yy +bX +bX +gg fo fo ac @@ -17914,7 +17804,7 @@ ac ac ac ac -yy +gg fo fo fo @@ -18214,11 +18104,11 @@ ac ac ac ac -yo +yE fo fo gg -ys +gg yJ fo gg @@ -18365,9 +18255,9 @@ ac ac ac gg -yy +gg fo -ys +gg ac ac yx @@ -18515,7 +18405,7 @@ ac ac ac ac -yB +yx fo ac ac @@ -24421,11 +24311,11 @@ aB aB aC aC -xv +AO ac ac ac -xv +AO ac ac bQ @@ -26291,7 +26181,7 @@ vJ vJ vJ vJ -yn +NE yl fo fo @@ -29717,7 +29607,7 @@ oS pB qc qF -sZ +rt sl sX tG @@ -29749,7 +29639,7 @@ ac ac ac ac -xv +AO ac ac ac @@ -30019,7 +29909,7 @@ qe qI qK sn -sZ +rt rl sd nj diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 1039d265660..e7bc45a46f2 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -8,6 +8,7 @@ /area/space/nearstation) "aac" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table, @@ -261,6 +262,7 @@ "acK" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -446,6 +448,7 @@ /obj/machinery/recharger, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plating, @@ -478,6 +481,7 @@ /obj/machinery/recharger, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -671,6 +675,7 @@ "adM" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/prisoner{ @@ -793,6 +798,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/secure_data{ @@ -1102,10 +1108,12 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -1120,6 +1128,7 @@ icon_state = "4-8" }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/computer/security{ @@ -1186,6 +1195,7 @@ /area/security/prisonershuttle) "afa" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/table, @@ -1299,6 +1309,7 @@ "afx" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet/secure_closet/security, @@ -1539,6 +1550,7 @@ /area/security/brig) "agO" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -1737,6 +1749,7 @@ dir = 4 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -1796,6 +1809,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/storage/box/chemimp{ @@ -1822,6 +1836,7 @@ /area/security/armoury) "ahQ" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -1874,7 +1889,7 @@ /area/security/armoury) "ahU" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/status_display{ @@ -2126,6 +2141,7 @@ /area/security/armoury) "aix" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -2134,6 +2150,7 @@ "aiz" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -2209,6 +2226,7 @@ "aiO" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/west, @@ -2311,6 +2329,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -2333,6 +2352,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -2409,6 +2429,7 @@ /area/security/brig) "aja" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table, @@ -2467,6 +2488,7 @@ "aji" = ( /obj/structure/table, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/computer/library/public, @@ -2823,6 +2845,7 @@ icon_state = "pipe-c" }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -2935,6 +2958,7 @@ /obj/item/taperecorder, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/radio/intercom/department/security{ @@ -3028,6 +3052,7 @@ dir = 8 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/landmark/start/security_officer, @@ -3044,6 +3069,7 @@ /area/security/hos) "akK" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -3065,13 +3091,14 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "akN" = ( -/obj/machinery/newscaster{ - pixel_y = 30 - }, /obj/structure/closet/secure_closet/hos, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, +/obj/machinery/newscaster{ + name = "north bump"; + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3281,6 +3308,7 @@ /obj/machinery/vending/security, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/radio/intercom/department/security{ @@ -3316,6 +3344,7 @@ "alj" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -3418,6 +3447,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_robust, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -3529,6 +3559,7 @@ "alH" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -3567,6 +3598,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3653,6 +3685,7 @@ "alS" = ( /obj/structure/closet, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -3779,6 +3812,7 @@ "amd" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -3803,6 +3837,7 @@ /area/maintenance/fore) "amf" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/closet/secure_closet/security, @@ -3943,6 +3978,7 @@ /obj/structure/table, /obj/machinery/recharger, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -4245,6 +4281,7 @@ /obj/structure/closet/secure_closet/brig, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -4256,6 +4293,7 @@ "ank" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -4608,6 +4646,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4729,7 +4768,7 @@ department = "Internal Affairs Office" }, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/light{ @@ -4749,6 +4788,7 @@ "aoc" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -4849,6 +4889,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5320,6 +5361,7 @@ /obj/structure/closet, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -5337,7 +5379,7 @@ }, /obj/item/pen, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/requests_console{ @@ -5503,6 +5545,7 @@ /obj/item/stack/medical/bruise_pack/advanced, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light{ @@ -5564,6 +5607,7 @@ /obj/machinery/disposal, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -5588,6 +5632,7 @@ "apI" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -5722,6 +5767,7 @@ /obj/machinery/disposal, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -6336,7 +6382,7 @@ icon_state = "1-4" }, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6507,6 +6553,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -6926,6 +6973,7 @@ "asx" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -6946,6 +6994,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -7135,6 +7184,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -7159,6 +7209,7 @@ "asY" = ( /obj/structure/chair/office/dark, /obj/item/radio/intercom{ + name = "custom placement"; pixel_x = -28; pixel_y = -28 }, @@ -7235,6 +7286,7 @@ "atc" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -7527,6 +7579,7 @@ }, /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -7686,6 +7739,7 @@ /obj/item/clothing/glasses/sunglasses, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -8140,6 +8194,7 @@ req_access_txt = "2" }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8186,6 +8241,7 @@ }, /obj/machinery/door/firedoor, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8252,6 +8308,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -8324,6 +8381,7 @@ /obj/structure/table, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/hand_labeler, @@ -8546,6 +8604,7 @@ /area/security/permabrig) "avp" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -9141,6 +9200,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -9316,6 +9376,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "custom placement"; pixel_x = -5; pixel_y = -24 }, @@ -9332,6 +9393,7 @@ /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plating, @@ -9339,6 +9401,7 @@ "awZ" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -9505,6 +9568,7 @@ /area/security/processing) "axu" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -9584,6 +9648,7 @@ "axB" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -9774,6 +9839,7 @@ /area/security/processing) "axQ" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -9814,6 +9880,7 @@ "axU" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -9979,6 +10046,7 @@ /obj/item/storage/box/evidence, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/pen, @@ -9995,6 +10063,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -10262,7 +10331,7 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 8; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -10332,6 +10401,7 @@ req_access_txt = "2" }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10363,6 +10433,7 @@ req_access_txt = "2" }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10388,6 +10459,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -10397,6 +10469,7 @@ /area/security/prison/cell_block/A) "ayX" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/cable{ @@ -10624,6 +10697,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -11079,6 +11153,7 @@ /obj/item/clothing/glasses/sunglasses/blindfold, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -11118,6 +11193,7 @@ "aAB" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -11130,6 +11206,7 @@ "aAC" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -11151,10 +11228,12 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet/secure_closet/iaa, @@ -11189,6 +11268,7 @@ /obj/item/pen, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/paper_bin/nanotrasen, @@ -11211,6 +11291,7 @@ "aAL" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/chair/stool/bar{ @@ -11240,6 +11321,7 @@ pixel_y = -7 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/carpet, @@ -11410,6 +11492,7 @@ }, /obj/machinery/door/firedoor, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -11497,6 +11580,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11808,6 +11892,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/prisoner{ @@ -12066,6 +12151,7 @@ /obj/machinery/light/small, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/west, @@ -12352,6 +12438,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -12372,6 +12459,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12513,6 +12601,7 @@ dir = 4 }, /obj/machinery/newscaster{ + name = "east bump"; pixel_x = 32 }, /turf/simulated/floor/plasteel{ @@ -12531,6 +12620,7 @@ /area/maintenance/fpmaint) "aDH" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -12752,6 +12842,7 @@ "aEo" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/power/apc{ @@ -12767,7 +12858,7 @@ /area/security/detectives_office) "aEp" = ( /obj/item/radio/intercom{ - dir = 8; + name = "east bump"; pixel_x = 28 }, /obj/machinery/computer/security/wooden_tv{ @@ -13087,6 +13178,7 @@ /obj/machinery/light, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plating, @@ -13166,11 +13258,13 @@ "aFo" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -13239,6 +13333,7 @@ dir = 4 }, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -13801,6 +13896,7 @@ /obj/machinery/dye_generator, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -13822,12 +13918,14 @@ c_tag = "Arcade" }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/arcade) "aGQ" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/carpet/arcade, @@ -14066,6 +14164,7 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -14107,6 +14206,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -14389,6 +14489,7 @@ /obj/structure/dresser, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -14408,6 +14509,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/landmark/start/assistant, @@ -14600,6 +14702,7 @@ "aIO" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -14647,6 +14750,7 @@ "aIW" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -14800,6 +14904,7 @@ /obj/machinery/vending/cigarette, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -14829,6 +14934,7 @@ "aJn" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet/secure_closet{ @@ -15323,7 +15429,8 @@ /area/civilian/barber) "aKG" = ( /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -15400,6 +15507,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/carpet/arcade, @@ -16085,7 +16193,7 @@ /area/maintenance/fsmaint) "aMp" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -16104,7 +16212,7 @@ /area/hallway/secondary/entry) "aMt" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -16125,6 +16233,7 @@ /area/maintenance/fpmaint2) "aMw" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16227,6 +16336,7 @@ /obj/machinery/vending/snack, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/carpet/arcade, @@ -16362,7 +16472,7 @@ /area/crew_quarters/courtroom) "aNc" = ( /obj/item/radio/intercom{ - dir = 8; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -16432,6 +16542,7 @@ icon_state = "1-8" }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/effect/decal/cleanable/dirt, @@ -16636,6 +16747,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -16772,6 +16884,7 @@ /obj/machinery/disposal, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -17079,6 +17192,7 @@ /obj/item/storage/toolbox/electrical, /obj/item/multitool, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/decal/cleanable/dirt, @@ -17225,6 +17339,7 @@ /area/maintenance/fpmaint2) "aPd" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -17344,6 +17459,7 @@ "aPx" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -17404,6 +17520,7 @@ /area/crew_quarters/courtroom) "aPE" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/light, @@ -17426,6 +17543,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -17555,6 +17673,7 @@ /area/maintenance/electrical) "aPT" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17697,6 +17816,7 @@ /area/crew_quarters/dorms) "aQn" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/disposalpipe/junction{ @@ -17891,6 +18011,7 @@ /area/crew_quarters/dorms) "aQG" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/light{ @@ -18013,6 +18134,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -18046,6 +18168,7 @@ /area/crew_quarters/sleep) "aRa" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/light{ @@ -18102,6 +18225,7 @@ /area/hallway/secondary/entry) "aRf" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18440,12 +18564,14 @@ /obj/structure/table, /obj/item/storage/box/cups, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "aRN" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/chair/comfy/brown{ @@ -18541,6 +18667,7 @@ /area/hallway/primary/fore) "aSc" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -18918,6 +19045,7 @@ /area/hallway/secondary/entry) "aSZ" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -18926,6 +19054,7 @@ /area/crew_quarters/dorms) "aTa" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -18948,6 +19077,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -19019,6 +19149,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plating, @@ -19324,6 +19455,7 @@ /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -19342,6 +19474,7 @@ /obj/structure/table, /obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -19382,6 +19515,7 @@ dir = 8 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -19532,6 +19666,7 @@ }) "aUs" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel, @@ -19700,6 +19835,7 @@ /area/crew_quarters/dorms) "aUN" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -19887,6 +20023,7 @@ dir = 1 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/cable{ @@ -20287,6 +20424,7 @@ /obj/machinery/light, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -20335,6 +20473,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -20394,6 +20533,7 @@ "aWi" = ( /obj/structure/table, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/wirecutters, @@ -20446,6 +20586,7 @@ "aWn" = ( /obj/structure/table, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/t_scanner, @@ -20454,6 +20595,7 @@ "aWo" = ( /obj/structure/table, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/item/assembly/signaler, @@ -20479,6 +20621,7 @@ "aWq" = ( /obj/structure/table, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/cell_charger, @@ -20683,6 +20826,7 @@ c_tag = "Medbay Chemistry North" }, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -20859,6 +21003,7 @@ "aXg" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20902,6 +21047,7 @@ /area/chapel/office) "aXk" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -21136,6 +21282,7 @@ pixel_y = -2 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/item/storage/belt/champion, @@ -21345,6 +21492,7 @@ /obj/item/autopsy_scanner, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/status_display{ @@ -21385,6 +21533,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/red/hollow, @@ -21433,6 +21582,7 @@ /area/medical/morgue) "aYr" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21446,6 +21596,7 @@ /obj/machinery/cryopod/right, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -21601,6 +21752,7 @@ /area/crew_quarters/sleep) "aYJ" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -21900,6 +22052,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/clothing/head/bearpelt, @@ -22077,6 +22230,7 @@ "aZM" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -22101,6 +22255,7 @@ "aZO" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/twohanded/required/kirbyplants, @@ -22180,6 +22335,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -22198,6 +22354,7 @@ "bab" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -22367,6 +22524,7 @@ /area/library) "bav" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/table/wood, @@ -23217,6 +23375,7 @@ /obj/structure/closet/secure_closet/chaplain, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/status_display{ @@ -23285,6 +23444,7 @@ /area/maintenance/fpmaint) "bcw" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -23333,6 +23493,7 @@ }, /obj/item/storage/fancy/crayons, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -23341,6 +23502,7 @@ /area/chapel/office) "bcC" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -23387,6 +23549,7 @@ /area/hallway/secondary/entry) "bcM" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel, @@ -23400,6 +23563,7 @@ /area/shuttle/arrival/station) "bcO" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -23418,14 +23582,15 @@ /obj/structure/table/glass, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, -/obj/machinery/light_switch{ - name = "light switch "; - pixel_x = -6; - pixel_y = -25 - }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -23488,6 +23653,7 @@ "bcW" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -23650,6 +23816,7 @@ "bdn" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/west, @@ -23664,6 +23831,7 @@ /obj/item/flashlight/lamp/bananalamp, /obj/item/reagent_containers/food/snacks/pie, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/wood, @@ -23692,6 +23860,7 @@ /obj/item/reagent_containers/spray/waterflower, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -23708,6 +23877,7 @@ /obj/structure/statue/tranquillite/mime, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -23876,6 +24046,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/vending/chefdrobe, @@ -24014,6 +24185,7 @@ /area/crew_quarters/dorms) "bdV" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -24232,7 +24404,8 @@ /area/library) "bep" = ( /obj/machinery/newscaster{ - pixel_x = 30 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/wood, /area/library) @@ -24254,6 +24427,7 @@ /area/chapel/office) "bes" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/mineral/titanium/blue, @@ -24268,6 +24442,7 @@ "beu" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -24327,6 +24502,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -24355,6 +24531,7 @@ /area/crew_quarters/bar) "beI" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -24538,6 +24715,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -24649,6 +24827,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/camera{ @@ -24671,6 +24850,7 @@ }, /obj/machinery/light, /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/structure/disposalpipe/segment{ @@ -24848,6 +25028,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -24881,6 +25062,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -24917,6 +25099,7 @@ /area/crew_quarters/kitchen) "bfD" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/closet/secure_closet/hydroponics, @@ -24974,6 +25157,7 @@ /area/maintenance/fsmaint) "bfJ" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/hydroponics/soil, @@ -25015,6 +25199,7 @@ /area/hydroponics) "bfM" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/structure/table, @@ -25293,7 +25478,7 @@ /area/hallway/secondary/entry) "bgw" = ( /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /obj/structure/cable{ @@ -25371,6 +25556,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/decal/warning_stripes/west, @@ -25389,6 +25575,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -25432,6 +25619,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -25510,6 +25698,7 @@ /area/hallway/primary/central/north) "bgV" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/door/firedoor, @@ -25616,6 +25805,7 @@ /obj/item/clothing/under/soldieruniform, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -25682,6 +25872,7 @@ "bhs" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -25766,6 +25957,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -26034,6 +26226,7 @@ "bia" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -26076,6 +26269,7 @@ "bih" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -26205,7 +26399,8 @@ /area/hallway/secondary/entry) "biw" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26399,6 +26594,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/item/storage/toolbox/mechanical{ @@ -26554,6 +26750,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -26583,6 +26780,7 @@ /area/turret_protected/aisat_interior) "bjc" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/closet/secure_closet/bar{ @@ -26647,6 +26845,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/vending/bardrobe, @@ -26800,6 +26999,7 @@ "bjI" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -26881,6 +27081,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/effect/decal/warning_stripes/west, @@ -26888,6 +27089,7 @@ /area/hallway/secondary/entry) "bjV" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/light, @@ -26932,6 +27134,7 @@ /area/maintenance/fsmaint) "bjY" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/structure/disposalpipe/segment{ @@ -26961,6 +27164,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/disposalpipe/segment{ @@ -26990,6 +27194,7 @@ "bke" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -27011,6 +27216,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -27074,6 +27280,7 @@ /area/hallway/primary/port) "bkm" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -27459,6 +27666,7 @@ /obj/machinery/hydroponics/soil, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/grass, @@ -27507,6 +27715,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -27581,6 +27790,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -27654,6 +27864,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -27984,6 +28195,7 @@ dir = 4 }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -28019,6 +28231,7 @@ "bmk" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -28213,6 +28426,7 @@ /obj/structure/cult/archives, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -28261,6 +28475,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -28430,6 +28645,7 @@ /area/hallway/primary/central/north) "bng" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/hologram/holopad, @@ -28499,6 +28715,7 @@ c_tag = "Bar East" }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/item/twohanded/required/kirbyplants, @@ -28543,6 +28760,7 @@ /area/maintenance/port) "bnr" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/hologram/holopad, @@ -28592,6 +28810,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plating, @@ -28615,6 +28834,7 @@ /area/storage/emergency2) "bnA" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -28791,6 +29011,7 @@ /area/bridge) "bob" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -28904,6 +29125,7 @@ c_tag = "Kitchen" }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/kitchen_machine/candy_maker, @@ -28954,6 +29176,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/white/hollow, @@ -28963,6 +29186,7 @@ /area/ai_monitored/storage/eva) "bos" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/kitchen_machine/oven, @@ -28992,8 +29216,8 @@ /area/hydroponics) "bov" = ( /obj/machinery/newscaster{ - pixel_x = 27; - pixel_y = 1 + name = "east bump"; + pixel_x = 32 }, /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel{ @@ -29129,6 +29353,7 @@ "boO" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -29153,6 +29378,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29180,6 +29406,7 @@ "boT" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -29235,6 +29462,7 @@ "bpa" = ( /obj/structure/closet/wardrobe/mixed, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel, @@ -29242,6 +29470,7 @@ "bpb" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/table, @@ -29252,6 +29481,7 @@ "bpc" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -29303,6 +29533,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -29325,6 +29556,7 @@ "bpl" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/power/apc{ @@ -29567,6 +29799,7 @@ "bpF" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -29752,6 +29985,7 @@ /area/medical/research) "bqc" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/wood, @@ -29763,6 +29997,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/computer/library/checkout, @@ -29934,6 +30169,7 @@ /obj/structure/closet/secure_closet/personal, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -29993,6 +30229,7 @@ /area/civilian/pet_store) "bqG" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel, @@ -30057,6 +30294,7 @@ /area/bridge) "bqP" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/computer/secure_data, @@ -30186,6 +30424,7 @@ "brf" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -30309,6 +30548,7 @@ "brt" = ( /obj/machinery/hydroponics/constructable, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -30360,6 +30600,7 @@ /area/library) "brB" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/libraryscanner, @@ -30384,6 +30625,7 @@ "brE" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -30589,6 +30831,7 @@ /obj/machinery/fishtank/bowl, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -30618,6 +30861,7 @@ "bsm" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -30821,6 +31065,7 @@ "bsM" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -30837,6 +31082,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/vending/snack, @@ -30849,6 +31095,7 @@ /area/hallway/secondary/exit) "bsQ" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/wood, @@ -30913,6 +31160,7 @@ /area/crew_quarters/kitchen) "bsW" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -30924,6 +31172,7 @@ /obj/machinery/processor, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -30934,6 +31183,7 @@ /obj/machinery/hydroponics/constructable, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -30956,6 +31206,7 @@ /area/storage/tools) "bta" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/vending/cola, @@ -30983,6 +31234,7 @@ "btd" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -31539,7 +31791,7 @@ /area/chapel/main) "buC" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel, @@ -31616,6 +31868,7 @@ /obj/machinery/hydroponics/constructable, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -31699,6 +31952,7 @@ "buU" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -31767,6 +32021,7 @@ /area/security/vacantoffice) "bvc" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/wood, @@ -31847,6 +32102,7 @@ "bvm" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -32128,6 +32384,7 @@ /area/crew_quarters/locker) "bvU" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -32144,6 +32401,7 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -32367,6 +32625,7 @@ /obj/machinery/disposal, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/trunk{ @@ -32426,6 +32685,7 @@ /area/storage/tools) "bwA" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/rack{ @@ -32784,14 +33044,6 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "bxr" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -5; - pixel_y = -24 - }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32799,6 +33051,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -32816,6 +33073,7 @@ c_tag = "AI Upload Chamber" }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/bluegrid, @@ -32839,6 +33097,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -32941,6 +33203,7 @@ /area/crew_quarters/bar) "bxF" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/vending/dinnerware, @@ -33051,6 +33314,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -33141,6 +33405,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -33151,6 +33416,7 @@ /area/hallway/secondary/exit) "bxY" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -33274,6 +33540,7 @@ /area/security/vacantoffice) "byh" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/wood, @@ -33282,6 +33549,7 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -33426,6 +33694,7 @@ "byv" = ( /obj/machinery/hologram/holopad, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -33517,6 +33786,7 @@ /area/bridge/meeting_room) "byI" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/light{ @@ -33541,6 +33811,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/wood, @@ -33636,6 +33907,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/wood, @@ -33710,6 +33982,7 @@ /obj/machinery/light, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -33775,6 +34048,7 @@ /area/hallway/primary/starboard/west) "bzi" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -33801,7 +34075,8 @@ /area/hydroponics) "bzl" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -33842,6 +34117,7 @@ /area/library) "bzr" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel, @@ -34002,6 +34278,7 @@ /obj/item/storage/box, /obj/item/storage/box, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -34231,6 +34508,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -34267,6 +34545,7 @@ /area/hallway/primary/starboard/west) "bAp" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -34274,6 +34553,7 @@ /area/hallway/primary/starboard/west) "bAq" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -34621,6 +34901,7 @@ /area/quartermaster/storage) "bBk" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/cable{ @@ -34732,6 +35013,7 @@ "bBy" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/porta_turret{ @@ -34858,6 +35140,7 @@ /area/medical/reception) "bBN" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -34997,6 +35280,7 @@ "bCv" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -35066,6 +35350,7 @@ /area/crew_quarters/captain) "bCB" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/light/small, @@ -35093,6 +35378,7 @@ "bCF" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -35167,6 +35453,7 @@ "bCO" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -35265,6 +35552,7 @@ /area/hallway/primary/central/east) "bCZ" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel, @@ -35384,7 +35672,7 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/machinery/chem_dispenser, @@ -35456,6 +35744,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35787,6 +36076,7 @@ "bEm" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -36123,6 +36413,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -36192,6 +36483,7 @@ /area/quartermaster/storage) "bFr" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/cable{ @@ -36206,6 +36498,7 @@ /area/hallway/primary/starboard/east) "bFs" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/structure/cable{ @@ -36242,6 +36535,7 @@ /area/hallway/primary/starboard/east) "bFv" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/cable{ @@ -36284,6 +36578,7 @@ /area/quartermaster/office) "bFz" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/disposalpipe/segment{ @@ -36354,6 +36649,7 @@ "bFI" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -36478,6 +36774,7 @@ "bFW" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -36744,6 +37041,7 @@ /area/hallway/primary/central/south) "bGu" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/computer/rdconsole/robotics, @@ -36806,6 +37104,7 @@ "bGy" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/chem_heater, @@ -37387,6 +37686,7 @@ "bHJ" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -37403,6 +37703,7 @@ "bHL" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -37424,6 +37725,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/bluegrid, @@ -37596,6 +37898,7 @@ "bIf" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -37789,6 +38092,7 @@ /area/quartermaster/storage) "bIy" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -37820,6 +38124,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/telepad_cargo, @@ -37855,6 +38160,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -37967,6 +38273,7 @@ /obj/structure/table, /obj/machinery/cell_charger, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel, @@ -37976,6 +38283,7 @@ dir = 1 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -38126,6 +38434,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -38143,6 +38452,7 @@ /area/hallway/secondary/exit) "bJs" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38242,6 +38552,7 @@ dir = 8 }, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/door_control{ @@ -38309,6 +38620,7 @@ "bJE" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -38403,6 +38715,7 @@ req_access_txt = "20" }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/item/paper_bin/nanotrasen, @@ -38417,6 +38730,7 @@ /area/hallway/primary/central/sw) "bJP" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -38428,6 +38742,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -38450,6 +38765,7 @@ dir = 8 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -38589,6 +38905,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38698,6 +39015,7 @@ "bKo" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/r_n_d/destructive_analyzer, @@ -38714,6 +39032,7 @@ "bKq" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -38864,6 +39183,7 @@ "bKJ" = ( /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/wood, @@ -38877,6 +39197,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -39285,7 +39606,7 @@ /area/medical/reception) "bLC" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -39406,6 +39727,7 @@ /obj/machinery/reagentgrinder, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -39429,6 +39751,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -39487,9 +39810,11 @@ /obj/structure/table, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -39647,6 +39972,7 @@ "bMn" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -39662,6 +39988,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/hologram/holopad, @@ -39794,6 +40121,7 @@ "bMK" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40001,6 +40329,7 @@ }, /obj/item/storage/firstaid/regular, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -40106,6 +40435,7 @@ /area/assembly/robotics) "bNg" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/light{ @@ -40143,6 +40473,7 @@ "bNj" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/rack{ @@ -40284,6 +40615,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -40337,6 +40669,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -40369,6 +40702,7 @@ "bNB" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/camera{ @@ -40402,6 +40736,7 @@ "bND" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/chem_heater, @@ -40484,6 +40819,7 @@ icon_state = "2-4" }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -40499,6 +40835,7 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -40783,6 +41120,7 @@ /area/quartermaster/office) "bOq" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -40805,6 +41143,7 @@ "bOs" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40814,6 +41153,7 @@ /area/engine/gravitygenerator) "bOt" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/computer/supplycomp/public{ @@ -40888,6 +41228,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel, @@ -40913,6 +41254,7 @@ req_access_txt = "28" }, /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = -4; pixel_y = 36 }, @@ -41106,6 +41448,7 @@ /obj/item/storage/firstaid/toxin, /obj/structure/table, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -41153,7 +41496,7 @@ icon_state = "0-2" }, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/camera{ @@ -41209,6 +41552,7 @@ /obj/structure/closet/secure_closet/paramedic, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -41409,8 +41753,8 @@ /area/assembly/robotics) "bPz" = ( /obj/machinery/newscaster{ - pixel_x = -27; - pixel_y = 1 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -41439,6 +41783,7 @@ /obj/structure/cable, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/closet, @@ -41485,6 +41830,7 @@ /obj/machinery/light/small, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41601,6 +41947,7 @@ "bPX" = ( /obj/structure/closet/emcloset, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel, @@ -41805,6 +42152,7 @@ "bQq" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -41842,7 +42190,7 @@ }, /obj/machinery/hologram/holopad, /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -41873,6 +42221,7 @@ icon_state = "0-4" }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/structure/dresser, @@ -41886,6 +42235,7 @@ "bQw" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/item/storage/box/matches, @@ -42186,6 +42536,7 @@ "bQW" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -42384,8 +42735,8 @@ /obj/item/healthanalyzer, /obj/item/healthanalyzer, /obj/machinery/newscaster{ - pixel_x = 26; - pixel_y = 1 + name = "east bump"; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -42508,6 +42859,7 @@ "bRE" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/item/stack/cable_coil, @@ -42519,6 +42871,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/table/glass, @@ -42577,6 +42930,7 @@ "bRL" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -42585,6 +42939,7 @@ /obj/machinery/autolathe, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -42796,7 +43151,7 @@ icon_state = "0-8" }, /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/machinery/power/smes{ @@ -43019,6 +43374,7 @@ "bSC" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -43032,6 +43388,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -43189,6 +43546,7 @@ dir = 8 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -43233,7 +43591,7 @@ /area/hallway/primary/central/sw) "bSU" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -43385,6 +43743,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -43506,6 +43865,7 @@ /obj/item/bedsheet/captain, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -43606,6 +43966,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "custom placement"; pixel_x = -24; pixel_y = -8 }, @@ -43671,6 +44032,7 @@ "bTP" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -43692,12 +44054,14 @@ /area/medical/reception) "bTR" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, /area/teleporter) "bTS" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/closet/crate, @@ -43727,6 +44091,7 @@ c_tag = "Teleporter Room" }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -43751,6 +44116,7 @@ }, /obj/structure/disposalpipe/trunk, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -43777,6 +44143,7 @@ icon_state = "1-2" }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -43932,6 +44299,7 @@ /obj/structure/chair/office/dark, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -43981,6 +44349,7 @@ "bUy" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/power/terminal, @@ -44045,6 +44414,7 @@ /obj/structure/closet/secure_closet/captains, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -44069,6 +44439,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -44094,6 +44465,7 @@ c_tag = "Medbay Genetics" }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/vending/genedrobe, @@ -44134,6 +44506,7 @@ "bUN" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44281,6 +44654,7 @@ "bVd" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -44385,6 +44759,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/item/folder/yellow, @@ -44419,6 +44794,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -44435,6 +44811,7 @@ icon_state = "1-2" }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel, @@ -44470,6 +44847,7 @@ "bVB" = ( /obj/machinery/message_server, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/bluegrid, @@ -44605,6 +44983,7 @@ pixel_y = 32 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel, @@ -44627,6 +45006,7 @@ "bVR" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -44810,6 +45190,7 @@ "bWe" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/closet/secure_closet/roboticist, @@ -44896,6 +45277,7 @@ /area/medical/research) "bWo" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/vending/coffee, @@ -45178,6 +45560,7 @@ /obj/structure/table, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/storage/belt/utility, @@ -45391,6 +45774,7 @@ /area/medical/genetics) "bXt" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -45420,6 +45804,7 @@ /obj/item/storage/box/syringes, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -45517,6 +45902,7 @@ "bXF" = ( /obj/machinery/light_switch{ dir = 4; + name = "custom placement"; pixel_x = -21 }, /obj/machinery/sleeper{ @@ -45600,6 +45986,7 @@ "bXK" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/shower{ @@ -45717,6 +46104,7 @@ /obj/item/roller, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -45879,6 +46267,7 @@ /obj/item/reagent_containers/spray/cleaner, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -45964,6 +46353,7 @@ "bYx" = ( /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/conveyor/west{ @@ -46059,8 +46449,8 @@ pixel_y = -5 }, /obj/machinery/newscaster{ - pixel_x = -27; - pixel_y = 1 + name = "west bump"; + pixel_x = -32 }, /turf/simulated/floor/plasteel, /area/quartermaster/office) @@ -46192,7 +46582,7 @@ "bYT" = ( /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -46208,6 +46598,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/door_control{ @@ -46336,6 +46727,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -46365,6 +46757,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -46407,7 +46800,7 @@ /area/medical/sleeper) "bZn" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel, @@ -46507,6 +46900,7 @@ pixel_y = 5 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/computer/card/minor/cmo{ @@ -46558,6 +46952,7 @@ pixel_y = 26 }, /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = -10; pixel_y = 24 }, @@ -47047,6 +47442,7 @@ /area/medical/research) "cad" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -47068,6 +47464,7 @@ /area/medical/research) "cal" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -47338,6 +47735,7 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -47533,6 +47931,7 @@ "cbc" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -47554,6 +47953,7 @@ "cbe" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/bluegrid, @@ -47564,6 +47964,7 @@ "cbg" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/camera{ @@ -47587,6 +47988,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/closet/radiation, @@ -47600,6 +48002,7 @@ /obj/structure/closet/radiation, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light, @@ -47741,6 +48144,7 @@ /area/medical/medbay2) "cbv" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -47819,6 +48223,7 @@ dir = 1 }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -47883,7 +48288,7 @@ /area/medical/medbay2) "cbR" = ( /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/structure/disposalpipe/segment, @@ -47914,6 +48319,7 @@ "cbV" = ( /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -48156,6 +48562,7 @@ }, /obj/item/stack/medical/bruise_pack/advanced, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/reagent_containers/iv_bag/salglu, @@ -48187,6 +48594,7 @@ /area/hallway/primary/central/se) "cco" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel, @@ -48250,6 +48658,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -48280,6 +48689,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/bodyscanner, @@ -48296,10 +48706,12 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -48351,6 +48763,7 @@ /obj/machinery/light, /obj/item/reagent_containers/spray/cleaner, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -48521,6 +48934,7 @@ /area/maintenance/asmaint2) "ccN" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/closet/l3closet/janitor, @@ -48529,6 +48943,7 @@ "ccO" = ( /obj/structure/closet/jcloset, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel, @@ -48667,6 +49082,7 @@ /area/engine/gravitygenerator) "cdb" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/computer/message_monitor{ @@ -48764,6 +49180,7 @@ /area/medical/genetics) "cdk" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/structure/filingcabinet/chestdrawer, @@ -49011,6 +49428,7 @@ /area/hallway/primary/central/sw) "cdT" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel, @@ -49023,6 +49441,7 @@ /area/hallway/primary/central/sw) "cdV" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -49138,6 +49557,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -49178,6 +49598,7 @@ "cem" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/suit_storage_unit/cmo, @@ -49245,6 +49666,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel, @@ -49303,6 +49725,7 @@ /area/hallway/primary/central/south) "ceC" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -49324,6 +49747,7 @@ /area/quartermaster/storage) "ceF" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -49395,6 +49819,7 @@ "ceM" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -49423,6 +49848,7 @@ "ceP" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -49436,6 +49862,7 @@ "ceS" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -49499,6 +49926,7 @@ /area/quartermaster/qm) "cff" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/camera{ @@ -49513,6 +49941,7 @@ "cfg" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -49536,7 +49965,7 @@ icon_state = "4-8" }, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -49656,6 +50085,7 @@ /area/hallway/primary/central/sw) "cft" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -49725,6 +50155,7 @@ /area/medical/surgery1) "cfB" = ( /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/structure/disposalpipe/segment{ @@ -49742,6 +50173,7 @@ pixel_y = 6 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/item/stack/medical/bruise_pack/advanced, @@ -50123,6 +50555,7 @@ "cgf" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden, @@ -50458,6 +50891,7 @@ "cgX" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/reagent_dispensers/watertank, @@ -50696,6 +51130,7 @@ "chw" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -50716,6 +51151,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -50795,6 +51231,7 @@ "chE" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/photocopier, @@ -50804,7 +51241,7 @@ /area/medical/cmo) "chF" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/item/storage/box/gloves{ @@ -50826,6 +51263,7 @@ "chH" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -50856,6 +51294,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -50866,6 +51305,7 @@ "chM" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -51000,6 +51440,7 @@ "chU" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ @@ -51400,6 +51841,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -51631,6 +52073,7 @@ icon_state = "4-8" }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -51721,6 +52164,7 @@ /area/medical/medbreak) "cjw" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = -23; pixel_y = -5 }, @@ -51918,6 +52362,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel/dark/telecomms, @@ -51925,6 +52370,7 @@ "cjK" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -51962,6 +52408,7 @@ /obj/structure/cable, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -52029,6 +52476,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -52159,6 +52607,7 @@ "cko" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -52221,6 +52670,7 @@ "cku" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -52318,6 +52768,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/cell_charger, @@ -52489,6 +52940,7 @@ "ckW" = ( /obj/structure/closet/secure_closet/medical2, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -52505,6 +52957,7 @@ "ckY" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/power/apc{ @@ -52555,6 +53008,7 @@ /obj/machinery/bodyscanner, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -52575,12 +53029,15 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = 23; + dir = 8; + name = "custom placement"; + pixel_x = 24; pixel_y = -5 }, /obj/machinery/holosign_switch{ + dir = 8; id = "surgery2"; - pixel_x = 23; + pixel_x = 24; pixel_y = 4 }, /turf/simulated/floor/plasteel{ @@ -52594,6 +53051,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/light, @@ -52620,6 +53078,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/structure/disposalpipe/segment, @@ -52655,6 +53114,7 @@ /obj/machinery/washing_machine, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -52706,6 +53166,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -52723,6 +53184,7 @@ "clt" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/engine, @@ -52737,6 +53199,7 @@ /obj/structure/closet, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -52744,6 +53207,7 @@ "clw" = ( /obj/machinery/atmospherics/binary/valve, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /turf/simulated/floor/plasteel{ @@ -52852,7 +53316,8 @@ /area/hallway/primary/aft) "clP" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/vehicle/janicart, /turf/simulated/floor/plasteel, @@ -52896,7 +53361,7 @@ /area/toxins/explab_chamber) "clU" = ( /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -52906,6 +53371,7 @@ /area/toxins/explab_chamber) "clV" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/wood, @@ -52920,6 +53386,7 @@ "clX" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -52949,6 +53416,7 @@ "clZ" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -52998,6 +53466,7 @@ "cme" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/janitorialcart, @@ -53019,6 +53488,7 @@ /obj/structure/closet/secure_closet/ntrep, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -53436,7 +53906,7 @@ /area/toxins/storage) "cmW" = ( /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /obj/structure/reagent_dispensers/watertank, @@ -53471,6 +53941,7 @@ /area/toxins/mixing) "cmZ" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/portable_atmospherics/canister, @@ -53687,6 +54158,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -53815,6 +54287,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -53846,6 +54319,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -54114,6 +54588,7 @@ /area/ntrep) "cop" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -54169,6 +54644,7 @@ "cox" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -54185,6 +54661,7 @@ "coz" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -54210,6 +54687,7 @@ /area/toxins/storage) "coC" = ( /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -54260,6 +54738,7 @@ dir = 4 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/driver_button{ @@ -54329,6 +54808,7 @@ "coT" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -54508,6 +54988,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -54662,7 +55143,7 @@ /area/toxins/explab_chamber) "cpr" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -54766,6 +55247,7 @@ "cpA" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/sink{ @@ -54875,6 +55357,7 @@ /obj/structure/bed, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -54902,6 +55385,7 @@ /obj/item/pen/red, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -55264,6 +55748,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/cable{ @@ -55722,6 +56207,7 @@ "crj" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/cable{ @@ -55787,6 +56273,7 @@ /area/medical/research) "crp" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = -23; pixel_y = 24 }, @@ -55879,6 +56366,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -55942,6 +56430,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -56048,6 +56537,7 @@ "crP" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -56134,6 +56624,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -56160,10 +56651,12 @@ "crZ" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -56205,6 +56698,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -56320,6 +56814,10 @@ pixel_x = 32 }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, /turf/simulated/floor/plasteel, /area/toxins/launch{ name = "Toxins Launch Room" @@ -56388,6 +56886,7 @@ /obj/structure/closet/secure_closet/blueshield, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/wood, @@ -56493,7 +56992,7 @@ "csI" = ( /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/camera{ @@ -56540,6 +57039,7 @@ "csN" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/closet/firecloset, @@ -56551,6 +57051,7 @@ /area/engine/controlroom) "csO" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/structure/closet/firecloset, @@ -56609,6 +57110,7 @@ /obj/item/storage/box/monkeycubes/farwacubes, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -57149,20 +57651,6 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/toxins/launch{ - name = "Toxins Launch Room" - }) -"ctP" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Biohazard"; - name = "Biohazard Shutter"; - opacity = 0 - }, -/obj/item/radio/intercom, -/obj/effect/spawner/window/reinforced/plasma, -/turf/simulated/floor/plating, /area/toxins/launch{ name = "Toxins Launch Room" }) @@ -57263,7 +57751,7 @@ }, /obj/item/pen, /obj/item/radio/intercom{ - dir = 1; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -57292,7 +57780,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ - dir = 8; + name = "custom placement"; pixel_x = -28; pixel_y = -28 }, @@ -57313,6 +57801,7 @@ "cui" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/cable{ @@ -57402,6 +57891,7 @@ /obj/item/storage/box/syringes, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/light, @@ -57415,6 +57905,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/east, @@ -57424,7 +57915,7 @@ /area/medical/virology) "cur" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/structure/closet/l3closet, @@ -57509,6 +58000,7 @@ /area/medical/cmostore) "cuB" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -57587,6 +58079,7 @@ "cuJ" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/table, @@ -57717,6 +58210,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -57732,6 +58226,7 @@ "cuT" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/table, @@ -57892,6 +58387,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -57909,6 +58405,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -58044,6 +58541,7 @@ dir = 1 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plating, @@ -58070,6 +58568,7 @@ "cvD" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -58160,6 +58659,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/disposalpipe/trunk{ @@ -58242,6 +58742,7 @@ /area/medical/surgery1) "cvT" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -58497,6 +58998,7 @@ "cwr" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/table, @@ -58609,6 +59111,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ + name = "west bump"; pixel_x = -27 }, /turf/simulated/floor/plasteel{ @@ -58903,6 +59406,7 @@ /area/maintenance/aft) "cxo" = ( /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -58989,6 +59493,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -59002,6 +59507,7 @@ /obj/item/flashlight/lamp/green, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -59375,6 +59881,7 @@ }, /obj/structure/closet/emcloset, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -59664,6 +60171,7 @@ /obj/item/pen/multi, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/carpet, @@ -59726,6 +60234,7 @@ "cyU" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/light, @@ -59752,6 +60261,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -60043,6 +60553,7 @@ /area/hallway/primary/aft) "czB" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -60232,6 +60743,7 @@ "czW" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/sink{ @@ -60643,6 +61155,7 @@ "cAO" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -60859,6 +61372,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -60872,6 +61386,7 @@ "cBp" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -61054,6 +61569,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -61220,6 +61736,7 @@ "cCd" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/closet/bombcloset, @@ -61328,7 +61845,7 @@ "cCm" = ( /obj/machinery/chem_master, /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -61339,7 +61856,8 @@ "cCn" = ( /obj/machinery/chem_heater, /obj/machinery/newscaster{ - pixel_y = 34 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -61609,6 +62127,7 @@ "cCP" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -61777,6 +62296,7 @@ "cDc" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -61833,6 +62353,7 @@ /area/maintenance/asmaint) "cDi" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -61853,7 +62374,7 @@ c_tag = "Atmospherics North-East" }, /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /obj/machinery/atmospherics/binary/volume_pump/on{ @@ -61963,7 +62484,7 @@ "cDx" = ( /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -61992,6 +62513,7 @@ dir = 8 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ @@ -62007,6 +62529,7 @@ dir = 9 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -62155,6 +62678,7 @@ pixel_y = 5 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -62206,6 +62730,7 @@ "cDX" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/atmospherics/unary/portables_connector{ @@ -62221,6 +62746,7 @@ /area/storage/tech) "cDZ" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/binary/pump{ @@ -62238,6 +62764,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -62343,6 +62870,7 @@ "cEl" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -62724,6 +63252,7 @@ "cFv" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, @@ -62737,6 +63266,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -62894,6 +63424,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -63131,6 +63662,7 @@ /area/engine/break_room) "cGt" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /obj/machinery/computer/station_alert, @@ -63211,7 +63743,7 @@ pixel_y = 2 }, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -63326,6 +63858,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light{ @@ -63340,6 +63873,7 @@ /obj/item/camera, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -63369,6 +63903,7 @@ "cGV" = ( /obj/structure/closet/secure_closet/exile, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/decal/warning_stripes/white/hollow, @@ -63556,7 +64091,7 @@ pixel_y = -2 }, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -63655,6 +64190,7 @@ /obj/structure/closet/l3closet/scientist, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/light{ @@ -63875,6 +64411,7 @@ /area/engine/break_room) "cHY" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/computer/general_air_control{ @@ -64126,6 +64663,7 @@ /area/maintenance/aft) "cIA" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/cable{ @@ -64577,6 +65115,7 @@ /obj/item/paper/pamphlet, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/item/stack/tape_roll, @@ -64591,6 +65130,7 @@ "cJB" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/sm_monitor{ @@ -64706,6 +65246,7 @@ /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, @@ -64983,6 +65524,7 @@ tag_interior_door = "xeno_airlock_interior" }, /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = -6; pixel_y = 24 }, @@ -65038,6 +65580,7 @@ icon_state = "0-8" }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/power/apc{ @@ -65242,6 +65785,7 @@ }, /obj/machinery/light_switch{ dir = 4; + name = "custom placement"; pixel_x = -24; pixel_y = 7 }, @@ -65294,6 +65838,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -65305,7 +65850,8 @@ icon_state = "4-8" }, /obj/machinery/newscaster{ - pixel_y = 34 + name = "north bump"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -65453,6 +65999,7 @@ /area/assembly/assembly_line) "cLw" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/closet/secure_closet/atmos_personal, @@ -65487,6 +66034,7 @@ /area/assembly/assembly_line) "cLB" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -65530,6 +66078,7 @@ /obj/structure/closet/crate, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -65547,6 +66096,7 @@ "cLK" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -65773,6 +66323,7 @@ icon_state = "2-4" }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/disposalpipe/segment{ @@ -66002,6 +66553,7 @@ /area/toxins/xenobiology) "cMK" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -66063,6 +66615,7 @@ "cMR" = ( /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -66549,6 +67102,7 @@ "cNX" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -66597,6 +67151,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/item/storage/toolbox/mechanical, @@ -66653,6 +67208,7 @@ /area/atmos) "cOl" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/vending/cigarette, @@ -66755,7 +67311,7 @@ icon_state = "1-4" }, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/engine, @@ -66811,6 +67367,7 @@ "cOE" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow/partial{ @@ -66977,6 +67534,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/structure/sink{ @@ -66985,7 +67543,7 @@ pixel_y = 2 }, /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel, @@ -67174,6 +67732,7 @@ "cPq" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/machinery/vending/engidrobe, @@ -67211,7 +67770,7 @@ pixel_y = -22 }, /obj/item/radio/intercom{ - dir = 1; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -67225,7 +67784,7 @@ "cPv" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, @@ -67256,6 +67815,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/clipboard, @@ -67266,6 +67826,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/clothing/mask/gas, @@ -67404,6 +67965,7 @@ }, /obj/structure/engineeringcart, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel, @@ -67507,6 +68069,7 @@ name = "Waste Loop" }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/manifold/visible/purple{ @@ -67516,6 +68079,7 @@ /area/atmos/distribution) "cQg" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ @@ -67536,6 +68100,7 @@ dir = 10 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -67801,6 +68366,7 @@ req_access_txt = "11" }, /obj/machinery/light_switch{ + name = "custom placement"; pixel_y = 38 }, /obj/machinery/door_control{ @@ -67886,6 +68452,7 @@ "cQR" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/table, @@ -68408,6 +68975,7 @@ /obj/item/storage/belt/utility, /obj/item/multitool, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/decal/warning_stripes/white/hollow, @@ -68486,6 +69054,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/stack/rods{ @@ -68926,6 +69495,7 @@ /obj/structure/statue/chickenstatue, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/carpet, @@ -69007,7 +69577,8 @@ /area/assembly/assembly_line) "cTf" = ( /obj/machinery/newscaster{ - pixel_y = 30 + name = "north bump"; + pixel_y = 32 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -69036,6 +69607,7 @@ /area/atmos) "cTi" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -69051,7 +69623,7 @@ /area/atmos) "cTl" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/portable_atmospherics/canister/air, @@ -69385,9 +69957,11 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /obj/effect/decal/cleanable/cobweb, @@ -69575,6 +70149,7 @@ /area/engine/engineering) "cUk" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/table, @@ -69885,6 +70460,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -69894,6 +70470,7 @@ "cVh" = ( /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/security/engineering{ @@ -70379,6 +70956,7 @@ /area/maintenance/aft) "cWr" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -70445,6 +71023,7 @@ /area/engine/engineering) "cWz" = ( /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/structure/cable{ @@ -70616,6 +71195,7 @@ dir = 6 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -70699,7 +71279,8 @@ "cXf" = ( /obj/machinery/light, /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel, /area/hallway/primary/starboard/east) @@ -70761,6 +71342,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -70916,6 +71498,7 @@ dir = 4 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/machinery/disposal, @@ -70924,6 +71507,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -70954,6 +71538,7 @@ "cXL" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/structure/closet/secure_closet/engineering_electrical, @@ -71316,6 +71901,7 @@ "cYH" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -71347,6 +71933,7 @@ /obj/structure/closet/l3closet/scientist, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light, @@ -71508,6 +72095,7 @@ /area/atmos) "cZj" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/cable{ @@ -71858,6 +72446,7 @@ icon_state = "4-8" }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel, @@ -71957,13 +72546,15 @@ /area/engine/engineering) "dam" = ( /obj/machinery/newscaster{ - pixel_y = -30 + name = "south bump"; + pixel_y = -32 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dan" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel, @@ -72108,6 +72699,7 @@ /obj/structure/table, /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/item/storage/firstaid/o2{ @@ -72157,6 +72749,7 @@ }, /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/stack/sheet/mineral/plasma{ @@ -72537,6 +73130,7 @@ }, /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/white/hollow, @@ -72804,6 +73398,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -73094,6 +73689,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/item/storage/toolbox/emergency, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, @@ -73103,6 +73699,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/item/extinguisher, /obj/structure/extinguisher_cabinet{ + name = "south bump"; pixel_y = -30 }, /obj/machinery/light/small, @@ -73646,6 +74243,7 @@ }, /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, @@ -74064,6 +74662,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/east, @@ -74136,6 +74735,7 @@ /area/atmos) "dfA" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/transit_tube{ @@ -74152,7 +74752,7 @@ /area/atmos) "dfC" = ( /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -74262,6 +74862,7 @@ "dfQ" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -74464,6 +75065,7 @@ /area/engine/engineering) "dgH" = ( /obj/machinery/newscaster{ + name = "south bump"; pixel_y = -32 }, /obj/structure/table/wood, @@ -74493,7 +75095,7 @@ /area/engine/engineering) "dgM" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -74626,6 +75228,7 @@ "dhp" = ( /obj/machinery/light_switch{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/table/wood, @@ -74638,6 +75241,7 @@ "dhq" = ( /obj/machinery/light, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/structure/chair/wood{ @@ -74850,6 +75454,7 @@ /area/atmos) "dhK" = ( /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -74871,6 +75476,7 @@ "dhN" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -75113,6 +75719,7 @@ c_tag = "Central Hallway North" }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -75123,6 +75730,7 @@ "dix" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/light{ @@ -75191,6 +75799,7 @@ /obj/item/screwdriver, /obj/item/radio, /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -75218,6 +75827,7 @@ /area/turret_protected/aisat_interior) "diG" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -75388,6 +75998,7 @@ /area/crew_quarters/dorms) "djh" = ( /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/table/reinforced, @@ -75404,6 +76015,7 @@ /area/crew_quarters/bar) "dji" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/camera{ @@ -75539,6 +76151,7 @@ dir = 8 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/camera{ @@ -75554,6 +76167,7 @@ "djx" = ( /obj/machinery/hydroponics/soil, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/grass, @@ -75775,6 +76389,7 @@ c_tag = "Central Hallway North-West" }, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -75829,6 +76444,7 @@ /area/turret_protected/aisat_interior) "dkd" = ( /obj/machinery/light_switch{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -75841,7 +76457,7 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -75930,6 +76546,7 @@ /area/atmos) "dkl" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/machinery/door/firedoor, @@ -76072,6 +76689,7 @@ /area/engine/engineering) "dkD" = ( /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel, @@ -76124,7 +76742,7 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/computer/cryopod/robot{ @@ -76214,6 +76832,7 @@ "dkR" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -77161,6 +77780,7 @@ "dmS" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/camera/motion{ @@ -77310,6 +77930,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -77782,6 +78403,7 @@ pixel_x = 11 }, /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -77803,7 +78425,7 @@ "dob" = ( /obj/machinery/light/small, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -77860,7 +78482,7 @@ /area/solar/starboard) "doi" = ( /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /obj/machinery/light{ @@ -77875,6 +78497,7 @@ "doj" = ( /obj/machinery/light_switch{ dir = 8; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -78011,6 +78634,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/item/camera, @@ -78045,6 +78669,7 @@ /area/turret_protected/aisat_interior) "doI" = ( /obj/item/radio/intercom{ + name = "north bump"; pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -78084,6 +78709,7 @@ "doN" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/computer/station_alert{ @@ -78163,6 +78789,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -78215,7 +78842,7 @@ "dpw" = ( /obj/machinery/light/small, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -78242,6 +78869,7 @@ "dpC" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /obj/machinery/portable_atmospherics/canister/air, @@ -78267,6 +78895,7 @@ }) "dpF" = ( /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /obj/structure/cable{ @@ -78284,6 +78913,7 @@ "dpK" = ( /obj/machinery/cryopod/robot, /obj/structure/extinguisher_cabinet{ + name = "north bump"; pixel_y = 30 }, /turf/simulated/floor/plating, @@ -78293,6 +78923,7 @@ "dpL" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/structure/table, @@ -78316,6 +78947,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/machinery/space_heater, @@ -78355,6 +78987,7 @@ }, /obj/machinery/alarm{ dir = 8; + name = "east bump"; pixel_x = 24 }, /obj/structure/rack, @@ -78530,6 +79163,7 @@ "dqT" = ( /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/bluegrid, @@ -78576,6 +79210,7 @@ /area/turret_protected/ai) "drq" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/chair{ @@ -78609,6 +79244,7 @@ /area/turret_protected/ai) "drA" = ( /obj/structure/extinguisher_cabinet{ + name = "east bump"; pixel_x = 27 }, /obj/structure/chair/office/dark, @@ -78741,6 +79377,7 @@ pixel_y = -28 }, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /obj/effect/landmark{ @@ -78760,7 +79397,7 @@ pixel_y = -10 }, /obj/item/radio/intercom{ - dir = 1; + name = "south bump"; pixel_y = -28 }, /obj/machinery/requests_console{ @@ -78785,6 +79422,7 @@ pixel_y = -28 }, /obj/item/radio/intercom{ + name = "east bump"; pixel_x = 28 }, /obj/effect/landmark{ @@ -78860,6 +79498,7 @@ "dsh" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/hologram/holopad, @@ -78871,6 +79510,7 @@ "dsi" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -78913,6 +79553,7 @@ "dsx" = ( /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -78981,7 +79622,7 @@ dir = 1 }, /obj/item/radio/intercom{ - dir = 1; + name = "north bump"; pixel_y = 28 }, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -79120,6 +79761,7 @@ "dtq" = ( /obj/machinery/alarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/structure/table, @@ -79148,6 +79790,7 @@ layer = 2.9 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/structure/reagent_dispensers/fueltank, @@ -79163,6 +79806,7 @@ /obj/machinery/space_heater, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -79192,6 +79836,7 @@ }, /obj/machinery/firealarm{ dir = 4; + name = "east bump"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/west, @@ -79502,6 +80147,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel, @@ -79609,6 +80255,7 @@ "fRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel, @@ -80343,6 +80990,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/west, @@ -80473,6 +81121,7 @@ "lLC" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/partial{ @@ -81222,6 +81871,7 @@ dir = 10 }, /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/bluegrid, @@ -81337,6 +81987,7 @@ /area/engine/supermatter) "sPb" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -81650,6 +82301,7 @@ dir = 1 }, /obj/item/radio/intercom{ + name = "south bump"; pixel_y = -28 }, /obj/machinery/light/small, @@ -81729,6 +82381,7 @@ "wnU" = ( /obj/machinery/alarm{ dir = 4; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -81796,6 +82449,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel, @@ -134511,7 +135165,7 @@ cgE coG cqx csq -ctP +csr doF cgE aaa diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 663412bae69..8adaa95d1fc 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -161,6 +161,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ dir = 1; + name = "custom placement"; pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -219,6 +220,7 @@ "aI" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /obj/machinery/suit_storage_unit/lavaland, @@ -238,6 +240,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/machinery/alarm{ dir = 4; + name = "custom placement"; pixel_x = -23 }, /turf/simulated/floor/plasteel{ @@ -539,6 +542,7 @@ /area/mine/eva) "bw" = ( /obj/machinery/alarm{ + name = "custom placement"; pixel_y = 23 }, /obj/machinery/computer/shuttle/mining{ @@ -554,6 +558,7 @@ dir = 4 }, /obj/machinery/light_switch{ + name = "custom placement"; pixel_y = -25 }, /turf/simulated/floor/plasteel, @@ -619,6 +624,7 @@ }, /obj/machinery/alarm{ dir = 4; + name = "custom placement"; pixel_x = -23 }, /obj/machinery/light{ @@ -657,6 +663,7 @@ /area/mine/eva) "bG" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_x = 27 }, /obj/effect/baseturf_helper/lava_land/surface, @@ -819,6 +826,7 @@ /area/mine/eva) "bW" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, @@ -850,6 +858,7 @@ "bZ" = ( /obj/machinery/alarm{ dir = 4; + name = "custom placement"; pixel_x = -23 }, /obj/effect/decal/cleanable/cobweb, @@ -875,6 +884,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -883,6 +893,7 @@ /area/mine/laborcamp/security) "cb" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_y = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1130,8 +1141,7 @@ /area/mine/laborcamp) "cD" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -1148,6 +1158,7 @@ /area/mine/production) "cF" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1220,6 +1231,7 @@ dir = 1 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /obj/effect/turf_decal/loading_area{ @@ -1230,6 +1242,7 @@ "cP" = ( /obj/structure/closet/crate, /obj/machinery/alarm{ + name = "custom placement"; pixel_y = 23 }, /obj/effect/turf_decal/bot, @@ -1308,6 +1321,7 @@ dir = 8 }, /obj/machinery/alarm{ + name = "custom placement"; pixel_y = 23 }, /obj/machinery/iv_drip, @@ -1325,6 +1339,7 @@ /area/mine/living_quarters) "dd" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, @@ -1344,6 +1359,7 @@ pixel_y = 3 }, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel/white{ @@ -1353,6 +1369,7 @@ /area/mine/living_quarters) "dg" = ( /obj/machinery/alarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/bluegrid, @@ -1459,6 +1476,7 @@ }, /obj/machinery/firealarm{ dir = 8; + name = "west bump"; pixel_x = -24 }, /turf/simulated/floor/plasteel{ @@ -1471,6 +1489,7 @@ dir = 4 }, /obj/machinery/newscaster{ + name = "custom placement"; pixel_x = 30; pixel_y = 1 }, @@ -1493,6 +1512,7 @@ /area/mine/production) "dx" = ( /obj/machinery/light_switch{ + name = "custom placement"; pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1525,8 +1545,7 @@ network = list("Mining Outpost") }, /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "east bump"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -1803,6 +1822,7 @@ /area/mine/living_quarters) "eh" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, @@ -2214,6 +2234,7 @@ "fb" = ( /obj/machinery/alarm{ dir = 1; + name = "custom placement"; pixel_y = -22 }, /obj/machinery/recharge_station, @@ -2223,6 +2244,7 @@ /area/mine/production) "fc" = ( /obj/machinery/alarm{ + name = "custom placement"; pixel_y = 23 }, /turf/simulated/floor/plasteel, @@ -2239,6 +2261,7 @@ /obj/structure/bed, /obj/item/bedsheet/brown, /obj/machinery/alarm{ + name = "custom placement"; pixel_y = 23 }, /turf/simulated/floor/carpet, @@ -2333,6 +2356,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -5; pixel_y = 30 }, @@ -2350,6 +2374,7 @@ /area/mine/living_quarters) "fu" = ( /obj/machinery/alarm{ + name = "custom placement"; pixel_y = 23 }, /obj/machinery/hologram/holopad, @@ -2366,6 +2391,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ + name = "north bump"; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -2415,6 +2441,7 @@ "fC" = ( /obj/machinery/vending/cigarette, /obj/machinery/newscaster{ + name = "north bump"; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -2438,8 +2465,7 @@ /area/mine/living_quarters) "fF" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "east bump"; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2678,8 +2704,7 @@ /area/mine/living_quarters) "gh" = ( /obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; + name = "west bump"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -2728,6 +2753,7 @@ "gl" = ( /obj/machinery/alarm{ dir = 1; + name = "custom placement"; pixel_y = -22 }, /turf/simulated/floor/plasteel{ @@ -2737,6 +2763,7 @@ "gm" = ( /obj/machinery/firealarm{ dir = 1; + name = "south bump"; pixel_y = -24 }, /turf/simulated/floor/plasteel{ @@ -3030,6 +3057,7 @@ }, /obj/machinery/alarm{ dir = 1; + name = "custom placement"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4920,6 +4948,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; + name = "custom placement"; pixel_x = -22 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 815dfb1d32c..96398f9da41 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -3040,7 +3040,9 @@ }, /area/centcom/control) "md" = ( -/obj/structure/extinguisher_cabinet, +/obj/structure/extinguisher_cabinet{ + name = "custom placement" + }, /turf/simulated/wall/indestructible/riveted, /area/centcom/gamma) "me" = ( @@ -4238,6 +4240,7 @@ "pW" = ( /obj/machinery/newscaster{ layer = 3.3; + name = "custom placement"; pixel_y = -27 }, /turf/simulated/floor/plasteel/dark, @@ -8230,7 +8233,9 @@ /turf/space, /area/admin) "Dx" = ( -/obj/structure/extinguisher_cabinet, +/obj/structure/extinguisher_cabinet{ + name = "custom placement" + }, /turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "Dy" = ( @@ -8324,6 +8329,7 @@ /area/syndicate_mothership/jail) "Ea" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 28 }, /obj/machinery/light/small{ @@ -8430,7 +8436,7 @@ /area/shuttle/syndicate_elite) "EM" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/machinery/recharge_station, @@ -9140,8 +9146,7 @@ /area/shuttle/administration) "Jb" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; + name = "custom placement"; pixel_x = 29; pixel_y = -60 }, @@ -9294,7 +9299,7 @@ /area/syndicate_mothership/jail) "KF" = ( /obj/item/radio/intercom{ - dir = 8; + name = "west bump"; pixel_x = -28 }, /obj/structure/chair/comfy/shuttle{ @@ -9583,6 +9588,7 @@ "My" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -9937,6 +9943,7 @@ /area/shuttle/supply) "Pg" = ( /obj/structure/extinguisher_cabinet{ + name = "custom placement"; pixel_x = -28 }, /obj/machinery/recharge_station, @@ -10051,8 +10058,7 @@ /area/shuttle/syndicate_sit) "PX" = ( /obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; + name = "custom placement"; pixel_x = 29; pixel_y = -30 }, diff --git a/tools/mapmerge2/map_scripts/dirbump_part1.txt b/tools/mapmerge2/map_scripts/dirbump_part1.txt new file mode 100644 index 00000000000..d6a31df92a1 --- /dev/null +++ b/tools/mapmerge2/map_scripts/dirbump_part1.txt @@ -0,0 +1,6 @@ +/obj/machinery/firealarm : /obj/machinery/firealarm {@OLD;name="custom placement"} +/obj/structure/extinguisher_cabinet : /obj/structure/extinguisher_cabinet {@OLD;name="custom placement"} +/obj/item/radio/intercom : /obj/item/radio/intercom {@OLD;name="custom placement";dir=2} +/obj/machinery/light_switch : /obj/machinery/light_switch {@OLD;name="custom placement"} +/obj/machinery/alarm : /obj/machinery/alarm {@OLD;name="custom placement"} +/obj/machinery/newscaster : /obj/machinery/newscaster {@OLD;name="custom placement"} diff --git a/tools/mapmerge2/map_scripts/dirbump_part2.txt b/tools/mapmerge2/map_scripts/dirbump_part2.txt new file mode 100644 index 00000000000..c026b696721 --- /dev/null +++ b/tools/mapmerge2/map_scripts/dirbump_part2.txt @@ -0,0 +1,24 @@ +/obj/machinery/firealarm {pixel_x=24; pixel_y=@UNSET} : /obj/machinery/firealarm {@OLD;name="east bump"} +/obj/machinery/firealarm {pixel_x=-24; pixel_y=@UNSET} : /obj/machinery/firealarm {@OLD;name="west bump"} +/obj/machinery/firealarm {pixel_y=24; pixel_x=@UNSET} : /obj/machinery/firealarm {@OLD;name="north bump"} +/obj/machinery/firealarm {pixel_y=-24; pixel_x=@UNSET} : /obj/machinery/firealarm {@OLD;name="south bump"} +/obj/structure/extinguisher_cabinet {pixel_x=27; pixel_y=@UNSET} : /obj/structure/extinguisher_cabinet {@OLD;name="east bump"} +/obj/structure/extinguisher_cabinet {pixel_x=-27; pixel_y=@UNSET} : /obj/structure/extinguisher_cabinet {@OLD;name="west bump"} +/obj/structure/extinguisher_cabinet {pixel_y=30; pixel_x=@UNSET} : /obj/structure/extinguisher_cabinet {@OLD;name="north bump"} +/obj/structure/extinguisher_cabinet {pixel_y=-30; pixel_x=@UNSET} : /obj/structure/extinguisher_cabinet {@OLD;name="south bump"} +/obj/item/radio/intercom {pixel_x=28; pixel_y=@UNSET} : /obj/item/radio/intercom {@OLD;name="east bump"} +/obj/item/radio/intercom {pixel_x=-28; pixel_y=@UNSET} : /obj/item/radio/intercom {@OLD;name="west bump"} +/obj/item/radio/intercom {pixel_y=28; pixel_x=@UNSET} : /obj/item/radio/intercom {@OLD;name="north bump"} +/obj/item/radio/intercom {pixel_y=-28; pixel_x=@UNSET} : /obj/item/radio/intercom {@OLD;name="south bump"} +/obj/machinery/light_switch {pixel_x=24; pixel_y=@UNSET} : /obj/machinery/light_switch {@OLD;name="east bump"} +/obj/machinery/light_switch {pixel_x=-24; pixel_y=@UNSET} : /obj/machinery/light_switch {@OLD;name="west bump"} +/obj/machinery/light_switch {pixel_y=24; pixel_x=@UNSET} : /obj/machinery/light_switch {@OLD;name="north bump"} +/obj/machinery/light_switch {pixel_y=-24; pixel_x=@UNSET} : /obj/machinery/light_switch {@OLD;name="south bump"} +/obj/machinery/alarm {pixel_x=24; pixel_y=@UNSET} : /obj/machinery/alarm {@OLD;name="east bump"} +/obj/machinery/alarm {pixel_x=-24; pixel_y=@UNSET} : /obj/machinery/alarm {@OLD;name="west bump"} +/obj/machinery/alarm {pixel_y=24; pixel_x=@UNSET} : /obj/machinery/alarm {@OLD;name="north bump"} +/obj/machinery/alarm {pixel_y=-24; pixel_x=@UNSET} : /obj/machinery/alarm {@OLD;name="south bump"} +/obj/machinery/newscaster {pixel_x=32; pixel_y=@UNSET} : /obj/machinery/newscaster {@OLD;name="east bump"} +/obj/machinery/newscaster {pixel_x=-32; pixel_y=@UNSET} : /obj/machinery/newscaster {@OLD;name="west bump"} +/obj/machinery/newscaster {pixel_y=32; pixel_x=@UNSET} : /obj/machinery/newscaster {@OLD;name="north bump"} +/obj/machinery/newscaster {pixel_y=-32; pixel_x=@UNSET} : /obj/machinery/newscaster {@OLD;name="south bump"} \ No newline at end of file