From 224acea24ad9f8d5dd1a40ee3255c9372e8cf523 Mon Sep 17 00:00:00 2001 From: alberyk Date: Fri, 24 Sep 2021 01:40:00 -0300 Subject: [PATCH] tweaks --- .../crates_lockers/closets/secure/security.dm | 10 ++++----- .../computers/subtypes/preset_laptop.dm | 2 +- maps/placeholder/placeholder-1_deck_1.dmm | 8 +++---- maps/placeholder/placeholder-2_deck_2.dmm | 10 ++++----- maps/placeholder/placeholder-3_deck_3.dmm | 21 ++++++------------- 5 files changed, 21 insertions(+), 30 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 72d1cb2a28c..5b9a95d27d1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -65,7 +65,7 @@ icon_broken = "hopsecurebroken" icon_off = "hopsecureoff" -/obj/structure/closet/secure_closet/hop/fill() +/obj/structure/closet/secure_closet/xo/fill() ..() //Supply new /obj/item/storage/box/ids(src) @@ -86,7 +86,7 @@ new /obj/item/gun/projectile/sec/flash(src) new /obj/item/device/flash(src) -/obj/structure/closet/secure_closet/xo +/obj/structure/closet/secure_closet/xo2 name = "executive officer's attire" req_access = list(access_hop) icon_state = "hopsecure1" @@ -96,7 +96,7 @@ icon_broken = "hopsecurebroken" icon_off = "hopsecureoff" -/obj/structure/closet/secure_closet/hop2/fill() +/obj/structure/closet/secure_closet/xo2/fill() ..() new /obj/item/clothing/under/rank/xo(src) new /obj/item/clothing/under/lawyer/black(src) @@ -442,7 +442,7 @@ icon_broken = "hopsecurebroken" icon_off = "hopsecureoff" -/obj/structure/closet/bridge_crew/hop/fill() +/obj/structure/closet/bridge_crew/fill() ..() new /obj/item/clothing/under/rank/bridge_crew(src) new /obj/item/clothing/glasses/sunglasses(src) @@ -461,7 +461,7 @@ icon_broken = "hopsecurebroken" icon_off = "hopsecureoff" -/obj/structure/closet/bridge_crew/pilot/fill() +/obj/structure/closet/secure_closet/pilot/fill() ..() new /obj/item/clothing/under/rank/bridge_crew(src) new /obj/item/clothing/glasses/sunglasses(src) diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index 35afa514d58..b1e911cd88c 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -76,7 +76,7 @@ desc = "A portable computer beloning to the executive officer. The fan is filled with dog hair." _app_preset_type = /datum/modular_computer_app_presets/command/hop -/obj/item/modular_computer/laptop/preset/command/hop/install_default_hardware() +/obj/item/modular_computer/laptop/preset/command/xo/install_default_hardware() ..() card_slot = new /obj/item/computer_hardware/card_slot(src) diff --git a/maps/placeholder/placeholder-1_deck_1.dmm b/maps/placeholder/placeholder-1_deck_1.dmm index ea4fbce707c..10ebc5611ba 100644 --- a/maps/placeholder/placeholder-1_deck_1.dmm +++ b/maps/placeholder/placeholder-1_deck_1.dmm @@ -4,7 +4,7 @@ "abh" = (/obj/structure/railing/mapped{dir = 8},/obj/effect/floor_decal/spline/plain{dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering) "abQ" = (/obj/machinery/conveyor{dir = 4; id = "cargo_1"; layer = 2.9},/turf/simulated/floor/plating,/area/quartermaster/storage) "acn" = (/obj/structure/window/shuttle/scc,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/shuttle/escape_pod) -"acp" = (/obj/structure/closet{name = "placeholder pilots closet"},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/tiled/dark,/area/hangar/control) +"acp" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/outline,/obj/structure/closet/secure_closet/pilot,/turf/simulated/floor/tiled/dark,/area/hangar/control) "acY" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/storage/eva) "adj" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/janitorialcart/full{dir = 8},/turf/simulated/floor/tiled,/area/janitor) "adX" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/unsimulated/floor/plating,/area/hangar/auxiliary) @@ -1492,7 +1492,7 @@ "nto" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 10},/obj/structure/lattice,/turf/space/dynamic,/area/template_noop) "ntJ" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 9},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion/starboard) "nuj" = (/obj/machinery/door/window/southleft,/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/junction{dir = 2; icon_state = "pipe-j2"},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/eva) -"nup" = (/obj/structure/closet{name = "placeholder pilots closet"},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/industrial/outline,/obj/machinery/newscaster{pixel_y = 30},/turf/simulated/floor/tiled/dark,/area/hangar/control) +"nup" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/industrial/outline,/obj/machinery/newscaster{pixel_y = 30},/obj/structure/closet/secure_closet/pilot,/turf/simulated/floor/tiled/dark,/area/hangar/control) "nvV" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{id_tag = "researchdoor"; name = "Research Division Access"; req_access = list(47)},/turf/simulated/floor/tiled,/area/rnd/xenoarch_atrium) "nwp" = (/obj/structure/lattice/catwalk/indoor/grate,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/research_port) "nwI" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/obj/structure/tank_wall/nitrogen{icon_state = "n13"},/turf/simulated/floor/plating,/area/engineering/atmos/air) @@ -1957,7 +1957,7 @@ "rBR" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{icon_state = "4-8"},/obj/structure/lattice/catwalk/indoor/grate,/turf/simulated/floor/plating,/area/rnd/xenoarch_atrium) "rCl" = (/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{dir = 8; frequency = 1441; id_tag = "n_out"},/turf/simulated/floor/reinforced/nitrogen,/area/engineering/atmos/air) "rDE" = (/obj/machinery/atmospherics/pipe/simple/visible/black,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/hatch{name = "Propulsion"; req_access = list(10)},/turf/simulated/floor/tiled/dark,/area/engineering/atmos/propulsion) -"rEl" = (/obj/structure/closet{name = "placeholder pilots closet"},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/outline,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 22},/turf/simulated/floor/tiled/dark,/area/hangar/control) +"rEl" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/outline,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 22},/obj/structure/closet/secure_closet/pilot,/turf/simulated/floor/tiled/dark,/area/hangar/control) "rGy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/medical/morgue/lower) "rHi" = (/obj/structure/bed/chair/shuttle{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 9},/turf/simulated/floor/carpet/rubber,/area/shuttle/escape_pod) "rHr" = (/obj/machinery/conveyor{dir = 4; id = "cargo_1"; layer = 2.9},/turf/simulated/floor/plating,/area/quartermaster/loading) @@ -2320,7 +2320,7 @@ "uZm" = (/obj/structure/cable/green{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hangar/auxiliary) "uZN" = (/obj/structure/cable/green{icon_state = "1-4"},/obj/effect/floor_decal/corner/black{dir = 9},/turf/simulated/floor/tiled,/area/hangar/intrepid) "uZU" = (/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos,/turf/simulated/floor/reinforced,/area/engineering/atmos/propulsion/starboard) -"vai" = (/obj/structure/closet{name = "placeholder pilots closet"},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/industrial/outline,/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/dark,/area/hangar/control) +"vai" = (/obj/effect/floor_decal/industrial/outline,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/closet/secure_closet/pilot,/turf/simulated/floor/tiled/dark,/area/hangar/control) "vat" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/lattice/catwalk/indoor/grate,/obj/structure/railing/mapped{dir = 4},/obj/structure/railing/mapped{dir = 8},/obj/machinery/door/window/brigdoor/northright,/turf/simulated/floor/plating,/area/maintenance/cargo) "vbv" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/tank_wall/carbon_dioxide{icon_state = "co2-4"},/turf/simulated/floor/airless,/area/engineering/atmos) "vbD" = (/obj/effect/floor_decal/corner_wide/purple{dir = 5},/obj/effect/floor_decal/corner_wide/purple{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenoarch_atrium) diff --git a/maps/placeholder/placeholder-2_deck_2.dmm b/maps/placeholder/placeholder-2_deck_2.dmm index 057b9dc0ce1..e78cf5ce1fa 100644 --- a/maps/placeholder/placeholder-2_deck_2.dmm +++ b/maps/placeholder/placeholder-2_deck_2.dmm @@ -748,7 +748,7 @@ "eCR" = (/obj/structure/closet/secure_closet/hos,/obj/item/device/multitool,/obj/item/reagent_containers/spray/pepper,/obj/item/clothing/suit/space/void/hos,/obj/item/clothing/head/helmet/space/void/hos,/obj/item/clothing/shoes/magboots,/obj/item/tank/oxygen,/obj/machinery/alarm{pixel_y = 28; target_temperature = 278},/obj/item/device/radio,/obj/item/device/taperecorder,/obj/item/device/flashlight/heavy,/obj/item/device/megaphone/sec,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "eDf" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/engineering_electrical,/obj/item/device/debugger,/turf/simulated/floor/tiled,/area/engineering/storage_eva) "eDK" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{icon_state = "1-2"},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/bar) -"eDW" = (/obj/structure/closet/secure_closet/cargotech,/obj/machinery/camera/network/supply{c_tag = "Cargo - Upper Warehouse"; dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"eDW" = (/obj/structure/closet/secure_closet/hangartech,/obj/machinery/camera/network/supply{c_tag = "Cargo - Upper Warehouse"; dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/storage) "eEr" = (/obj/machinery/door/window/brigdoor/northleft{dir = 2; req_access = list(58)},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/status_display{layer = 4; pixel_y = 32},/mob/living/simple_animal/hostile/commanded/dog/columbo,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "eEx" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/dark,/area/crew_quarters/bar) "eED" = (/obj/structure/cable/green{icon_state = "2-8"},/obj/machinery/light/small/emergency{dir = 4},/obj/machinery/alarm{pixel_y = 28; target_temperature = 278},/turf/simulated/floor/plating,/area/maintenance/substation/wing_port) @@ -1997,7 +1997,7 @@ "mpD" = (/obj/structure/cable/green{icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled,/area/engineering/storage_hard) "mpV" = (/obj/structure/cable/green{icon_state = "4-8"},/obj/structure/cable/green{icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled,/area/storage/primary) "mpX" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/storage) -"mqj" = (/obj/structure/closet/secure_closet/cargotech,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"mqj" = (/obj/structure/closet/secure_closet/hangartech,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage) "mqn" = (/obj/machinery/pipedispenser,/obj/machinery/light{dir = 4},/obj/machinery/newscaster{pixel_x = 29},/obj/effect/floor_decal/industrial/outline/red,/turf/simulated/floor/tiled/dark,/area/engineering/atmos/storage) "mqq" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/tiled,/area/hallway/engineering) "mrq" = (/obj/effect/map_effect/wingrille_spawn/reinforced_phoron,/obj/structure/sign/pharmacy,/obj/machinery/door/blast/shutters{dir = 8; id = "CHE2shutters"; name = "Pharmacy Window Shutters"},/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "LCKDshutters"; name = "MedBay Lockdown Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/pharmacy) @@ -2178,7 +2178,7 @@ "nqy" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/engineering/engine_room/tesla) "nrr" = (/obj/effect/floor_decal/corner/blue{dir = 10},/obj/item/device/radio/intercom{pixel_y = -27},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/brig) "nru" = (/obj/machinery/firealarm/south,/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/security/armory) -"nry" = (/obj/structure/closet/secure_closet/quartermaster,/obj/machinery/camera/network/supply{c_tag = "Cargo - Quartermaster's Office"; dir = 4},/turf/simulated/floor/wood,/area/quartermaster/qm) +"nry" = (/obj/structure/closet/secure_closet/operation_manager,/obj/machinery/camera/network/supply{c_tag = "Cargo - Quartermaster's Office"; dir = 4},/turf/simulated/floor/wood,/area/quartermaster/qm) "nsx" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/maintenance/wing/starboard/far) "ntn" = (/obj/structure/railing/mapped{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/dark,/area/turret_protected/ai_upload_foyer) "nts" = (/obj/structure/window/shuttle/scc_space_ship,/obj/structure/grille,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/crew_quarters/cafeteria) @@ -3121,7 +3121,7 @@ "thJ" = (/obj/machinery/door/window/southright,/turf/simulated/floor/tiled,/area/assembly/robotics) "thL" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/carpet/rubber,/area/server) "tiz" = (/obj/structure/bed/chair/plastic{dir = 4},/obj/machinery/light{dir = 8},/obj/effect/floor_decal/corner_wide/lime{dir = 9},/obj/machinery/computer/guestpass{pixel_x = -30},/turf/simulated/floor/tiled/white,/area/medical/reception) -"tiD" = (/obj/structure/closet/secure_closet/cargotech,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 21; pixel_y = -13},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"tiD" = (/obj/structure/closet/secure_closet/hangartech,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 21; pixel_y = -13},/turf/simulated/floor/tiled,/area/quartermaster/storage) "tiF" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light,/obj/machinery/camera/network/service{c_tag = "Dinner - Hydroponics 1"; dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/hydroponics) "tiJ" = (/obj/effect/map_effect/wingrille_spawn/reinforced_phoron,/turf/simulated/floor/plating,/area/engineering/engine_monitoring/tesla) "tiV" = (/obj/effect/floor_decal/corner/mauve/diagonal,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/grey{dir = 8},/obj/effect/floor_decal/spline/plain{dir = 9},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/hor) @@ -3965,7 +3965,7 @@ "yef" = (/obj/structure/cable/green{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/main) "yeh" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/machinery/newscaster{pixel_x = 29},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) "yej" = (/obj/effect/floor_decal/corner_wide/lime{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception) -"yeF" = (/obj/structure/closet/secure_closet/cargotech,/obj/machinery/alarm{dir = 8; pixel_x = 28},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"yeF" = (/obj/structure/closet/secure_closet/hangartech,/obj/machinery/alarm{dir = 8; pixel_x = 28},/turf/simulated/floor/tiled,/area/quartermaster/storage) "yeT" = (/obj/effect/floor_decal/corner/blue{dir = 5},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/armory) "yeY" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/obj/structure/window/reinforced,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/computer/atmoscontrol/laptop{monitored_alarm_ids = list("1601"); name = "Hazardous Specimens Atmospheric Controls"; pixel_x = -2; req_access = null; req_one_access = list(55,24,11)},/obj/structure/table/standard,/obj/structure/sign/biohazard{pixel_x = 32; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology/xenoflora) "yfo" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hydroponics) diff --git a/maps/placeholder/placeholder-3_deck_3.dmm b/maps/placeholder/placeholder-3_deck_3.dmm index f59dd0308c4..4e5fdcf63f3 100644 --- a/maps/placeholder/placeholder-3_deck_3.dmm +++ b/maps/placeholder/placeholder-3_deck_3.dmm @@ -516,7 +516,7 @@ /turf/simulated/floor, /area/hallway/primary/starboard) "bg" = ( -/obj/structure/closet/secure_closet/hop2, +/obj/structure/closet/secure_closet/xo, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "bh" = ( @@ -4407,9 +4407,7 @@ /area/bridge/aibunker) "kR" = ( /obj/structure/bed/padded, -/obj/item/bedsheet/hop{ - name = "executive officer's bedsheet" - }, +/obj/item/bedsheet/xo, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "kT" = ( @@ -4553,10 +4551,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"lm" = ( -/obj/structure/closet/secure_closet/hop, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hop/xo) "lo" = ( /obj/effect/floor_decal/corner/paleblue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7633,7 +7627,7 @@ "sY" = ( /obj/structure/table/wood, /obj/item/folder/blue, -/obj/item/stamp/hop, +/obj/item/stamp/xo, /obj/item/stamp/denied, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) @@ -9108,7 +9102,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/hand_tele, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "xi" = ( @@ -14718,7 +14712,6 @@ pixel_y = 25 }, /obj/structure/table/wood, -/obj/item/storage/secure/briefcase, /obj/item/storage/photo_album, /obj/item/device/camera, /obj/item/reagent_containers/food/drinks/flask{ @@ -17940,9 +17933,7 @@ "TL" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/modular_computer/laptop/preset/command/hop{ - name = "executive officer''s laptop" - }, +/obj/item/modular_computer/laptop/preset/command/xo, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "TM" = ( @@ -44114,7 +44105,7 @@ vn mS yr XY -lm +Dd bg Vi at