diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm index c50849317ca6..4f68f3035fe6 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm @@ -796,9 +796,7 @@ pixel_x = -3; pixel_y = 6 }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm index 9ca44c2c6c02..6894f69abde8 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm @@ -815,10 +815,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index 771742ec58d3..d068c1d38ffe 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -104,10 +104,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) "kx" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "kE" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index a06437ae9862..dea5f39dc337 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -7924,9 +7924,7 @@ /obj/structure/rack, /obj/item/gun/projectile/revolver/doublebarrel, /obj/machinery/light/small, -/obj/machinery/newscaster{ - pixel_y = -30 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "black" }, @@ -9069,9 +9067,7 @@ /area/ruin/space/moonbase19) "JP" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/newscaster{ - pixel_y = 30 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "JQ" = ( @@ -9666,9 +9662,7 @@ /area/ruin/space/moonbase19) "MF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - pixel_y = -30 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/camera{ c_tag = "Hangar"; dir = 1; @@ -12275,9 +12269,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = -30 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkfull"; dir = 8 diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index ade058bffee5..afa2641c1ef1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1380,11 +1380,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/structure/window/reinforced, -/obj/machinery/newscaster{ - desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station."; - layer = 3.3; - name = "custom placement"; - pixel_x = 27 +/obj/machinery/newscaster/directional/east{ + desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station." }, /turf/simulated/floor/plasteel{ dir = 6; @@ -1788,11 +1785,8 @@ /turf/simulated/floor/wood, /area/ruin/space/derelict/crew_quarters) "eH" = ( -/obj/machinery/newscaster{ - desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station."; - layer = 3.3; - name = "custom placement"; - pixel_x = 30 +/obj/machinery/newscaster/directional/east{ + desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station." }, /obj/item/trash/spentcasing/bullet/medium, /turf/simulated/floor/wood, @@ -5621,11 +5615,8 @@ /obj/item/newspaper{ desc = "An issue of The Griffon. Was Nanotrasen supplying this station at some point?" }, -/obj/machinery/newscaster{ - desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station."; - layer = 3.3; - name = "custom placement"; - pixel_x = 27 +/obj/machinery/newscaster/directional/east{ + desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station." }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -6141,11 +6132,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station."; - layer = 3.3; - name = "custom placement"; - pixel_x = 27 +/obj/machinery/newscaster/directional/east{ + desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station." }, /turf/simulated/floor/plasteel{ dir = 5; diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 4c7275e2dfcb..f5f407d79ccf 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -154,11 +154,7 @@ /area/mine/laborcamp) "aI" = ( /obj/structure/chair/sofa/bench/left, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -359,10 +355,7 @@ /turf/simulated/floor/catwalk, /area/mine/outpost/engineering) "bv" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/requests_console/directional/east, /obj/structure/closet/secure_closet/quartermaster/lavaland, /turf/simulated/floor/carpet, @@ -3706,10 +3699,7 @@ }, /area/mine/outpost/hallway/west) "lZ" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding"; dir = 1 @@ -5101,11 +5091,7 @@ /turf/simulated/floor/wood, /area/mine/laborcamp) "tt" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowsiding" @@ -5656,11 +5642,7 @@ /turf/simulated/mineral/volcanic/lava_land_surface, /area/mine/outpost/hallway/east) "wP" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -5677,11 +5659,7 @@ /area/lavaland/surface/outdoors/targetable) "xg" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -8227,10 +8205,7 @@ }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index d2455ad3c2b4..41ef9d6a4b42 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -4402,11 +4402,7 @@ pixel_x = -8 }, /obj/item/kitchen/knife, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, @@ -4874,11 +4870,7 @@ /obj/structure/table/wood, /obj/item/reagent_containers/drinks/shaker, /obj/item/reagent_containers/glass/rag, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -8083,10 +8075,7 @@ "CG" = ( /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -9250,10 +9239,7 @@ /obj/item/folder/blue, /obj/item/melee/chainofcommand, /obj/item/stamp/captain, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "GT" = ( @@ -10796,11 +10782,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -11871,11 +11853,7 @@ /obj/machinery/computer/emergency_shuttle{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -12862,11 +12840,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -13187,11 +13161,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /obj/item/storage/lockbox/medal/cc, /turf/simulated/floor/carpet, /area/centcom/specops) @@ -14529,10 +14499,7 @@ /obj/item/clothing/mask/cigarette/cigar{ pixel_x = 4.5 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index d7cfc5c66991..d1c3d5b0ea70 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -2533,10 +2533,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3886,11 +3883,7 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel, /area/station/security/processing) "apd" = ( @@ -5245,11 +5238,7 @@ /area/station/maintenance/fore) "atx" = ( /obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -6299,11 +6288,7 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "axu" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -8889,11 +8874,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/machinery/requests_console/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -10013,11 +9994,7 @@ }, /area/station/security/detective) "aJo" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -12147,10 +12124,7 @@ }, /area/station/public/dorms) "aQG" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/light{ dir = 1 }, @@ -13467,10 +13441,7 @@ }, /area/station/medical/reception) "aUP" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/window/reinforced{ dir = 8 }, @@ -14175,10 +14146,7 @@ /area/station/medical/reception) "aWS" = ( /obj/machinery/economy/vending/chinese, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -14842,11 +14810,7 @@ pixel_y = -28 }, /obj/machinery/hologram/holopad, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -16139,11 +16103,7 @@ /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/storage/firstaid/regular, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bdh" = ( @@ -16572,11 +16532,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "bep" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "beq" = ( @@ -16844,11 +16800,7 @@ dir = 4 }, /obj/machinery/light, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17047,10 +16999,7 @@ }, /area/station/service/hydroponics) "bfM" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/table, /obj/item/paper_bin{ pixel_x = -3; @@ -17518,11 +17467,7 @@ /obj/item/clothing/suit/soldiercoat, /obj/item/clothing/under/costume/soldieruniform, /obj/item/clothing/head/stalhelm, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/service/clown) "bhk" = ( @@ -17976,11 +17921,7 @@ }, /area/station/hallway/secondary/entry/lounge) "biw" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -19685,10 +19626,7 @@ /obj/machinery/camera{ c_tag = "Bar East" }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/item/kirbyplants, /turf/simulated/floor/wood, /area/station/service/bar) @@ -20111,11 +20049,7 @@ }, /area/station/service/hydroponics) "bov" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -20667,10 +20601,7 @@ }, /area/station/science/hallway) "bqc" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/service/library) "bqd" = ( @@ -21884,11 +21815,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/public/locker) "btU" = ( @@ -25569,10 +25496,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "bIV" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -25980,11 +25904,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "packageExternal" }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "bKE" = ( @@ -27268,11 +27188,7 @@ }, /area/station/medical/reception) "bPH" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/closet/secure_closet/explorer, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -28850,11 +28766,7 @@ /area/station/science/robotics) "bWl" = ( /obj/structure/closet/secure_closet/roboticist, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -29238,11 +29150,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkblue" @@ -29448,11 +29356,7 @@ pixel_x = 6; pixel_y = -5 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/office) "bYH" = ( @@ -30439,10 +30343,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "cco" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "ccq" = ( @@ -30766,11 +30667,7 @@ /area/station/science/hallway) "cdQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -30784,10 +30681,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "cdT" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "cdU" = ( @@ -31768,11 +31662,7 @@ /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/medical/psych) "chK" = ( @@ -32429,11 +32319,7 @@ dir = 1 }, /obj/machinery/requests_console/directional/north, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/smartfridge/secure/chemistry/virology/preloaded, /turf/simulated/floor/plasteel{ dir = 9; @@ -36647,11 +36533,7 @@ "cAD" = ( /obj/structure/table/glass, /obj/item/storage/box/syringes, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/book/manual/wiki/sop_science, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" @@ -38121,10 +38003,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "cGi" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 1; @@ -38182,10 +38061,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cGt" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/computer/station_alert, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -41796,11 +41672,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /obj/item/storage/box/lights/mixed, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/crowbar/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -42372,11 +42244,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cWq" = ( @@ -42657,11 +42525,7 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cXx" = ( @@ -43094,11 +42958,7 @@ }, /area/station/science/rnd) "cZn" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -45071,11 +44931,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/public/mrchangs) "dhv" = ( @@ -47653,11 +47509,7 @@ pixel_y = -28 }, /obj/effect/landmark/start/ai, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "drV" = ( @@ -49998,11 +49850,7 @@ /obj/structure/table/wood, /obj/item/reagent_containers/spray/waterflower, /obj/machinery/firealarm/directional/east, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -50301,10 +50149,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "eyV" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/table, /obj/item/paper_bin{ pixel_y = 4; @@ -50791,11 +50636,7 @@ dir = 8; network = list("Research","SS13") }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/window/reinforced, /obj/structure/table, /obj/item/reagent_containers/dropper, @@ -51437,11 +51278,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "fdo" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "west bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -52910,11 +52747,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "fNQ" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -53314,10 +53147,7 @@ name = "east bump"; pixel_x = 24 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /obj/item/toy/figure/crew/hop{ layer = 4; pixel_x = -4; @@ -54247,10 +54077,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/door_control{ id = "toilet_unit1"; name = "Door Bolt Control"; @@ -54610,10 +54437,7 @@ /area/station/medical/reception) "gJj" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "gJl" = ( @@ -55875,11 +55699,7 @@ pixel_y = 2 }, /obj/structure/table/glass, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -56010,11 +55830,7 @@ dir = 4; color = "#85130b" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/security/permabrig) "htV" = ( @@ -56637,10 +56453,7 @@ /obj/item/restraints/handcuffs/cable/cyan, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/item/storage/pill_bottle/random_drug_bottle{ pixel_x = -12 }, @@ -58031,10 +57844,7 @@ name = "Distribution Loop" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "iyP" = ( @@ -58331,11 +58141,7 @@ "iHi" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -60171,11 +59977,7 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/shelf/service, /turf/simulated/floor/plasteel, /area/station/service/janitor) @@ -60729,10 +60531,7 @@ "jVf" = ( /obj/vehicle/secway, /obj/item/key/security, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -61104,11 +60903,7 @@ icon_state = "2-8" }, /obj/machinery/hologram/holopad, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/cable{ icon_state = "1-8" }, @@ -64031,10 +63826,7 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) "lFV" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/chair/comfy/black{ dir = 4 }, @@ -66728,11 +66520,7 @@ }, /area/station/medical/medbay2) "mZU" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/machinery/computer/secure_data{ dir = 4 }, @@ -66771,11 +66559,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/aft) "nbE" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/light_switch{ dir = 1; name = "south bump"; @@ -68810,10 +68594,7 @@ /turf/simulated/floor/wood, /area/station/security/permabrig) "ois" = ( -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel, /area/station/security/main) "oiA" = ( @@ -70065,11 +69846,7 @@ name = "south bump"; pixel_y = -28 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -71738,11 +71515,7 @@ /area/station/maintenance/asmaint) "pCx" = ( /obj/machinery/chem_heater, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/engine, /area/station/science/misc_lab) "pCT" = ( @@ -71885,10 +71658,7 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/asmaint) "pHs" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -73655,11 +73425,7 @@ /area/station/science/xenobiology) "qyq" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -76117,11 +75883,7 @@ }, /area/station/hallway/secondary/exit) "rLK" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/sink{ dir = 4; pixel_x = 12 @@ -77013,10 +76775,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -77374,10 +77133,7 @@ pixel_x = 6; pixel_y = 3 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "suJ" = ( @@ -78083,11 +77839,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -80737,11 +80489,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -84388,11 +84136,7 @@ pixel_x = -2; pixel_y = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkpurple" @@ -84835,11 +84579,7 @@ /area/station/science/toxins/mixing) "wCG" = ( /obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /turf/simulated/floor/plasteel{ @@ -84924,11 +84664,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "wEP" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/sink{ dir = 8; pixel_x = -12 diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index f018f8895687..9b7a597d7874 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -321,10 +321,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -466,10 +463,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1181,11 +1175,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/critical/directional/north, -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3200,11 +3190,7 @@ /turf/simulated/floor/catwalk, /area/station/maintenance/fore) "aBj" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "aBl" = ( @@ -5054,10 +5040,7 @@ }, /area/station/maintenance/apmaint) "aTV" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aUb" = ( @@ -6850,11 +6833,7 @@ }, /area/station/supply/sorting) "bgA" = ( -/obj/machinery/newscaster{ - pixel_x = 28; - name = "east bump"; - dir = 8 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "bgB" = ( @@ -6998,10 +6977,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bhq" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/economy/vending/suitdispenser, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -8748,11 +8724,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -9828,10 +9800,7 @@ /obj/structure/sign/security{ pixel_y = 32 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; @@ -10551,11 +10520,7 @@ dir = 4; network = list("SS13","CE") }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/blue, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -13535,11 +13500,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -14039,10 +14000,7 @@ dir = 4 }, /obj/machinery/atmospherics/portable/pump, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14247,11 +14205,7 @@ }, /area/station/command/meeting_room) "bSh" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /obj/machinery/computer/station_alert{ dir = 8 }, @@ -16354,11 +16308,7 @@ pixel_x = -27; pixel_y = 25 }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -17959,11 +17909,7 @@ }, /area/station/science/hallway) "cry" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -18250,11 +18196,7 @@ /area/station/science/server) "ctQ" = ( /obj/structure/table, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/item/clothing/gloves/color/latex, /turf/simulated/floor/plasteel{ dir = 8; @@ -18275,11 +18217,7 @@ /turf/simulated/floor/wood, /area/station/legal/courtroom) "cuk" = ( -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -19010,11 +18948,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -19232,10 +19166,7 @@ }, /area/station/public/dorms) "cCK" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -19478,11 +19409,7 @@ /area/station/hallway/secondary/garden) "cFc" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/grass/jungle, /area/station/hallway/secondary/garden) "cFe" = ( @@ -20048,11 +19975,7 @@ }, /area/station/hallway/spacebridge/engmed) "cIO" = ( -/obj/machinery/newscaster{ - pixel_x = 28; - name = "east bump"; - dir = 8 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/flora/rock/jungle, /turf/simulated/floor/grass/jungle, /area/station/hallway/secondary/garden) @@ -20956,10 +20879,7 @@ }, /area/station/medical/virology) "cOR" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -25354,10 +25274,7 @@ }, /area/station/engineering/atmos) "dvg" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -25919,10 +25836,7 @@ /area/station/medical/virology) "dzH" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /obj/item/toy/figure/crew/hop{ layer = 4; pixel_x = -4; @@ -28523,10 +28437,7 @@ }, /obj/item/multitool, /obj/item/multitool, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/item/mecha_parts/core, /obj/item/flash, /obj/item/flash, @@ -29772,11 +29683,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -30860,10 +30767,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "eKt" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/service/bar) "eKx" = ( @@ -37590,10 +37494,7 @@ dir = 4 }, /obj/structure/closet/jcloset, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/service/janitor) "gJd" = ( @@ -39747,11 +39648,7 @@ }, /area/station/medical/medbay) "hpJ" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/table, /obj/item/eftpos/register, /turf/simulated/floor/plasteel{ @@ -39975,10 +39872,7 @@ c_tag = "Docking Security Holding Area"; dir = 6 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -43170,11 +43064,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ift" = ( -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/bar) "ifw" = ( @@ -43601,11 +43491,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -44337,11 +44223,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -44402,10 +44284,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "iwn" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44910,10 +44789,7 @@ /turf/simulated/floor/plasteel/stairs, /area/station/command/vault) "iCp" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) "iCq" = ( @@ -48079,11 +47955,7 @@ /obj/item/multitool{ pixel_y = 6 }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /obj/item/rcs, /obj/machinery/camera{ c_tag = "Cargo Desk"; @@ -48474,11 +48346,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -49569,11 +49437,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "jGK" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/table/wood, /obj/item/paper/blueshield, /obj/item/paper_bin, @@ -51544,11 +51408,7 @@ /turf/simulated/floor/catwalk, /area/station/engineering/transmission_laser) "khp" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/landmark/start/assistant, /obj/structure/chair/office/dark{ dir = 1 @@ -52573,10 +52433,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/structure/disposalpipe/segment/corner, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -54263,11 +54120,7 @@ }, /area/station/public/quantum/docking) "kQN" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "kQS" = ( @@ -56416,11 +56269,7 @@ /turf/simulated/floor/grass, /area/station/service/hydroponics) "lta" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -56741,11 +56590,7 @@ /obj/item/transfer_valve{ pixel_x = 5 }, -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -58506,10 +58351,7 @@ }, /area/station/maintenance/electrical_shop) "lTO" = ( -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -59684,10 +59526,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -69382,10 +69221,7 @@ }, /area/station/hallway/primary/fore/west) "oOe" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/economy/vending/medidrobe, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -72852,11 +72688,7 @@ /area/station/maintenance/storage) "pGD" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/flasher{ id = "hopflash"; pixel_y = 24 @@ -73057,10 +72889,7 @@ }, /area/station/engineering/atmos) "pJV" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -76136,11 +75965,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "qxR" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/spawner/random/dirt/often, /obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/plasteel{ @@ -77138,10 +76963,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "qLc" = ( -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -84913,11 +84735,7 @@ /obj/structure/disposalpipe/segment{ color = "#954535" }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -85004,11 +84822,7 @@ }, /area/station/maintenance/fpmaint) "sMR" = ( -/obj/machinery/newscaster{ - pixel_x = 28; - name = "east bump"; - dir = 8 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -90351,11 +90165,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "udb" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -93268,11 +93078,7 @@ }, /area/station/medical/chemistry) "uKT" = ( -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 8; @@ -93525,10 +93331,7 @@ /area/station/maintenance/abandonedbar) "uPL" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -93585,11 +93388,7 @@ /turf/simulated/wall, /area/station/service/hydroponics) "uQc" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/smartfridge/foodcart{ dir = 1 }, @@ -95835,11 +95634,7 @@ /area/station/service/library) "vtG" = ( /obj/structure/table/reinforced, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -98596,10 +98391,7 @@ /obj/machinery/computer/secure_data{ dir = 8 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /obj/structure/window/reinforced{ dir = 4 }, @@ -103967,10 +103759,7 @@ "xwE" = ( /obj/structure/table/wood, /obj/item/megaphone, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/command/office/rd) "xwI" = ( @@ -104073,10 +103862,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purplecorner" @@ -105702,11 +105488,7 @@ /obj/structure/disposalpipe/segment{ color = "#954535" }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -106953,11 +106735,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_x = 28; - name = "east bump"; - dir = 8 - }, +/obj/machinery/newscaster/directional/east, /obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 349b187b8ead..0e41a3f1d91a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -901,11 +901,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/landmark/start/assistant, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -1048,11 +1044,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -1942,11 +1934,7 @@ "aoe" = ( /obj/structure/table, /obj/random/toolbox, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -1960,11 +1948,7 @@ /obj/structure/sink/kitchen/old{ pixel_y = 25 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -2859,11 +2843,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "aqZ" = ( @@ -3058,11 +3038,7 @@ "arB" = ( /obj/structure/table/wood, /obj/item/phone, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "arC" = ( @@ -3797,11 +3773,7 @@ /area/station/command/customs) "atB" = ( /obj/structure/filingcabinet, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "blue" @@ -3817,11 +3789,7 @@ /area/station/hallway/secondary/entry/lounge) "atD" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/hallway/secondary/entry/lounge) "atE" = ( @@ -3842,11 +3810,7 @@ /area/station/hallway/secondary/entry/lounge) "atG" = ( /obj/structure/closet/wardrobe/red, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -4040,11 +4004,7 @@ /area/station/maintenance/electrical_shop) "aui" = ( /obj/machinery/light/small, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) @@ -4096,11 +4056,7 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/lighter/zippo, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "auq" = ( @@ -8714,11 +8670,7 @@ /turf/simulated/floor/wood, /area/station/service/clown) "aHR" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/service/bar) @@ -10105,11 +10057,7 @@ "aLL" = ( /obj/machinery/disposal, /obj/machinery/alarm/directional/west, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -11652,11 +11600,7 @@ /obj/structure/chair/stool/bar{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -11804,11 +11748,7 @@ }, /area/station/maintenance/incinerator) "aQR" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, @@ -12181,11 +12121,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -13346,11 +13282,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -14235,11 +14167,7 @@ }, /area/station/security/permabrig) "aWN" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -14313,11 +14241,7 @@ }, /area/station/security/permabrig) "aWV" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/status_display, /turf/simulated/wall, /area/station/security/permabrig) @@ -14470,11 +14394,7 @@ /obj/structure/table/wood, /obj/item/staff/broom, /obj/item/clothing/head/witchwig, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/theatre) "aXC" = ( @@ -14497,11 +14417,7 @@ dir = 4; name = "Theater Stage" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/service/theatre) "aXG" = ( @@ -15156,11 +15072,7 @@ "aZz" = ( /obj/machinery/light, /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -15605,11 +15517,7 @@ /area/station/service/kitchen) "baR" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -17182,11 +17090,7 @@ /area/station/service/kitchen) "bfj" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -18290,11 +18194,7 @@ dir = 4; network = list("Interrogation") }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19946,11 +19846,7 @@ }, /obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/metalfoam, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "bmK" = ( @@ -20757,11 +20653,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -21245,11 +21137,7 @@ /area/station/maintenance/fore) "bqh" = ( /obj/machinery/hydroponics/constructable, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -22619,11 +22507,7 @@ c_tag = "Atmospherics Storage"; dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "buw" = ( @@ -23468,11 +23352,7 @@ dir = 4; network = list("SS13","Engineering") }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -23972,11 +23852,7 @@ }, /area/station/engineering/break_room) "byv" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -25062,11 +24938,7 @@ /obj/machinery/computer/atmos_alert{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "caution" }, @@ -25572,11 +25444,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "bCH" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; sort_type_txt = "19" @@ -27044,11 +26912,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bGw" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -28097,11 +27961,7 @@ }, /area/station/hallway/primary/central/nw) "bJe" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/wood, /area/station/command/meeting_room) "bJf" = ( @@ -28181,11 +28041,7 @@ /obj/machinery/computer/security/mining{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -30015,11 +29871,7 @@ /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/crowbar, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) @@ -30180,11 +30032,7 @@ /obj/structure/bed/dogbed{ name = "fox box" }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /mob/living/simple_animal/pet/dog/fox/renault, /turf/simulated/floor/plasteel/dark, /area/station/command/office/captain) @@ -32807,11 +32655,7 @@ "bWw" = ( /obj/machinery/light, /obj/structure/table/wood, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -34029,11 +33873,7 @@ /area/station/command/office/captain/bedroom) "cat" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "cau" = ( @@ -34804,11 +34644,7 @@ "ccp" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/light{ dir = 8 }, @@ -35542,11 +35378,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start/magistrate, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "ces" = ( @@ -36303,11 +36135,7 @@ "cgW" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "cgX" = ( @@ -36812,11 +36640,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/wood, /area/station/command/office/hop) "ciD" = ( @@ -37841,11 +37665,7 @@ "clI" = ( /obj/structure/bed, /obj/item/bedsheet/hop, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/hop) "clJ" = ( @@ -38198,11 +38018,7 @@ /area/station/engineering/control) "cmM" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/engineering/control) @@ -38390,11 +38206,7 @@ "cnn" = ( /obj/structure/table/wood, /obj/machinery/computer/library, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "cno" = ( @@ -39233,11 +39045,7 @@ }, /area/station/science/xenobiology) "cpH" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood, /area/station/service/library) @@ -41184,11 +40992,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cvr" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -42060,11 +41864,7 @@ /area/station/service/library) "cyb" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "cyc" = ( @@ -43787,11 +43587,7 @@ /obj/structure/table/reinforced, /obj/item/stack/package_wrap, /obj/item/hand_labeler, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cDt" = ( @@ -43873,11 +43669,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -46493,10 +46285,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cLL" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/closet/wardrobe/coroner, /turf/simulated/floor/plasteel{ dir = 1; @@ -46677,11 +46466,7 @@ /area/station/service/clown) "cMN" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/item/paper_bin, /obj/item/toy/crayon/mime, /turf/simulated/floor/mineral/tranquillite, @@ -47748,11 +47533,7 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/dropper, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -53852,11 +53633,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Research Director's Office" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ dir = 8; @@ -54729,11 +54506,7 @@ pixel_x = 28 }, /obj/item/flashlight/lamp, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -55437,11 +55210,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dym" = ( @@ -56203,11 +55972,7 @@ /obj/item/screwdriver, /obj/item/multitool, /obj/item/clothing/head/welding, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) @@ -56650,11 +56415,7 @@ }, /obj/machinery/alarm/directional/north, /obj/item/kirbyplants, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "dFd" = ( @@ -57942,10 +57703,7 @@ /area/station/hallway/secondary/exit) "dNR" = ( /obj/machinery/computer/crew, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "dNZ" = ( @@ -57990,11 +57748,7 @@ }, /area/station/maintenance/apmaint) "dOq" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -58630,10 +58384,7 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) "dQV" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -58793,11 +58544,7 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/breath, /obj/item/reagent_containers/drinks/coffee, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "dRu" = ( @@ -60370,11 +60117,7 @@ "dYV" = ( /obj/structure/rack, /obj/item/storage/secure/briefcase, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "dZb" = ( @@ -60773,11 +60516,7 @@ }, /area/station/hallway/secondary/entry/south) "ejr" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -62419,10 +62158,7 @@ /obj/item/storage/belt/utility, /obj/item/weldingtool, /obj/item/clothing/head/welding, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -62877,11 +62613,7 @@ }, /area/station/security/main) "fqF" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -64025,11 +63757,7 @@ }, /area/station/service/bar) "fZV" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/table/glass, /obj/item/storage/box/syringes, /obj/item/book/manual/wiki/sop_science, @@ -65247,10 +64975,7 @@ color = "#A30FAF"; dir = 1 }, -/obj/machinery/newscaster{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/extinguisher_cabinet{ name = "west bump"; pixel_x = -27 @@ -65479,10 +65204,7 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "gWD" = ( @@ -65896,10 +65618,7 @@ /area/station/maintenance/port) "hkA" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/fore2) @@ -67582,10 +67301,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "imG" = ( @@ -67839,11 +67555,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/stamp/clown, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/clown) "iuY" = ( @@ -67854,10 +67566,7 @@ /obj/structure/table/glass, /obj/item/clipboard, /obj/item/toy/figure/crew/botanist, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -69140,10 +68849,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/cable{ icon_state = "4-8" }, @@ -69281,11 +68987,7 @@ }, /area/station/maintenance/port) "jou" = ( -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -69966,11 +69668,7 @@ /turf/simulated/floor/plating, /area/station/command/office/hos) "jNg" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/economy/vending/cargodrobe, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/light, @@ -70137,10 +69835,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "jRZ" = ( @@ -70910,11 +70605,7 @@ /area/station/hallway/secondary/exit) "kpk" = ( /obj/item/hemostat, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -72888,10 +72579,7 @@ /area/station/hallway/primary/starboard/north) "lCu" = ( /obj/structure/table/reinforced, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) @@ -73351,11 +73039,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "lSa" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/dye_generator, /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ @@ -73380,11 +73064,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "lTy" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -74135,11 +73815,7 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "mrW" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -74148,10 +73824,7 @@ }, /area/station/hallway/primary/starboard/west) "mrY" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "msl" = ( @@ -74292,10 +73965,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/economy/vending/autodrobe, /turf/simulated/floor/plasteel, /area/station/public/storage/art) @@ -75311,11 +74981,7 @@ }, /area/station/maintenance/apmaint) "mYH" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -76897,10 +76563,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/gps/engineering, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "nVI" = ( @@ -78045,11 +77708,7 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/bar) "oDy" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "oDD" = ( @@ -78289,10 +77948,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "oKH" = ( @@ -78970,10 +78626,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/central/ne) "pde" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -79583,10 +79236,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/science/testrange) "pxj" = ( @@ -79728,10 +79378,7 @@ }, /area/station/medical/cloning) "pBY" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/disposalpipe/sortjunction{ dir = 4; sort_type_txt = "17" @@ -80453,10 +80100,7 @@ "pWw" = ( /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -80848,11 +80492,7 @@ /area/station/hallway/primary/central/ne) "qke" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/east) "qkH" = ( @@ -81430,11 +81070,7 @@ /turf/space, /area/station/engineering/solar/fore_starboard) "qHE" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/aisat) "qHK" = ( @@ -81930,10 +81566,7 @@ /area/station/maintenance/fore2) "qWx" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "qWB" = ( @@ -82961,10 +82594,7 @@ /area/station/medical/chemistry) "rxb" = ( /obj/machinery/computer/secure_data, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "rxy" = ( @@ -83474,10 +83104,7 @@ /area/station/aisat) "rML" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -86307,11 +85934,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -86670,11 +86293,7 @@ }, /area/station/hallway/primary/central/west) "txW" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/public/toilet/lockerroom) "tyN" = ( @@ -87316,10 +86935,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/newscaster{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -87888,10 +87504,7 @@ /obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/item/crowbar, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -88006,10 +87619,7 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/machinery/firealarm/directional/east, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -88880,11 +88490,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Chief Medical Officer's Office" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -88939,11 +88545,7 @@ /obj/structure/table/reinforced, /obj/item/folder/blue, /obj/item/pen, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai) "uKV" = ( @@ -89162,11 +88764,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/assistant, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -89304,10 +88902,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/storage) "uXh" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "uXN" = ( @@ -90313,10 +89908,7 @@ /obj/structure/table/wood, /obj/item/stack/package_wrap, /obj/item/hand_labeler, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) "vEY" = ( @@ -92158,11 +91750,7 @@ }, /area/station/medical/medbay) "wGL" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wGT" = ( @@ -92511,20 +92099,12 @@ /turf/simulated/floor/plating, /area/station/engineering/hardsuitstorage) "wUF" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery/hollow, /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) @@ -94000,11 +93580,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "xJD" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/engine, /area/station/science/misc_lab) "xJL" = ( @@ -94067,10 +93643,7 @@ }, /obj/item/wrench, /obj/item/clothing/glasses/welding, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -94763,11 +94336,7 @@ dir = 4; network = list("SS13","Security") }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 1c1a3d7ce6b9..12b7b24964ed 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -454,11 +454,7 @@ }, /area/station/supply/qm) "agl" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/carpet/orange, /area/station/service/kitchen) "agn" = ( @@ -1575,20 +1571,13 @@ /area/station/maintenance/asmaint) "aqZ" = ( /obj/structure/dresser, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet, /area/station/command/office/hop) "ard" = ( /obj/structure/table, /obj/item/multitool, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2109,11 +2098,7 @@ name = "protective hat"; pixel_y = 8 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -2966,10 +2951,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "aGf" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) "aGg" = ( @@ -4508,11 +4490,7 @@ dir = 5; network = list("SS13","Security") }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -4585,10 +4563,7 @@ /area/station/science/robotics) "aWB" = ( /obj/structure/chair/sofa/corp/left, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "aWR" = ( @@ -5288,10 +5263,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "bbR" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -5656,11 +5628,7 @@ pixel_y = 3 }, /obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "bgP" = ( @@ -5712,11 +5680,7 @@ "bhk" = ( /obj/structure/table/wood, /obj/machinery/reagentgrinder, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/bar) "bhp" = ( @@ -5728,11 +5692,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners" }, @@ -5808,10 +5768,7 @@ /area/station/security/prison/cell_block) "bik" = ( /obj/structure/closet/secure_closet/personal, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/public/locker) "bim" = ( @@ -6350,11 +6307,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -6918,11 +6871,7 @@ "btk" = ( /obj/structure/table, /obj/item/storage/bag/dice, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "btl" = ( @@ -6987,11 +6936,7 @@ "btM" = ( /obj/structure/chair/comfy/black, /obj/effect/landmark/start/assistant, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/public/arcade) "btR" = ( @@ -7296,11 +7241,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "bwi" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -8581,10 +8522,7 @@ /obj/machinery/camera{ c_tag = "Brig Hall Mid 1" }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -8757,11 +8695,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "bJK" = ( -/obj/machinery/newscaster{ - pixel_x = 28; - name = "east bump"; - dir = 8 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/computer/pandemic, /turf/simulated/floor/plasteel{ dir = 4; @@ -8852,10 +8786,7 @@ /area/station/hallway/spacebridge/security/west) "bKF" = ( /obj/structure/chair/sofa/left, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet, /area/station/hallway/primary/central/se) "bKI" = ( @@ -9016,11 +8947,7 @@ }, /area/station/security/permabrig) "bMn" = ( -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -10713,11 +10640,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/public/fitness) "ccg" = ( @@ -11647,10 +11570,7 @@ /area/station/maintenance/starboard) "cmI" = ( /obj/structure/table/glass, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/reagentgrinder{ desc = "Used to grind things up into raw materials and liquids."; pixel_y = 5 @@ -12208,11 +12128,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/transmission_laser) "cto" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -13280,10 +13196,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -13582,11 +13495,7 @@ pixel_x = 5; pixel_y = -2 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkpurple" @@ -14094,11 +14003,7 @@ "cMS" = ( /obj/structure/table, /obj/item/ashtray/plastic, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -15995,11 +15900,7 @@ }, /area/station/medical/surgery/observation) "dhE" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/library) "dhN" = ( @@ -16608,10 +16509,7 @@ pixel_y = 6; pixel_x = 9 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 9; @@ -16881,10 +16779,7 @@ "drk" = ( /obj/structure/chair/comfy/teal, /obj/effect/landmark/start/chief_medical_officer, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/command/office/cmo) "dro" = ( @@ -17433,11 +17328,7 @@ /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/service/bar) "dvw" = ( @@ -17517,10 +17408,7 @@ /area/station/maintenance/asmaint) "dwF" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, @@ -18176,11 +18064,7 @@ dir = 9; network = list("Research","SS13") }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -19315,11 +19199,7 @@ "dPc" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/camera{ c_tag = "Engineering Foyer South"; dir = 1 @@ -20686,11 +20566,7 @@ /area/station/public/toilet/lockerroom) "eeY" = ( /obj/structure/closet/l3closet/janitor, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/service/janitor) "eff" = ( @@ -21630,11 +21506,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/legal/courtroom/gallery) "epx" = ( @@ -21695,10 +21567,7 @@ /area/station/medical/break_room) "epT" = ( /obj/machinery/economy/vending/virodrobe, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -22855,10 +22724,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/structure/chair/stool/bar{ dir = 8 }, @@ -22919,11 +22785,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -23041,11 +22903,7 @@ }, /area/station/hallway/primary/central/sw) "eEe" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -24430,11 +24288,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "eSB" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "eSD" = ( @@ -25391,11 +25245,7 @@ /obj/machinery/kitchen_machine/microwave{ pixel_y = 6 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/item/radio/intercom{ name = "south bump"; pixel_y = -28 @@ -25598,11 +25448,7 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/carpet, /area/station/public/dorms) "fcR" = ( @@ -26500,10 +26346,7 @@ "flG" = ( /obj/structure/table, /obj/item/ashtray/glass, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -29876,11 +29719,7 @@ /area/station/hallway/primary/central/sw) "fRk" = ( /obj/structure/filingcabinet/chestdrawer/autopsy, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31044,11 +30883,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -31226,10 +31061,7 @@ /area/station/medical/sleeper) "ggv" = ( /obj/machinery/computer/atmos_alert, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -31702,10 +31534,7 @@ /area/station/maintenance/security/fore) "gkE" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -33630,11 +33459,7 @@ /obj/structure/table/wood, /obj/item/storage/fancy/crayons, /obj/machinery/light, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -33753,11 +33578,7 @@ }, /obj/effect/landmark/start/paramedic, /obj/machinery/light, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -34536,11 +34357,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "gOI" = ( @@ -35893,10 +35710,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -36709,10 +36523,7 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "hkp" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -37278,10 +37089,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" @@ -42520,12 +42328,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4; - pixel_y = -32 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkpurplecorners" @@ -42547,10 +42349,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ito" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -43933,11 +43732,7 @@ }, /obj/item/reagent_containers/spray/cleaner, /obj/machinery/light, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -44810,10 +44605,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "iOK" = ( @@ -44944,10 +44736,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -47162,11 +46951,7 @@ /area/station/science/xenobiology) "jmB" = ( /obj/structure/closet/emcloset, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) "jmN" = ( @@ -47255,11 +47040,7 @@ }, /area/station/security/prison/cell_block) "jni" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47699,11 +47480,7 @@ /area/station/hallway/spacebridge/security/west) "jsk" = ( /obj/structure/chair/sofa/corner, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/public/dorms) "jso" = ( @@ -48305,10 +48082,7 @@ /area/station/maintenance/apmaint) "jyX" = ( /obj/machinery/computer/card/minor/cmo, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -48536,11 +48310,7 @@ "jAS" = ( /obj/structure/chair, /obj/machinery/alarm/directional/north, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/landmark/start/assistant, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) @@ -50081,11 +49851,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -50717,10 +50483,7 @@ /area/station/medical/morgue) "jVX" = ( /obj/machinery/computer/security, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -51529,11 +51292,7 @@ "kew" = ( /obj/structure/table/wood, /obj/item/reagent_containers/drinks/mug, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/public/mrchangs) "kex" = ( @@ -51572,11 +51331,7 @@ "keQ" = ( /obj/structure/table, /obj/item/stack/tape_roll, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -52918,11 +52673,7 @@ /obj/machinery/computer/arcade{ dir = 4 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -54709,11 +54460,7 @@ /obj/item/storage/toolbox/electrical, /obj/item/screwdriver, /obj/item/multitool, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/cable{ icon_state = "1-8" }, @@ -56744,11 +56491,7 @@ /area/station/maintenance/aft2) "lix" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, /obj/item/restraints/handcuffs/cable/cyan, @@ -59935,11 +59678,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -60203,11 +59942,7 @@ dir = 10 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "lST" = ( @@ -61265,11 +61000,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "mff" = ( @@ -61704,11 +61435,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "mjQ" = ( @@ -62751,10 +62478,7 @@ }, /area/station/medical/medbay) "mtQ" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" @@ -63426,11 +63150,7 @@ /area/station/supply/sorting) "mCa" = ( /obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "mCe" = ( @@ -63479,11 +63199,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/cable{ icon_state = "4-8" }, @@ -64074,11 +63790,7 @@ /obj/structure/table, /obj/item/storage/fancy/donut_box, /obj/machinery/light, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom/gallery) "mKs" = ( @@ -65211,11 +64923,7 @@ }, /area/station/security/evidence) "mUY" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) "mUZ" = ( @@ -67866,11 +67574,7 @@ /area/station/security/prisonershuttle) "nws" = ( /obj/machinery/dye_generator, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -67908,10 +67612,7 @@ /area/station/public/locker) "nwF" = ( /obj/structure/table, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/camera{ c_tag = "Court Break Room" }, @@ -68008,11 +67709,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/spawner/random/maintenance, /obj/machinery/light/small{ dir = 8 @@ -68378,11 +68075,7 @@ /obj/structure/chair/sofa/corner{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/wood, /area/station/hallway/secondary/exit) @@ -69577,11 +69270,7 @@ /area/station/engineering/atmos/asteroid_filtering) "nMg" = ( /obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -70604,11 +70293,7 @@ "nWb" = ( /obj/structure/table, /obj/item/extinguisher, -/obj/machinery/newscaster{ - pixel_x = -28; - name = "west bump"; - dir = 4 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/camera{ c_tag = "Research Toxins Mixing West"; dir = 4; @@ -71043,10 +70728,7 @@ pixel_y = 16; pixel_x = -6 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet, /area/station/security/detective) "nZH" = ( @@ -71740,11 +71422,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ogB" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/public/dorms) "ogD" = ( @@ -72289,10 +71967,7 @@ "ola" = ( /obj/structure/table, /obj/item/deck/cards, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -74286,11 +73961,7 @@ dir = 8; name = "Grid Power Monitoring Computer" }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -74392,11 +74063,7 @@ dir = 1; color = "#A30FAF" }, -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -75038,10 +74705,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -75151,10 +74815,7 @@ /area/station/maintenance/aft2) "oOo" = ( /obj/structure/statue/bananium/clown, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/service/clown) "oOq" = ( @@ -75416,10 +75077,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -75757,11 +75415,7 @@ /area/station/hallway/primary/fore/north) "oUd" = ( /obj/structure/table/reinforced, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /obj/item/storage/firstaid/regular, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -79742,11 +79396,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/command/office/rd) "pHH" = ( @@ -79778,11 +79428,7 @@ /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "pHO" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -79938,11 +79584,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plating, /area/station/aisat/service) "pIP" = ( @@ -80758,11 +80400,7 @@ /obj/structure/table/wood, /obj/item/stack/package_wrap, /obj/item/dest_tagger, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "pSG" = ( @@ -81314,11 +80952,7 @@ /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "pYh" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -81636,11 +81270,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82493,11 +82123,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "arrival" @@ -83573,11 +83199,7 @@ /area/station/hallway/primary/central/sw) "qyc" = ( /obj/machinery/photocopier, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/service/library) "qyf" = ( @@ -83613,10 +83235,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -84396,11 +84015,7 @@ c_tag = "Chapel West"; dir = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "chapel" @@ -88224,11 +87839,7 @@ name = "Desk Door"; dir = 8 }, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /obj/effect/mapping_helpers/airlock/windoor/access/all/command/blueshield{ dir = 8 }, @@ -88851,11 +88462,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/bar) "ryx" = ( @@ -89210,11 +88817,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -90127,11 +89730,7 @@ /obj/item/restraints/handcuffs, /obj/item/flash, /obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -90232,11 +89831,7 @@ /turf/simulated/floor/plasteel, /area/station/public/pet_store) "rLu" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90349,11 +89944,7 @@ /area/station/maintenance/security/aft_port) "rMl" = ( /obj/structure/closet/wardrobe/mixed, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/public/locker) "rMo" = ( @@ -90530,11 +90121,7 @@ /turf/simulated/floor/plasteel, /area/station/security/interrogation) "rNN" = ( -/obj/machinery/newscaster{ - pixel_y = -28; - name = "south bump"; - dir = 1 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -92488,10 +92075,7 @@ /area/station/maintenance/apmaint) "sgU" = ( /obj/machinery/hydroponics/soil, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/grass, /area/station/hallway/secondary/garden) "she" = ( @@ -92764,11 +92348,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "sjx" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) "sjz" = ( @@ -94434,10 +94014,7 @@ /area/station/security/prison) "sAH" = ( /obj/effect/spawner/random/oil/maybe, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel, /area/station/public/storage/office) "sAI" = ( @@ -95328,11 +94905,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_x = 28; - name = "east bump"; - dir = 8 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -96256,10 +95829,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "sUe" = ( -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "sUj" = ( @@ -96976,11 +96546,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -98777,11 +98343,7 @@ pixel_x = -20; pixel_y = 8 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/radio/intercom{ name = "east bump"; pixel_x = 28 @@ -99139,10 +98701,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -101907,11 +101466,7 @@ "tYy" = ( /obj/item/ashtray/glass, /obj/structure/table/wood, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, @@ -102895,10 +102450,7 @@ c_tag = "Theatre Backstage East"; dir = 6 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -104865,11 +104417,7 @@ /obj/item/crowbar, /obj/item/flash, /obj/machinery/requests_console/directional/south, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -106416,6 +105964,7 @@ "uSH" = ( /obj/machinery/economy/vending/genedrobe, /obj/machinery/requests_console/directional/south, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkpurplecorners" @@ -106549,10 +106098,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/wood, /area/station/command/office/captain) "uTL" = ( @@ -109180,11 +108726,7 @@ }, /area/station/engineering/atmos/transit) "vvK" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -110327,11 +109869,7 @@ pixel_x = 8; pixel_y = 5 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/camera{ c_tag = "Library West"; dir = 10 @@ -110615,10 +110153,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -111851,11 +111386,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/item/reagent_containers/drinks/mug/hos, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) @@ -112740,11 +112271,7 @@ /area/station/public/mrchangs) "weD" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -113269,11 +112796,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/grass, /area/station/public/park) "wks" = ( @@ -113326,11 +112849,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "wkS" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "wkT" = ( @@ -113747,10 +113266,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -114052,10 +113568,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -114290,11 +113803,7 @@ /turf/simulated/floor/carpet/orange, /area/station/service/kitchen) "wvL" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -115093,11 +114602,7 @@ c_tag = "Chapel East"; dir = 8 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -115228,11 +114733,7 @@ /turf/simulated/floor/carpet/orange, /area/station/service/kitchen) "wHE" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -116532,11 +116033,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wUq" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "wUu" = ( @@ -117667,10 +117164,7 @@ pixel_y = 5 }, /obj/item/stock_parts/cell/high, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; @@ -119468,11 +118962,7 @@ /area/station/hallway/secondary/entry) "xyC" = ( /obj/structure/table, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/south) "xyE" = ( @@ -120061,11 +119551,7 @@ }, /area/station/public/shops) "xEX" = ( -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -120624,11 +120110,7 @@ pixel_y = 1 }, /obj/item/reagent_containers/dropper, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/light_switch{ dir = 1; name = "south bump"; @@ -120689,10 +120171,7 @@ /turf/simulated/floor/plating/asteroid/ancient/airless, /area/station/engineering/atmos/asteroid_filtering) "xLu" = ( -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -121199,11 +120678,7 @@ /obj/machinery/computer/atmos_alert{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -121396,11 +120871,7 @@ pixel_y = -2 }, /obj/item/assembly/igniter, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blackcorner" @@ -122898,10 +122369,7 @@ /area/station/maintenance/security/aft_port) "yiX" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/machinery/newscaster{ - pixel_y = 28; - name = "north bump" - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index ee58c6d45039..b5ef6ca7ad58 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -68,11 +68,7 @@ /area/station/engineering/solar/fore_port) "abG" = ( /obj/structure/table, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/item/folder, /turf/simulated/floor/plasteel{ icon_state = "purple"; @@ -398,11 +394,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "afw" = ( @@ -440,11 +432,7 @@ pixel_x = 5; pixel_y = 12 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -2646,11 +2634,7 @@ }, /area/station/public/fitness) "atO" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/closet/lasertag/blue, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -4410,10 +4394,7 @@ /area/station/service/mime) "aBv" = ( /obj/structure/table/glass, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -5867,11 +5848,7 @@ dir = 8 }, /obj/effect/landmark/start/internal_affairs, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "aHV" = ( @@ -6039,11 +6016,7 @@ /obj/item/flashlight/lamp/green{ pixel_x = 8 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "aIu" = ( @@ -7310,11 +7283,7 @@ /obj/item/flashlight/lamp/bananalamp{ pixel_x = 8 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, /area/station/service/clown) "aMB" = ( @@ -7956,11 +7925,7 @@ /area/station/legal/courtroom) "aOU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/cable{ icon_state = "1-2" }, @@ -8939,11 +8904,7 @@ /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/control) "aSF" = ( @@ -9838,11 +9799,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "aVu" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/station/service/cafeteria) @@ -12094,10 +12051,7 @@ }, /obj/item/reagent_containers/drinks/drinkingglass/shotglass, /obj/item/reagent_containers/drinks/drinkingglass/shotglass, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bcP" = ( @@ -13370,11 +13324,7 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -14336,11 +14286,7 @@ /obj/item/screwdriver{ pixel_y = 10 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/dest_tagger{ pixel_x = 4; pixel_y = 3 @@ -15308,11 +15254,7 @@ }, /area/station/medical/medbay) "blx" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo" }, @@ -15699,11 +15641,7 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Captain's Office" }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "bmp" = ( @@ -15790,11 +15728,7 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "bmE" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -17288,11 +17222,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18864,11 +18794,7 @@ /area/station/hallway/secondary/entry/lounge) "bvE" = ( /obj/machinery/economy/vending/cola, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -19073,11 +18999,7 @@ /obj/machinery/computer/security/mining{ dir = 8 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "bwd" = ( @@ -19274,11 +19196,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/wood, /area/station/service/bar) "bwL" = ( @@ -19636,11 +19554,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "bxL" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/light{ dir = 4 }, @@ -19946,11 +19860,7 @@ pixel_y = -3 }, /obj/item/wrench, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/item/multitool/command, /obj/structure/shelf/command, /turf/simulated/floor/plasteel{ @@ -22104,11 +22014,7 @@ /area/station/maintenance/port) "bFY" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "bGa" = ( @@ -23300,11 +23206,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "bKT" = ( @@ -23326,11 +23228,7 @@ }, /area/station/ai_monitored/storage/eva) "bKX" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -23362,11 +23260,7 @@ }, /area/station/hallway/secondary/bridge) "bLh" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -23530,11 +23424,7 @@ pixel_y = 2 }, /obj/item/pen, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/bridge) "bLS" = ( @@ -25875,11 +25765,7 @@ pixel_x = -5; pixel_y = 1 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "bVi" = ( @@ -26083,11 +25969,7 @@ /obj/machinery/keycard_auth{ pixel_y = 24 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "bWi" = ( @@ -26486,11 +26368,7 @@ /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "bXy" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/item/kirbyplants/plant10, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -27127,11 +27005,7 @@ /turf/simulated/wall, /area/station/maintenance/aft) "bZW" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/wood, /area/station/service/library) "bZX" = ( @@ -27247,11 +27121,7 @@ /area/station/service/chapel/office) "caA" = ( /obj/machinery/economy/vending/snack, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -27965,11 +27835,7 @@ /obj/item/paicard{ pixel_x = -15 }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel, /area/station/science/robotics) "cdk" = ( @@ -28223,11 +28089,7 @@ }, /area/station/hallway/primary/central/south) "cej" = ( -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -29502,11 +29364,7 @@ pixel_x = -2; pixel_y = 18 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -34460,11 +34318,7 @@ /area/station/hallway/primary/aft/south) "cEn" = ( /obj/structure/closet/secure_closet/scientist, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ dir = 8; @@ -35416,11 +35270,7 @@ "cHU" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -39514,11 +39364,7 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -41270,11 +41116,7 @@ /area/station/maintenance/fsmaint) "dwp" = ( /obj/machinery/door/firedoor, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -41817,11 +41659,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/carpet, /area/station/security/detective) "dKy" = ( @@ -44844,11 +44682,7 @@ dir = 1 }, /obj/effect/landmark/start/internal_affairs, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "ffH" = ( @@ -51326,10 +51160,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "hRS" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -51608,10 +51439,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "hYu" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ @@ -52025,11 +51853,7 @@ dir = 4 }, /obj/machinery/atmospherics/portable/canister, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "iiB" = ( @@ -52425,10 +52249,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -52626,10 +52447,7 @@ /area/station/science/xenobiology) "ivY" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/item/clipboard, /obj/item/paper, /turf/simulated/floor/carpet, @@ -53223,11 +53041,7 @@ /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) "iKF" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -56953,10 +56767,7 @@ }, /area/station/legal/lawoffice) "kyq" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/item/storage/toolbox/mechanical, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -57763,10 +57574,7 @@ /area/station/hallway/secondary/entry/south) "kQD" = ( /obj/machinery/computer/secure_data, -/obj/machinery/newscaster/security_unit{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -60123,10 +59931,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/camera{ c_tag = "Chapel - Fore" }, @@ -62443,10 +62248,7 @@ /area/station/security/armory/secure) "mRL" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/item/folder, /obj/item/folder, /obj/machinery/computer/security/telescreen/entertainment{ @@ -64733,11 +64535,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -64933,11 +64731,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -65117,11 +64911,7 @@ /area/station/hallway/primary/aft/north) "nYH" = ( /obj/structure/closet/secure_closet/rd, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -67754,11 +67544,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -68224,11 +68010,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -71326,11 +71108,7 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /obj/machinery/camera{ c_tag = "Atmospherics - Desk"; dir = 1 @@ -71382,10 +71160,7 @@ }, /area/station/medical/medbay) "qTF" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -72521,11 +72296,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74427,11 +74198,7 @@ }, /obj/structure/cable, /obj/machinery/power/apc/directional/east, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -77150,11 +76917,7 @@ /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "tug" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/binary/valve{ layer = 3.3; name = "Cooling loop input"; @@ -77981,11 +77744,7 @@ /area/station/supply/expedition) "tSX" = ( /obj/machinery/photocopier, -/obj/machinery/newscaster/security_unit{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/command/office/hos) "tTh" = ( @@ -78600,11 +78359,7 @@ /turf/simulated/wall, /area/station/supply/warehouse) "ufN" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/structure/cable{ icon_state = "1-2" }, @@ -79888,10 +79643,7 @@ pixel_x = -25; specialfunctions = 4 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -81638,11 +81390,7 @@ }, /area/station/command/bridge) "vBI" = ( -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ dir = 4 @@ -82126,11 +81874,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "vQr" = ( -/obj/machinery/newscaster{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/directional/west, /obj/machinery/light{ dir = 8 }, @@ -82619,11 +82363,7 @@ c_tag = "Security - Office - Port - West"; dir = 4 }, -/obj/machinery/newscaster/security_unit{ - dir = 4; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -85212,10 +84952,7 @@ }, /area/station/science/testrange) "xoq" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ @@ -85932,10 +85669,7 @@ /obj/item/storage/box/masks{ pixel_y = 3 }, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/computer/guestpass{ pixel_x = 30 }, @@ -85975,10 +85709,7 @@ /area/station/maintenance/fsmaint) "xHw" = ( /obj/structure/chair, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /obj/machinery/camera{ c_tag = "Cargo Lobby"; dir = 4 @@ -87043,10 +86774,7 @@ /area/station/maintenance/fore) "yeR" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitegreen" diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index 872bf29a8c1a..fdd928b24ebe 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -731,6 +731,9 @@ GLOBAL_LIST_EMPTY(allNewscasters) return eject_photo(user) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30, 30) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30, 30) + #undef CHANNEL_NAME_MAX_LENGTH #undef CHANNEL_DESC_MAX_LENGTH #undef STORY_NAME_MAX_LENGTH diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index 3b4195ee8ff4..543ccf5f5a48 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ diff --git a/icons/obj/terminals4.png b/icons/obj/terminals4.png new file mode 100644 index 000000000000..2ed100736f51 Binary files /dev/null and b/icons/obj/terminals4.png differ diff --git a/tools/UpdatePaths/Scripts/27583_newscaster_directionals.txt b/tools/UpdatePaths/Scripts/27583_newscaster_directionals.txt new file mode 100644 index 000000000000..24905bc55bd5 --- /dev/null +++ b/tools/UpdatePaths/Scripts/27583_newscaster_directionals.txt @@ -0,0 +1,16 @@ +/obj/machinery/newscaster/security_unit{dir=1;name="south bump";pixel_y=-28} : /obj/machinery/newscaster/security_unit/directional/south +/obj/machinery/newscaster/security_unit{dir=4;name="west bump";pixel_x=-28} : /obj/machinery/newscaster/security_unit/directional/west +/obj/machinery/newscaster/security_unit{dir=8;name="east bump";pixel_x=28} : /obj/machinery/newscaster/security_unit/directional/east +/obj/machinery/newscaster/security_unit{dir=8;name="west bump";pixel_x=28} : /obj/machinery/newscaster/security_unit/directional/east +/obj/machinery/newscaster/security_unit{name="north bump";pixel_y=28} : /obj/machinery/newscaster/security_unit/directional/north +/obj/machinery/newscaster{desc="A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";name="custom placement";pixel_x=27} : /obj/machinery/newscaster/directional/east{desc="A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station."} +/obj/machinery/newscaster{desc="A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";name="custom placement";pixel_x=30} : /obj/machinery/newscaster/directional/east{desc="A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station."} +/obj/machinery/newscaster{dir=1;name="south bump";pixel_y=-28} : /obj/machinery/newscaster/directional/south +/obj/machinery/newscaster{dir=4;name="west bump";pixel_x=-28} : /obj/machinery/newscaster/directional/west +/obj/machinery/newscaster{dir=8;name="east bump";pixel_x=28} : /obj/machinery/newscaster/directional/east +/obj/machinery/newscaster{name="north bump";pixel_y=28} : /obj/machinery/newscaster/directional/north +/obj/machinery/newscaster{name="south bump";pixel_y=-32} : /obj/machinery/newscaster/directional/south +/obj/machinery/newscaster{pixel_x=-30} : /obj/machinery/newscaster/directional/west +/obj/machinery/newscaster{pixel_y=-30} : /obj/machinery/newscaster/directional/south +/obj/machinery/newscaster{pixel_y=30} : /obj/machinery/newscaster/directional/north +/obj/machinery/newscaster{pixel_y=32} : /obj/machinery/newscaster/directional/north diff --git a/tools/maplint/lints/directional_newscasters.yml b/tools/maplint/lints/directional_newscasters.yml new file mode 100644 index 000000000000..41177c571487 --- /dev/null +++ b/tools/maplint/lints/directional_newscasters.yml @@ -0,0 +1,13 @@ +help: 'Use the specific directional subtypes for this newscaster.' +/obj/machinery/newscaster: + banned_variables: + - pixel_x + - pixel_y +=/obj/machinery/newscaster: + banned: true +=/obj/machinery/newscaster/directional: + banned: true +=/obj/machinery/newscaster/security_unit: + banned: true +=/obj/machinery/newscaster/security_unit/directional: + banned: true