diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index f11a32570de..a5a847431ac 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -455,7 +455,7 @@ #define ACCESS_JOURNALIST 70 /datum/access/journalist id = ACCESS_JOURNALIST - desc = "Journalist Office" + desc = "Media Office" region = ACCESS_REGION_GENERAL /// Allows some unique interactions with devices diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index eee86b54d49..1953daceef3 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -37,8 +37,8 @@ name = "Corporate Reporter" jobtype = /datum/job/journalist - uniform = /obj/item/clothing/under/suit_jacket/red - shoes = /obj/item/clothing/shoes/sneakers/black + uniform = /obj/item/clothing/under/librarian + shoes = /obj/item/clothing/shoes/laceup/brown tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian @@ -65,7 +65,7 @@ jobtype = /datum/job/journalist uniform = /obj/item/clothing/under/suit_jacket/red - shoes = /obj/item/clothing/shoes/sneakers/black + shoes = /obj/item/clothing/shoes/laceup/brown tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index f880b003b45..b775002e381 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -195,6 +195,28 @@ wear_over_suit = !wear_over_suit mob_icon_update() +// Journalist's Lanyard +/obj/item/storage/wallet/lanyard/press + name = "press lanyard" + desc = "A large, blue lanyard with \"PRESS\" prominently displayed along the cord in white." + color = "#46698c" + storage_slots = 5 + w_class = WEIGHT_CLASS_SMALL + max_w_class = WEIGHT_CLASS_SMALL + can_hold = list( + /obj/item/card, + /obj/item/clothing/accessory/badge, + /obj/item/disk, + /obj/item/paper, + /obj/item/paper_bundle, + /obj/item/pen, + /obj/item/photo, + /obj/item/paicard, + /obj/item/encryptionkey, + /obj/item/storage/business_card_holder, + /obj/item/key, + ) + // wallet subtypes /obj/item/storage/wallet/random/fill() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm index 9cd30c1dfc1..581b770dea4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -55,18 +55,33 @@ new /obj/item/storage/box/mousetraps(src) // Journalist's Locker -/obj/structure/closet/secure_closet/journalist - name = "journalist's closet" - desc = "It's a storage unit for a journalist's gear." - req_access = list(ACCESS_JOURNALIST) - /obj/structure/closet/secure_closet/journalist/fill() + // Clothing + new /obj/item/radio(src) + new /obj/item/radio/headset/headset_service(src) + new /obj/item/radio/headset/wrist/service(src) + new /obj/item/radio/headset/wrist/clip/service(src) + new /obj/item/storage/backpack/satchel/leather(src) + new /obj/item/storage/briefcase/black(src) + new /obj/item/storage/secure/briefcase(src) + new /obj/item/clothing/head/helmet/security/press(src) + new /obj/item/clothing/suit/armor/carrier/press(src) + new /obj/item/storage/wallet/lanyard/press(src) + // Supply new /obj/item/storage/photo_album(src) new /obj/item/camera_film(src) - new /obj/item/camera(src) + new /obj/item/camera_film(src) new /obj/item/paper_scanner(src) - new /obj/item/folder/white(src) - new /obj/item/storage/secure/briefcase(src) - new /obj/item/clipboard(src) - new /obj/item/folder/red(src) + new /obj/item/storage/slide_projector(src) + new /obj/item/storage/box/folders(src) + new /obj/item/stack/wrapping_paper(src) + new /obj/item/stack/packageWrap(src) + new /obj/item/portable_whiteboard(src) + new /obj/item/tape_roll(src) + // Tools + new /obj/item/radio/microphone(src) + new /obj/item/taperecorder(src) new /obj/item/tvcamera(src) + new /obj/item/camera/detective/press(src) + new /obj/item/hand_labeler(src) + new /obj/item/destTagger(src) diff --git a/code/game/objects/structures/machinery/controlhub.dm b/code/game/objects/structures/machinery/controlhub.dm index 50990c4d686..482a72f8922 100644 --- a/code/game/objects/structures/machinery/controlhub.dm +++ b/code/game/objects/structures/machinery/controlhub.dm @@ -258,6 +258,18 @@ ABSTRACT_TYPE(/obj/structure/machinery/controlhub) "window tint" = list("type" = "windowtint", "id" = "bar_tint") ) +/obj/structure/machinery/controlhub/media_office + name = "media office control hub" + icon_state = "holocontrol" + req_access = list(ACCESS_JOURNALIST) + controls = list( + "door control" = list("type" = "airlock", "id" = "media_office_door", "functions" = 1), + "door bolts" = list("type" = "airlock", "id" = "media_office_door", "functions" = 4), + "window shutters" = list("type" = "blast_door", "id" = "media_office_window_shutter"), + "office window tint" = list("type" = "windowtint", "id" = "media_office_public_tint"), + "dividing window tint" = list("type" = "windowtint", "id" = "media_office_private_tint") + ) + /obj/structure/machinery/controlhub/xo_office/private name = "executive officers office control hub" icon_state = "holocontrol" diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index 9839411d766..e5fba300e7a 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -313,6 +313,16 @@ ABSTRACT_TYPE(/datum/gear/accessory) badge["badge, electronic"] = /obj/item/clothing/accessory/badge/idbadge/intel gear_tweaks += new /datum/gear_tweak/path(badge) +/datum/gear/accessory/pressbadge + display_name = "press badge, corporate" + path = /obj/item/clothing/accessory/badge/press + allowed_roles = list("Corporate Reporter") + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/pressbadge/independent + display_name = "press badge, independent" + path = /obj/item/clothing/accessory/badge/press/independent + /datum/gear/accessory/namepin display_name = "pins selection" path = /obj/item/clothing/accessory/badge/namepin diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index 6377b3d246f..194ca82b3f4 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -102,6 +102,12 @@ path = /obj/item/storage/wallet/lanyard flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/utility/press_lanyard + display_name = "press lanyard" + path = /obj/item/storage/wallet/lanyard/press + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + allowed_roles = list("Corporate Reporter") + /datum/gear/utility/recorder display_name = "universal recorder" path = /obj/item/taperecorder diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index bdb60275fad..dc53bbe89ba 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -254,6 +254,9 @@ GLOBAL_VAR_INIT(photo_count, 1) desc = "A one use - polaroid camera." pictures_left = 30 +/obj/item/camera/detective/press + name = "journalists camera" + // Detective cameras have build in data recording, so no need for a skill check /obj/item/camera/detective/record_data(mob/living/user, obj/item/photo/pic) pic.time_taken = worldtime2text() diff --git a/html/changelogs/notagonk-media_office_again.yml b/html/changelogs/notagonk-media_office_again.yml new file mode 100644 index 00000000000..5da25f074fd --- /dev/null +++ b/html/changelogs/notagonk-media_office_again.yml @@ -0,0 +1,8 @@ +author: notagonk + +delete-after: True + +changes: + - rscadd: "Remapped the journalist's office as the refurbished media office." + - rscadd: "Created a press lanyard subtype of the regular lanyard, no difference in sprite." + - rscadd: "Added the press badges and lanyard to the loadout." diff --git a/maps/sccv_horizon/areas/horizon_areas_crew.dm b/maps/sccv_horizon/areas/horizon_areas_crew.dm index 18c36132c4b..ac7c356a6db 100644 --- a/maps/sccv_horizon/areas/horizon_areas_crew.dm +++ b/maps/sccv_horizon/areas/horizon_areas_crew.dm @@ -226,8 +226,8 @@ icon_state = "law_rep_b" /// Uncategorized/general -/area/horizon/crew/journalistoffice - name = "Journalist's Office" +/area/horizon/crew/media_office + name = "Media Office" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR horizon_deck = 3 lightswitch = FALSE diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 588ccc1554a..09c1428db98 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -4261,25 +4261,22 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/rnd/xenobiology/xenoflora) "aBR" = ( -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship/cardinal, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/machinery/door/firedoor{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/structure/machinery/door/blast/regular/open{ dir = 2; id = "shutters_deck3_longbow"; name = "Safety Blast Door" }, -/obj/structure/machinery/door/firedoor{ - dir = 4 - }, /turf/simulated/floor/tiled/dark/full, /area/horizon/weapons/longbow) "aBT" = ( @@ -4351,8 +4348,11 @@ }, /area/centcom/ferry) "aCj" = ( -/turf/simulated/wall, -/area/horizon/crew/journalistoffice) +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "media_office_public_tint" + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "aCp" = ( /obj/structure/shuttle_part/scc/scout{ icon_state = "1,4" @@ -13819,11 +13819,18 @@ /turf/simulated/floor/carpet/art, /area/horizon/crew/lounge) "bOy" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/industrial/outline_straight/grey{ dir = 4 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "bOA" = ( /obj/structure/tank_wall/carbon_dioxide{ density = 0; @@ -16097,21 +16104,8 @@ /turf/simulated/floor/plating, /area/horizon/engineering/storage/lower) "cfg" = ( -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship/cardinal, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/machinery/door/blast/regular/open{ - dir = 2; - id = "shutters_deck3_longbow"; - name = "Safety Blast Door" - }, -/obj/structure/machinery/door/firedoor{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/weapons/longbow) +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/horizon/crew/media_office) "cfh" = ( /obj/structure/bed/stool/chair/padded/black, /obj/effect/landmark/start{ @@ -18474,14 +18468,12 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "cvA" = ( -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/outline_segment/service, +/obj/structure/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) @@ -18509,26 +18501,12 @@ /turf/unsimulated/floor, /area/antag/mercenary) "cvP" = ( -/obj/item/storage/photo_album, -/obj/item/camera_film, -/obj/item/camera, -/obj/structure/closet/secure_closet{ - name = "\improper Journalist's closet"; - req_access = list(70) - }, -/obj/item/paper_scanner, -/obj/item/folder/white, -/obj/item/storage/secure/briefcase, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain/black{ dir = 5 }, -/obj/item/radio/microphone, -/obj/item/clothing/suit/armor/carrier/press, -/obj/item/clothing/head/helmet/security/press, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/table/glass, +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "cvS" = ( /obj/structure/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -26990,15 +26968,29 @@ /turf/simulated/floor/tiled, /area/horizon/engineering/bluespace_drive) "dxP" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/industrial/outline_door/service{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 5 }, -/obj/random/pottedplant, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/horizon/crew/media_office) "dxR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27542,15 +27534,15 @@ /turf/unsimulated/floor, /area/centcom/holding) "dBf" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/disposal, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/machinery/disposal/small/north, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_blue, +/obj/structure/machinery/light/floor{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "dBg" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/black{ @@ -33164,6 +33156,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled/dark, /area/horizon/weapons/longbow) "enx" = ( @@ -36771,6 +36764,15 @@ /obj/effect/map_effect/door_helper/unres, /turf/simulated/floor/tiled/full, /area/horizon/command/bridge/controlroom) +"eNX" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/machinery/photocopier/faxmachine{ + department = "Media Office"; + req_one_access = list(70) + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "eOc" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38523,10 +38525,13 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, -/obj/structure/extinguisher_cabinet/west, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/closet/walllocker/firecloset{ + pixel_x = -32 + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled/dark, /area/horizon/weapons/longbow) "faG" = ( @@ -40680,6 +40685,7 @@ "fpz" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/machinery/vending/snack/horizon, +/obj/structure/machinery/light/spot, /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/primary/deck_3/port) "fpB" = ( @@ -41253,9 +41259,15 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "fsQ" = ( -/obj/structure/table/wood, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/spline/plain/black{ + dir = 10 + }, +/obj/structure/window/reinforced/polarized{ + id = "media_office_private_tint" + }, +/obj/structure/machinery/light/small/floor, +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "fsY" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -45054,14 +45066,21 @@ /turf/unsimulated/floor/grass, /area/antag/actor) "fTH" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_tiny/grey, +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 4 + }, +/obj/structure/machinery/light/spot{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "fTI" = ( /turf/space/srom_space, /area/centcom/shared_dream) @@ -45300,6 +45319,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/command/bridge/controlroom) +"fUZ" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/structure/machinery/light, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/port) "fVa" = ( /turf/simulated/wall/r_wall, /area/horizon/rnd/xenoarch/isolation_a) @@ -54736,6 +54762,19 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) +"hgN" = ( +/obj/effect/floor_decal/industrial/outline_door/service, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/crew/media_office) "hgR" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -55127,12 +55166,18 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/engineering/bluespace_drive) "hjI" = ( -/obj/structure/machinery/newscaster/east, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/plain/black{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/window/reinforced/polarized{ + id = "media_office_private_tint" + }, +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/machinery/light/small/floor, +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "hjK" = ( /obj/structure/machinery/power/apc/low/east, /obj/structure/cable/green{ @@ -57355,6 +57400,19 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/storage/eva) +"hym" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline_door/service, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/port) "hyo" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -59301,16 +59359,25 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/morgue) "hLr" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/obj/structure/noticeboard{ - desc = "A board for uncovering hidden conspiracies."; - name = "corkboard"; - pixel_x = 32 +/obj/structure/bed/stool/chair/office/bridge/pilot{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/item/radio/intercom/entertainment/north{ + pixel_y = 34; + pixel_x = 1 + }, +/obj/structure/machinery/controlhub/media_office{ + pixel_y = 24 + }, +/obj/structure/machinery/power/outlet{ + pixel_y = 31; + pixel_x = 10 + }, +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "hLu" = ( /obj/effect/landmark/entry_point/aft{ name = "aft, deck 1 BSD compartment starboard" @@ -59892,31 +59959,14 @@ /turf/simulated/floor/carpet/red, /area/horizon/service/bar) "hOO" = ( -/obj/structure/machinery/button/switch/windowtint{ - id = "journalist"; - pixel_x = -2; - pixel_y = -19 - }, -/obj/structure/machinery/light_switch{ - pixel_x = -9; - pixel_y = -19 - }, -/obj/structure/machinery/papershredder{ - pixel_x = -6 - }, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = 10; - pixel_y = 1 - }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/computer/security/terminal/public{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline/service, /obj/item/radio/intercom/east, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/industrial/hatch_small/service, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "hOQ" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 @@ -64279,7 +64329,7 @@ /area/horizon/crew/emergency_closet/deck_2/starboard) "isQ" = ( /turf/simulated/wall/r_wall, -/area/horizon/crew/journalistoffice) +/area/horizon/crew/media_office) "isZ" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -65284,14 +65334,12 @@ /turf/space, /area/template_noop) "izm" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain/black{ dir = 1 }, -/obj/structure/machinery/light_switch/north{ - pixel_x = -6 - }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/table/glass, +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "izo" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/industrial/warning{ @@ -68295,15 +68343,8 @@ /turf/space, /area/horizon/exterior) "iTG" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 9 - }, -/obj/structure/closet/walllocker/medical/firstaid{ - pixel_x = -32 - }, -/obj/effect/floor_decal/industrial/outline/medical, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/port) +/turf/simulated/wall, +/area/horizon/crew/media_office) "iTL" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -71533,11 +71574,17 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "jpo" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 4 +/obj/effect/floor_decal/industrial/outline_door/service{ + dir = 1 }, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/crew/media_office) "jpp" = ( /obj/structure/machinery/maneuvering_engine, /obj/effect/landmark/entry_point/aft{ @@ -72840,8 +72887,28 @@ /turf/unsimulated/floor/monotile, /area/antag/raider) "jyb" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/crew/journalistoffice) +/obj/structure/machinery/papershredder{ + pixel_x = 6 + }, +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = -9; + pixel_y = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_corner/grey, +/obj/structure/noticeboard{ + desc = "A board for uncovering hidden conspiracies."; + name = "corkboard"; + pixel_x = -32 + }, +/obj/effect/floor_decal/industrial/hatch_small/grey, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "jyc" = ( /obj/structure/shuttle_part/scc/mining{ icon_state = "7,9" @@ -82048,6 +82115,16 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/shuttle/intrepid/flight_deck) +"kFv" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/structure/coatrack{ + pixel_x = 12; + pixel_y = 4 + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "kFB" = ( /obj/structure/table/stone/marble, /obj/item/flame/candle, @@ -86682,12 +86759,21 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/hallway) "lkz" = ( -/obj/effect/floor_decal/corner/dark_green{ +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/structure/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/port) +/obj/structure/machinery/requests_console/east{ + department = "Media Office"; + departmentType = 1; + name = "Media Office Requests Console" + }, +/obj/item/modular_computer/laptop/preset/loadout{ + pixel_y = -5; + pixel_x = 1 + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "lkD" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, /obj/structure/flora/ausbushes/ywflowers, @@ -87569,10 +87655,6 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/obj/structure/closet/walllocker/firecloset{ - pixel_x = -32 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -88823,14 +88905,10 @@ /turf/space/transit/north, /area/template_noop) "lAw" = ( -/obj/structure/table/wood, -/obj/item/taperecorder, -/obj/item/paper/stickynotes/pad/random{ - pixel_x = 10; - pixel_y = -3 - }, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/obj/structure/machinery/hologram/holopad, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "lAx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -89233,11 +89311,24 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/checkpoint2) "lDo" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "journalist" +/obj/structure/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 + }, +/obj/structure/machinery/door/airlock/service{ + dir = 1; + name = "Media Office"; + req_access = list(70); + id_tag = "media_office_door" }, /turf/simulated/floor/tiled/dark/full, -/area/horizon/crew/journalistoffice) +/area/horizon/crew/media_office) "lDp" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -90958,10 +91049,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/structure/closet/walllocker/firecloset{ - pixel_x = -32 - }, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "lNR" = ( @@ -91623,9 +91710,10 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior/no_shields) "lTT" = ( -/obj/structure/machinery/photocopier, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/obj/structure/machinery/hologram/holopad/long_range, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "lTU" = ( /obj/structure/machinery/conveyor{ dir = 8 @@ -94707,15 +94795,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port) @@ -95249,14 +95337,14 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, -/obj/structure/machinery/firealarm/north, /obj/structure/sign/directions/security{ dir = 1; pixel_y = 41 }, -/obj/structure/machinery/light/floor{ - dir = 1 +/obj/structure/closet/walllocker/medical/firstaid{ + pixel_y = 32 }, +/obj/effect/floor_decal/industrial/outline/medical, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "mru" = ( @@ -95465,6 +95553,14 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) +"msL" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/port) "msS" = ( /obj/effect/floor_decal/corner/lime/full{ dir = 8 @@ -99853,6 +99949,16 @@ icon_state = "dark_preview" }, /area/centcom/specops) +"mXy" = ( +/obj/structure/grille, +/obj/structure/machinery/door/firedoor, +/obj/structure/window/shuttle/scc_space_ship/cardinal, +/obj/structure/machinery/door/blast/shutters/open{ + name = "Window Shutter"; + id = "media_office_window_shutter" + }, +/turf/simulated/floor/plating, +/area/horizon/crew/media_office) "mXF" = ( /obj/structure/machinery/door/blast/regular/open{ id = "r_ust_core_blast"; @@ -103484,19 +103590,30 @@ }, /area/horizon/holodeck/source_moghes) "nwX" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 +/obj/structure/bed/stool/chair{ + dir = 4 }, -/obj/structure/coatrack{ - pixel_x = -10; - pixel_y = 24 +/obj/effect/floor_decal/industrial/hatch_tiny/grey, +/obj/effect/floor_decal/industrial/outline_corner/grey{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/structure/machinery/alarm/west, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/machinery/light_switch/idris{ + dir = 1; + pixel_y = 32; + pixel_x = 7 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "nwZ" = ( /obj/structure/cable, /obj/structure/machinery/power/terminal{ @@ -105175,9 +105292,6 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/maintenance/deck_1/auxatmos) "nIa" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 1 - }, /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, @@ -106756,14 +106870,12 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/chemistry) "nRY" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 +/obj/effect/floor_decal/spline/plain/black, +/obj/structure/window/reinforced/polarized{ + id = "media_office_private_tint" }, -/obj/effect/landmark/start{ - name = "Corporate Reporter" - }, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "nSf" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -109823,16 +109935,23 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/hallway/primary/deck_3/port/docks) "onA" = ( -/obj/structure/disposalpipe/segment/mainline{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 8; + name = "Media Office"; + sortType = "Journalist" + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port) @@ -113920,12 +114039,28 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/surgery) "oOn" = ( -/obj/structure/machinery/firealarm/west, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/structure/machinery/chemical_dispenser/coffee/full{ + pixel_y = 7; + pixel_x = -3 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/table/glass, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass{ + pixel_x = -7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass{ + pixel_x = -5 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/floor_decal/industrial/hatch_tiny/grey, +/obj/structure/machinery/camera/network/service{ + c_tag = "Service - Media Office"; + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "oOv" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/cable/green{ @@ -116847,6 +116982,12 @@ }, /turf/unsimulated/floor/wood, /area/centcom/evac) +"piq" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "pir" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -123371,11 +123512,9 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "qaS" = ( -/obj/structure/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/structure/table/glass, +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "qaV" = ( /obj/structure/machinery/alarm/west, /obj/effect/floor_decal/industrial/warning{ @@ -128144,17 +128283,14 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "qHa" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/effect/floor_decal/spline/plain/black{ + dir = 9 }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/bed/stool/chair/office/bridge/pilot{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "qHe" = ( /obj/random/maintenance_junk_or_loot, /turf/simulated/floor/tiled/dark, @@ -129545,21 +129681,14 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/reception) "qOL" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen{ - pixel_x = -4 +/obj/structure/bed/stool/chair/office/bridge/pilot{ + dir = 4 }, -/obj/item/pen/red{ - pixel_x = -1; - pixel_y = 4 +/obj/effect/floor_decal/spline/plain/black{ + dir = 8 }, -/obj/item/pen/blue{ - pixel_x = 3; - pixel_y = 7 - }, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "qOO" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 @@ -135089,9 +135218,17 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/hallway/upper) "rzb" = ( -/obj/structure/machinery/hologram/holopad, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "rzf" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -137329,24 +137466,22 @@ /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "rOC" = ( -/obj/effect/map_effect/door_helper/unres, -/obj/structure/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/bed/stool/chair/office/dark, +/obj/effect/landmark/start{ + name = "Corporate Reporter" }, -/obj/effect/floor_decal/industrial/hatch_door/yellow{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/obj/structure/machinery/door/airlock/service{ - dir = 1; - name = "Journalist's Office"; - req_access = list(70) +/obj/structure/machinery/controlhub/media_office{ + pixel_x = 32 }, -/turf/simulated/floor/tiled/full, -/area/horizon/crew/journalistoffice) +/obj/structure/machinery/power/outlet{ + pixel_x = 42; + pixel_y = 7 + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "rOF" = ( /obj/structure/machinery/door/airlock/glass_security{ dir = 1; @@ -138411,11 +138546,11 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "rUt" = ( -/obj/structure/grille, -/obj/structure/machinery/door/firedoor, -/obj/structure/window/shuttle/scc_space_ship/cardinal, -/turf/simulated/floor/plating, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "rUz" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -147555,18 +147690,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/storage/tech) "tdp" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 9 - }, -/obj/structure/machinery/newscaster/west, -/obj/structure/sink/kitchen{ - dir = 4; - name = "water fountain"; - pixel_x = -20 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_3/port) +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "tdC" = ( /obj/structure/machinery/telecomms/server/presets/engineering, /turf/simulated/floor/bluegrid, @@ -155670,6 +155797,16 @@ }, /turf/simulated/floor/plating, /area/horizon/shuttle/quark/cockpit) +"ugJ" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/structure/machinery/firealarm/south, +/obj/effect/floor_decal/industrial/outline_segment/service{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/port) "ugK" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -157889,9 +158026,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/service/cafeteria) "uuy" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/machinery/vending/zora, /turf/simulated/floor/tiled/dark/full, @@ -161625,13 +161759,23 @@ /turf/unsimulated/floor, /area/centcom/ferry) "uSG" = ( +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_tiny/grey, +/obj/effect/floor_decal/industrial/outline_corner/grey, /obj/structure/machinery/power/apc/west, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ dir = 8 }, -/obj/structure/cable/green, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "uSI" = ( /obj/structure/ladder{ pixel_y = 8 @@ -162110,14 +162254,11 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/legion) "uVF" = ( -/obj/structure/machinery/requests_console/east{ - department = "Journalist's Office" - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "uVH" = ( /turf/simulated/wall/r_wall, /area/horizon/engineering/atmos/storage) @@ -166064,19 +166205,20 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hangar/control) "vxJ" = ( -/obj/structure/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Journalist Office"; - dir = 1 +/obj/structure/machinery/photocopier, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 4 }, -/obj/random/pottedplant, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/industrial/outline_segment/grey{ dir = 10 }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/obj/effect/floor_decal/industrial/outline_corner/grey{ + dir = 1 + }, +/obj/structure/machinery/alarm/west, +/obj/effect/floor_decal/industrial/hatch_small/grey, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "vxM" = ( /obj/structure/reagent_dispensers/lube, /turf/simulated/floor/tiled, @@ -170257,6 +170399,31 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/presentation) +"vZV" = ( +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/machinery/newscaster/east, +/obj/structure/machinery/light, +/obj/item/clipboard{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/pen/multi{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/paper/stickynotes/pad/random{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/simulated/floor/wood, +/area/horizon/crew/media_office) "wad" = ( /obj/structure/railing/mapped, /obj/structure/platform/ledge{ @@ -171907,6 +172074,14 @@ }, /turf/simulated/floor/tiled, /area/horizon/operations/lobby) +"wkv" = ( +/obj/effect/floor_decal/industrial/outline/service, +/obj/structure/machinery/light, +/obj/structure/closet/secure_closet/journalist, +/obj/structure/machinery/firealarm/west, +/obj/effect/floor_decal/industrial/hatch_tiny/service, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew/media_office) "wkz" = ( /turf/unsimulated/floor, /area/centcom/holding) @@ -173642,22 +173817,15 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/reactor/supermatter/waste) "wul" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 8; - name = "Journalist"; - sortType = "Journalist" - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/structure/disposalpipe/segment/mainline{ + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -174306,7 +174474,6 @@ /area/horizon/rnd/xenobiology/xenoflora) "wyn" = ( /obj/effect/floor_decal/corner/dark_green/full, -/obj/structure/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "wyq" = ( @@ -178049,20 +178216,12 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "wVx" = ( -/obj/structure/machinery/disposal/small/north{ - pixel_y = -17 +/obj/structure/table/glass, +/obj/effect/floor_decal/spline/plain/black{ + dir = 8 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/horizon/crew/journalistoffice) +/turf/simulated/floor/carpet/rubber, +/area/horizon/crew/media_office) "wVz" = ( /obj/effect/floor_decal/corner/grey{ dir = 9 @@ -179551,6 +179710,13 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/medical/ward) +"xeH" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 5 + }, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/port) "xeI" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -183360,14 +183526,6 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/unsimulated/floor, /area/centcom/holding) -"xFm" = ( -/obj/structure/table/wood, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = 2 - }, -/turf/simulated/floor/carpet, -/area/horizon/crew/journalistoffice) "xFx" = ( /obj/structure/machinery/optable, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -357721,16 +357879,16 @@ xMK bTU nKL bTU -aCj -aCj -aCj +iTG +iTG +iTG isQ isQ isQ -jyb -upn -upn -cKu +isQ +isQ +cfg +dQL cKu nCB tEl @@ -357977,16 +358135,16 @@ duG xMK oBD mnA -hWB -lDo +ugJ +iTG nwX fTH uSG oOn vxJ jyb -cKu -dQL +wkv +cfg cKu cKu nCB @@ -358232,18 +358390,18 @@ bCA osd eZO fvq -lkz +pho onA -pKn +hym lDo dxP bOy rzb -jpo +hgN jpo rUt -cKu -cKu +kFv +mXy cKu cKu nCB @@ -358489,18 +358647,18 @@ pHk bCA dOC ruF -pho +xeH wul cvA -rOC +aCj qHa wVx qOL fsQ lAw -rUt -cKu -dQL +piq +eNX +mXy cKu cKu nCB @@ -358749,15 +358907,15 @@ ucN pho hGQ pKn -lDo +aCj izm qaS -xFm +qaS nRY lTT -rUt -cKu -cKu +rOC +tdp +mXy cKu cKu cKu @@ -359006,15 +359164,15 @@ xMK dUu hGQ pKn -lDo +aCj cvP hLr uVF hjI hOO -jyb -cKu -dQL +lkz +vZV +cfg cKu cKu cKu @@ -359262,15 +359420,15 @@ oRv xMK mrr hGQ -pKn -aCj -aCj +fUZ +iTG aCj aCj aCj +iTG +isQ +isQ isQ -jyb -pNG cfg aBR jzO @@ -359520,8 +359678,8 @@ rsN bVr jDW mqU -tdp -iTG +lNN +lNN lNN wyn dBf @@ -359774,7 +359932,7 @@ hBZ pmK pmK jgd -pho +msL bPI yer qUJ