From 2850b5c35b179a3b95d235ca3e232e83768b53b9 Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Wed, 8 Mar 2023 14:24:09 -0600 Subject: [PATCH 1/3] Removed Exploration job, added renewable asteroids, updated maps --- _maps/map_files/BoxStation/BoxStation.dmm | 1515 ++++------------- _maps/map_files/HoleStation/holestation.dmm | 97 +- _maps/map_files/MetaStation/MetaStation.dmm | 999 ++--------- _maps/map_files/PubbyStation/PubbyStation.dmm | 448 +---- beestation.dme | 2 +- code/__DEFINES/access.dm | 2 +- code/__DEFINES/jobs.dm | 16 +- .../subsystem/processing/orbits.dm | 138 +- code/controllers/subsystem/zclear.dm | 5 + .../circuitboards/computer_circuitboards.dm | 10 +- .../exploration_crew/exploration_shuttle.dm | 15 +- .../exploration_crew/exploration_vendor.dm | 7 +- code/modules/jobs/access.dm | 10 +- .../jobs/job_types/head_of_personnel.dm | 4 +- code/modules/jobs/job_types/quartermaster.dm | 4 +- .../jobs/job_types/research_director.dm | 4 +- code/modules/jobs/job_types/scientist.dm | 4 +- code/modules/jobs/jobs.dm | 2 +- .../research/designs/comp_board_designs.dm | 15 +- .../objective_computer.dm | 44 +- .../ruin_generator/ruin_generator.dm | 6 +- .../ruin_generator/ruin_part_loader.dm | 4 +- 22 files changed, 765 insertions(+), 2586 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 25b911cd99928..7a3521cb336b6 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7066,16 +7066,6 @@ "aph" = ( /turf/closed/wall, /area/lawoffice) -"apn" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "app" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -8106,7 +8096,7 @@ /turf/open/floor/plasteel/dark/side{ dir = 4 }, -/area/medical/office) +/area/medical/storage) "ate" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -8525,17 +8515,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"auN" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "auP" = ( /turf/open/floor/plating, /area/hallway/secondary/entry) @@ -21118,7 +21097,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/science/lab) +/area/hallway/primary/starboard) "bgc" = ( /turf/closed/wall/r_wall, /area/science/lab) @@ -21592,7 +21571,7 @@ /obj/structure/closet/secure_closet/medical1, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/medical/office) +/area/medical/storage) "bhp" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "cmoshutter"; @@ -25114,6 +25093,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/grid/steel, /area/science/research) "brq" = ( @@ -25130,7 +25112,7 @@ /area/hydroponics/garden) "brv" = ( /turf/open/floor/plasteel, -/area/medical/office) +/area/medical/storage) "brG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -25553,6 +25535,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/grid/steel, /area/science/research) "btc" = ( @@ -25810,7 +25795,9 @@ /obj/machinery/power/apc/auto_name/west{ pixel_x = -24 }, -/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/yellowsiding{ dir = 8 }, @@ -30551,7 +30538,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "bId" = ( /obj/effect/landmark/start/medical_doctor, /obj/structure/cable/yellow{ @@ -31287,7 +31274,7 @@ /turf/open/floor/plasteel/dark/side{ dir = 8 }, -/area/medical/office) +/area/medical/storage) "bKI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -31335,7 +31322,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/window, /turf/open/floor/plating, -/area/medical/office) +/area/medical/storage) "bKP" = ( /obj/machinery/door/window/westleft{ name = "Delivery Desk"; @@ -31783,7 +31770,7 @@ /turf/open/floor/plasteel/dark/side{ dir = 4 }, -/area/medical/office) +/area/medical/storage) "bMe" = ( /obj/effect/turf_decal/tile/blue/tile_full, /obj/machinery/chem_heater, @@ -32683,7 +32670,7 @@ /area/science/misc_lab) "bPu" = ( /turf/open/floor/plasteel/dark, -/area/medical/office) +/area/medical/storage) "bPx" = ( /obj/machinery/disposal/bin, /obj/structure/sign/warning/deathsposal{ @@ -38511,7 +38498,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/window, /turf/open/floor/plating, -/area/security/checkpoint/medical) +/area/medical/medbay/central) "clt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -39354,26 +39341,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/closed/wall/r_wall, /area/maintenance/aft) -"coX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/suit_storage_unit/exploration, -/obj/item/radio/intercom{ - pixel_y = 22 - }, -/turf/open/floor/plasteel, -/area/quartermaster/exploration_prep) "cpb" = ( /obj/structure/closet/emcloset, /obj/machinery/light/small{ @@ -40702,7 +40669,7 @@ "cvI" = ( /obj/structure/sign/departments/minsky/medical/medical2, /turf/closed/wall, -/area/medical/office) +/area/medical/storage) "cvK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40781,7 +40748,7 @@ "cvV" = ( /obj/effect/turf_decal/tile/blue/tile_full, /turf/open/floor/plasteel, -/area/medical/office) +/area/medical/storage) "cvW" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -40791,7 +40758,7 @@ pixel_x = 22 }, /turf/open/floor/plasteel/dark, -/area/medical/office) +/area/medical/storage) "cvX" = ( /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) @@ -40822,7 +40789,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/medical/office) +/area/medical/storage) "cwe" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -40847,7 +40814,7 @@ /turf/open/floor/plasteel/dark/side{ dir = 8 }, -/area/medical/office) +/area/medical/storage) "cwg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40860,7 +40827,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/medical/office) +/area/medical/storage) "cwh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40872,7 +40839,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/office) +/area/medical/storage) "cwj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40886,7 +40853,7 @@ /turf/open/floor/plasteel/dark/side{ dir = 4 }, -/area/medical/office) +/area/medical/storage) "cwk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40895,7 +40862,7 @@ dir = 9 }, /turf/open/floor/plasteel/dark, -/area/medical/office) +/area/medical/storage) "cwl" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -41092,13 +41059,6 @@ /obj/effect/landmark/start/lawyer, /turf/open/floor/wood, /area/lawoffice) -"cxr" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/item/pickaxe, -/obj/item/mining_scanner, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "cxA" = ( /obj/effect/turf_decal/trimline/red/filled/warning, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -41435,7 +41395,7 @@ /obj/machinery/vending/wardrobe/medi_wardrobe, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, -/area/medical/office) +/area/medical/storage) "cAT" = ( /obj/structure/table_frame/wood, /turf/open/floor/plasteel/dark, @@ -42922,12 +42882,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/theatre/backstage) -"cRa" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "cRf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -43283,15 +43237,6 @@ }, /turf/open/floor/plasteel/techmaint, /area/science/xenobiology) -"cUo" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "cVb" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -43542,11 +43487,6 @@ /obj/effect/turf_decal/tile/yellow/tile_full, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"dil" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "diw" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -43607,7 +43547,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "djl" = ( /obj/machinery/door/airlock/medical/glass{ name = "Chemistry Factory"; @@ -43758,12 +43698,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) -"dnB" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/maintenance/starboard) "dnD" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -43835,10 +43769,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) -"drM" = ( -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "drU" = ( /obj/machinery/door/poddoor/preopen{ id = "heads_meeting"; @@ -44321,14 +44251,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/hallway/primary/port) -"dLB" = ( -/obj/machinery/telecomms/processor/preset_exploration, -/obj/machinery/airalarm/server{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/circuit/telecomms/server, -/area/quartermaster/exploration_dock) "dMg" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 5 @@ -44420,12 +44342,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/vacant_room/commissary/commissary2) -"dOV" = ( -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ - dir = 8 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "dPq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -44876,8 +44792,10 @@ /turf/open/floor/plasteel/grid/steel, /area/science/research) "eez" = ( -/turf/closed/wall, -/area/medical/office) +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating, +/area/maintenance/port/fore) "eeN" = ( /obj/structure/lattice/catwalk, /obj/structure/table, @@ -45287,19 +45205,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"equ" = ( -/obj/structure/window/reinforced/spawner{ - dir = 1 - }, -/obj/machinery/telecomms/server/presets/exploration, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 - }, -/turf/open/floor/circuit/telecomms/server, -/area/quartermaster/exploration_dock) "erE" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -45583,15 +45488,22 @@ /area/hallway/secondary/entry) "ezt" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/effect/spawner/room/fivexfour, +/obj/machinery/button/door{ + id = "commissarydoor4"; + name = "Clown Bedroom"; + normaldoorcontrol = 1; + pixel_x = -26; + pixel_y = -8; + specialfunctions = 4 + }, /turf/open/floor/plasteel/yellowsiding{ dir = 10 }, /area/vacant_room/commissary/commissary1) -"ezu" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "ezL" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -45636,9 +45548,6 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) -"eAu" = ( -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "eAL" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -45998,16 +45907,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft) -"eQc" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/quartermaster/exploration_dock) "eQq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -46347,7 +46246,7 @@ /obj/machinery/modular_fabricator/autolathe, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, -/area/science/lab) +/area/hallway/primary/starboard) "eZI" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -46414,12 +46313,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"fbf" = ( -/obj/machinery/light_switch{ - pixel_x = -22 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "fbn" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/exit/departure_lounge) @@ -46487,16 +46380,8 @@ /area/maintenance/starboard/aft) "fei" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/button/door{ - id = "commissarydoor4"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = 24; - specialfunctions = 4 +/obj/item/radio/intercom{ + pixel_x = -26 }, /turf/open/floor/plasteel/yellowsiding{ dir = 8 @@ -46949,16 +46834,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/break_room) -"fwx" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "fwC" = ( /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" @@ -47193,19 +47068,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"fGj" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/quartermaster/exploration_dock) "fGF" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -47282,15 +47144,6 @@ dir = 1 }, /area/quartermaster/office) -"fJe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "fJT" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -47393,7 +47246,7 @@ req_access_txt = "5" }, /turf/open/floor/plating, -/area/maintenance/aft) +/area/medical/virology) "fMx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -47428,7 +47281,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "fMR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47696,7 +47549,7 @@ /obj/effect/turf_decal/trimline/green/filled/warning, /obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "fWm" = ( /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, @@ -48160,16 +48013,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/chapel/main) -"gmf" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "gml" = ( /obj/structure/window/reinforced{ dir = 8 @@ -48307,10 +48150,6 @@ /obj/item/food/grown/banana, /turf/open/floor/grass, /area/crew_quarters/park) -"gpn" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/turf/open/floor/plating, -/area/maintenance/starboard) "gpE" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -48466,15 +48305,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/hallway/secondary/entry) -"gtJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_dock) "gui" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49256,9 +49086,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"gQd" = ( -/turf/closed/wall, -/area/quartermaster/exploration_dock) "gQt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49272,13 +49099,6 @@ "gQx" = ( /turf/closed/wall/r_wall, /area/science/robotics/mechbay) -"gQK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_dock) "gQQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -49798,9 +49618,6 @@ /area/security/detectives_office/private_investigators_office) "hhs" = ( /obj/structure/disposalpipe/segment, -/obj/item/radio/intercom{ - pixel_x = -26 - }, /turf/open/floor/plasteel/yellowsiding{ dir = 9 }, @@ -49869,12 +49686,6 @@ /obj/effect/turf_decal/tile/purple/tile_full, /turf/open/floor/plasteel/dark, /area/bridge) -"hjM" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "hkq" = ( /obj/structure/closet/secure_closet/security/sec{ anchored = 1 @@ -49893,10 +49704,6 @@ /obj/effect/spawner/lootdrop/minor/beret_or_rabbitears, /turf/open/floor/plasteel/vaporwave, /area/medical/medbay/central) -"hmb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "hms" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49960,7 +49767,7 @@ dir = 6 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "hpI" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -49980,7 +49787,7 @@ "hql" = ( /obj/structure/sign/departments/security, /turf/closed/wall, -/area/security/checkpoint/medical) +/area/medical/medbay/central) "hqp" = ( /obj/structure/table, /obj/machinery/firealarm{ @@ -50036,21 +49843,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"hrL" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "hsm" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/tile_full, @@ -50147,13 +49939,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/science/research) -"hyd" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "hyf" = ( /obj/effect/turf_decal/tile/blue/tile_full, /turf/closed/wall, @@ -50434,12 +50219,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"hJM" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "hKl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/brown/tile_marquee{ @@ -50684,13 +50463,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"hTu" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plating, -/area/quartermaster/exploration_dock) "hTH" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel" @@ -51210,7 +50982,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "ill" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -51358,18 +51130,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"iqY" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "irc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -51621,11 +51381,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/break_room) -"iyL" = ( -/obj/machinery/vendor/exploration, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "iyW" = ( /obj/effect/turf_decal/stripes/closeup, /obj/effect/turf_decal/caution/stand_clear, @@ -51635,15 +51390,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) -"izs" = ( -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "izv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -51659,23 +51405,6 @@ }, /turf/open/floor/plasteel/dark, /area/quartermaster/storage) -"izI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/suit_storage_unit/exploration, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "iAb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -52033,7 +51762,7 @@ dir = 10 }, /turf/open/space/basic, -/area/space/nearstation) +/area/space) "iNn" = ( /obj/structure/reagent_dispensers/cooking_oil, /obj/machinery/camera/autoname, @@ -52151,16 +51880,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/fore) -"iRI" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "iSq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/line{ @@ -53828,9 +53547,6 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) -"kch" = ( -/turf/closed/wall/r_wall, -/area/quartermaster/exploration_prep) "kcv" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -53861,22 +53577,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"kdl" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/techmaint, -/area/maintenance/starboard) "kdH" = ( /turf/closed/wall, /area/security/detectives_office/private_investigators_office) @@ -54281,7 +53981,7 @@ }, /obj/effect/turf_decal/tile/purple/tile_full, /turf/open/floor/plasteel/grid/steel, -/area/science/research) +/area/science/lab) "krr" = ( /obj/structure/sign/plaques/atmos{ pixel_y = -32 @@ -54359,15 +54059,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) -"ksB" = ( -/obj/machinery/light_switch{ - pixel_x = -22 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "ksT" = ( /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, @@ -54756,11 +54447,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"kFo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_dock) "kFS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -55126,7 +54812,7 @@ /obj/machinery/light, /obj/item/wrench/medical, /turf/open/floor/plasteel, -/area/medical/office) +/area/medical/storage) "kPd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55358,6 +55044,9 @@ /obj/effect/turf_decal/trimline/purple/line{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/grid/steel, /area/science/research) "kXz" = ( @@ -55391,16 +55080,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"kYc" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "kYt" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -55512,18 +55191,6 @@ /obj/item/crowbar, /turf/open/floor/plasteel/dark, /area/engine/break_room) -"lce" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "lcg" = ( /obj/machinery/vending/cola/random, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -56487,18 +56154,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel/techmaint, /area/science/mixing) -"lFj" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_x = -26 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "lFZ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -57079,7 +56734,7 @@ /turf/open/floor/plasteel/dark/side{ dir = 8 }, -/area/medical/office) +/area/medical/storage) "lTv" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 10 @@ -57152,13 +56807,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"lXn" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "lXD" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -57191,20 +56839,6 @@ /mob/living/simple_animal/bot/secbot/beepsky, /turf/open/floor/plasteel/dark, /area/security/brig) -"lXT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/plating, -/area/maintenance/starboard) "lYr" = ( /obj/structure/table/optable{ name = "Robotics Operating Table" @@ -57546,16 +57180,6 @@ /obj/effect/spawner/lootdrop/maintenance/seven, /turf/open/floor/plating, /area/maintenance/port/aft) -"miD" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/quartermaster/exploration_dock) "miF" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=HOP"; @@ -57735,19 +57359,6 @@ }, /turf/open/floor/plasteel/dark, /area/quartermaster/miningdock) -"mnE" = ( -/obj/machinery/door/airlock/hatch{ - name = "Exploration Telecommunications"; - req_access_txt = "61" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "mnN" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -57772,11 +57383,6 @@ }, /turf/closed/wall, /area/maintenance/aft) -"mov" = ( -/obj/machinery/door/firedoor/heavy, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/quartermaster/exploration_prep) "moA" = ( /obj/structure/window/spawner{ dir = 4 @@ -58120,16 +57726,9 @@ /turf/open/floor/plasteel/dark, /area/quartermaster/storage) "mBr" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) +/mob/living/simple_animal/chicken/turkey, +/turf/open/floor/plating, +/area/maintenance/starboard) "mCe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58246,10 +57845,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"mFI" = ( -/obj/structure/lattice, -/turf/closed/wall, -/area/quartermaster/exploration_dock) "mFV" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/stripes/line{ @@ -58811,15 +58406,6 @@ /obj/structure/falsewall, /turf/open/floor/wood, /area/lawoffice) -"mZC" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/techmaint, -/area/maintenance/starboard) "nab" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -59308,13 +58894,6 @@ /obj/effect/turf_decal/trimline/red/line, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) -"nsO" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "ntg" = ( /obj/machinery/telecomms/hub/preset, /obj/effect/turf_decal/tile/neutral{ @@ -59332,16 +58911,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"nuW" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/firealarm{ - pixel_y = -24 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "nvb" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/cigarette, @@ -59387,11 +58956,6 @@ }, /turf/open/space/basic, /area/space) -"nwC" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "nwZ" = ( /turf/open/floor/plasteel/dark, /area/hallway/primary/central) @@ -59553,19 +59117,6 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"nEE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 1; - name = "freezer passive vent" - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/quartermaster/exploration_dock) "nEP" = ( /obj/structure/closet/l3closet/scientist{ pixel_x = -2 @@ -59702,6 +59253,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/maintenance/fore) "nGP" = ( @@ -60108,21 +59662,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"nXo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "nYd" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "apothecary_shutters"; @@ -61151,17 +60690,6 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plasteel/white, /area/vacant_room/commissary/commissary2) -"oGf" = ( -/obj/machinery/door/airlock/science{ - name = "exploration preparation room"; - req_access_txt = "49" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/plasteel/grid/steel, -/area/maintenance/starboard) "oGP" = ( /obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk, @@ -61452,7 +60980,7 @@ /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/green/filled/warning, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "oVp" = ( /obj/machinery/piratepad/civilian, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -61550,7 +61078,7 @@ /area/medical/medbay/lobby) "oXE" = ( /obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; + id_tag = "commissarydoor4"; req_one_access_txt = "12;63;48;50" }, /obj/structure/disposalpipe/segment{ @@ -62003,9 +61531,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) -"pqr" = ( -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "pqO" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 @@ -62030,16 +61555,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plasteel/techmaint, /area/hallway/primary/central) -"prg" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "prs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62219,23 +61734,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"pAV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/suit_storage_unit/exploration, -/turf/open/floor/plasteel, -/area/quartermaster/exploration_prep) "pAY" = ( /obj/effect/turf_decal/trimline/yellow/arrow_ccw, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -62258,18 +61756,6 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/medical/patients_rooms/room_b) -"pBW" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 5; - height = 7; - id = "exploration_home"; - name = "Exploration Dock"; - roundstart_template = /datum/map_template/shuttle/exploration; - width = 13 - }, -/turf/open/space/basic, -/area/space) "pDk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -63050,20 +62536,9 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "pWC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, -/area/maintenance/fore) +/area/maintenance/port/fore) "pWN" = ( /turf/open/floor/plasteel/grid/steel, /area/science/misc_lab) @@ -63242,7 +62717,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "qbv" = ( /obj/machinery/airalarm{ dir = 4; @@ -64030,28 +63505,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/maintenance/aft) -"qxG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Exploration Dock Maintenance"; - req_access_txt = "49" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "qxR" = ( /obj/machinery/suit_storage_unit/mining/eva{ name = "Quartermaster's suit storage unit"; @@ -64526,7 +63979,7 @@ dir = 1 }, /turf/open/floor/plasteel/techmaint, -/area/medical/office) +/area/medical/storage) "qMT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -64762,17 +64215,6 @@ /obj/effect/overlay/palmtree_l, /turf/open/floor/grass, /area/crew_quarters/park) -"qXf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/passive_vent, -/turf/open/floor/plasteel/dark/telecomms, -/area/quartermaster/exploration_dock) "qXm" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/tile/blue{ @@ -64993,16 +64435,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/science/mixing) -"rhp" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/quartermaster/exploration_dock) "rhC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65627,7 +65059,7 @@ dir = 1 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "rCH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -65743,15 +65175,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"rEQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "rFv" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/light{ @@ -65983,10 +65406,6 @@ }, /turf/open/floor/plating, /area/security/main) -"rKw" = ( -/obj/machinery/telecomms/hub/preset/exploration, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/quartermaster/exploration_dock) "rKP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -66092,7 +65511,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/medical/office) +/area/medical/storage) "rOJ" = ( /turf/closed/wall/r_wall, /area/hallway/primary/aft) @@ -66276,7 +65695,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid/steel, -/area/science/research) +/area/science/lab) "rVT" = ( /turf/open/floor/plating, /area/crew_quarters/bar/bar_spawn_area) @@ -66291,24 +65710,7 @@ /area/crew_quarters/heads/captain) "rWR" = ( /turf/closed/wall, -/area/quartermaster/exploration_prep) -"rXd" = ( -/obj/machinery/door/airlock/science{ - name = "exploration shuttle dock"; - req_access_txt = "49" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/maintenance/starboard) +/area/science/lab) "rXg" = ( /obj/machinery/door/airlock/engineering{ name = "Starboard Quarter Solar Access"; @@ -66362,11 +65764,6 @@ }, /turf/open/floor/plasteel/techmaint, /area/science/nanite) -"rYj" = ( -/obj/structure/table/reinforced, -/obj/item/gps/mining/exploration, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "rYy" = ( /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, @@ -66405,12 +65802,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) -"rZB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "rZY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -66509,6 +65900,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/grid/steel, /area/science/research) "sgN" = ( @@ -66662,22 +66056,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plasteel/white, /area/medical/virology) -"sjP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "sjS" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -66864,7 +66242,7 @@ dir = 4 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "sox" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -67243,10 +66621,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/locker) -"szx" = ( -/obj/machinery/telecomms/bus/preset_exploration, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/quartermaster/exploration_dock) "szT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -67367,26 +66741,6 @@ }, /turf/open/floor/wood, /area/bridge/meeting_room) -"sDn" = ( -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Telecommunications"; - req_access_txt = "61" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/caution{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/quartermaster/exploration_dock) "sDH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67734,10 +67088,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/theatre/backstage) -"sWW" = ( -/obj/machinery/telecomms/broadcaster/preset_exploration, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/quartermaster/exploration_dock) "sYn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67793,15 +67143,6 @@ "tav" = ( /turf/closed/wall, /area/vacant_room/commissary) -"taT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/techmaint, -/area/maintenance/starboard) "tbd" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -67861,19 +67202,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"tcp" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/plating, -/area/maintenance/starboard) "tcR" = ( /obj/structure/chair{ dir = 8 @@ -67916,34 +67244,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"tdQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/camera/autoname, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) -"tep" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "teQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -68272,7 +67572,15 @@ /area/hallway/secondary/entry) "tpY" = ( /obj/structure/disposalpipe/segment, -/turf/closed/wall, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance{ + id_tag = "commissarydoor4"; + req_one_access_txt = "12;63;48;50" + }, +/turf/open/floor/plasteel, /area/vacant_room/commissary/commissary1) "tqp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -68350,15 +67658,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"tuF" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "tuW" = ( /obj/machinery/button/flasher{ id = "cell4"; @@ -68558,12 +67857,6 @@ dir = 4 }, /area/medical/genetics/cloning) -"tEj" = ( -/obj/machinery/computer/objective{ - dir = 8 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "tEs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -68606,12 +67899,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) -"tIa" = ( -/obj/machinery/light_switch{ - pixel_x = 22 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "tIu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -69278,14 +68565,6 @@ /obj/machinery/rnd/production/protolathe/department/science, /turf/open/floor/plasteel/grid/steel, /area/science/lab) -"ugf" = ( -/obj/effect/turf_decal/trimline/red/line, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/machinery/camera/autoname, -/turf/open/floor/plasteel/dark, -/area/security/brig) "ugv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69744,12 +69023,6 @@ }, /turf/open/floor/engine/light, /area/medical/cryo) -"uyV" = ( -/obj/item/radio/intercom{ - pixel_x = -26 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "uzl" = ( /obj/machinery/vending/wallmed{ pixel_x = 56 @@ -70055,12 +69328,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"uNf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_dock) "uNq" = ( /obj/effect/spawner/xmastree, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -70082,7 +69349,7 @@ pixel_x = -26 }, /turf/open/floor/plasteel/grid, -/area/medical/medbay/aft) +/area/medical/virology) "uNN" = ( /obj/item/weldingtool, /obj/structure/disposalpipe/segment{ @@ -70090,13 +69357,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"uNU" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "uOD" = ( /obj/machinery/computer/pandemic, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -70121,29 +69381,6 @@ /obj/effect/turf_decal/trimline/green/warning, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) -"uPm" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/science{ - name = "exploration preparation room"; - req_access_txt = "49" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "uPB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -70472,9 +69709,6 @@ /turf/open/floor/plasteel/dark, /area/medical/chemistry/upper) "vdl" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -70490,6 +69724,9 @@ /obj/effect/turf_decal/trimline/purple/warning{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/grid/steel, /area/science/research) "vdA" = ( @@ -71055,11 +70292,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) -"vsJ" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "vsN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -71107,7 +70339,7 @@ }, /obj/effect/turf_decal/stripes/end, /turf/open/floor/noslip/dark, -/area/science/research) +/area/science/lab) "vug" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -71436,18 +70668,9 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "vCP" = ( -/obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor4"; - req_one_access_txt = "12;63;48;50" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/vacant_room/commissary/commissary1) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) "vDl" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -71616,12 +70839,6 @@ }, /turf/open/floor/plasteel/techmaint, /area/hallway/primary/central) -"vGZ" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "vHa" = ( /obj/machinery/door/airlock/medical{ name = "Storage"; @@ -72286,16 +71503,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/science/robotics/lab) -"waH" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "wbj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -72648,14 +71855,9 @@ /turf/open/floor/plasteel/grid/steel, /area/science/research) "wld" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) +/obj/effect/spawner/room/threexthree, +/turf/open/space/basic, +/area/space) "wlh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -72731,7 +71933,7 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/techmaint, -/area/maintenance/aft) +/area/medical/storage) "wnL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -72797,10 +71999,6 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) -"wpy" = ( -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel/grid/steel, -/area/quartermaster/exploration_prep) "wpC" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -73324,7 +72522,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plasteel/grid/steel, -/area/security/checkpoint/medical) +/area/medical/medbay/central) "wGS" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -73523,13 +72721,6 @@ }, /turf/open/floor/plasteel/techmaint, /area/science/nanite) -"wOv" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/camera/autoname, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_dock) "wOB" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -73899,11 +73090,13 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "wWK" = ( -/obj/machinery/telecomms/receiver/preset_exploration, -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable/yellow, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/quartermaster/exploration_dock) +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/plating, +/area/maintenance/starboard) "wXs" = ( /obj/structure/chair{ dir = 4 @@ -73915,24 +73108,6 @@ /obj/machinery/power/apc/auto_name/west, /turf/open/floor/plasteel, /area/security/checkpoint/escape) -"wXG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "wXP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -74241,10 +73416,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) -"xkR" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/quartermaster/exploration_dock) "xlS" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /turf/open/floor/plasteel, @@ -74551,15 +73722,6 @@ }, /turf/open/floor/plasteel/grid, /area/medical/chemistry/upper) -"xtg" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "xtN" = ( /obj/machinery/light{ dir = 1 @@ -75164,11 +74326,6 @@ }, /turf/open/floor/plasteel/grid/steel, /area/science/lab) -"xNp" = ( -/obj/structure/chair/comfy/black, -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel/techmaint, -/area/quartermaster/exploration_prep) "xNI" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced/shutter, @@ -75924,22 +75081,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/engine/engine_smes) -"yjs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/quartermaster/exploration_dock) "yka" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -94696,7 +93837,7 @@ bHE bHE bHE bHE -bLv +vCP aaa aaa aaf @@ -94948,12 +94089,12 @@ cfw pSF ifW bCq -bCq dPu bCq bCq +bCq afR -bLv +vCP aaa aaa aaf @@ -95449,7 +94590,7 @@ bHE bCq voH bLv -bLv +vCP aaf bCq bHE @@ -96490,9 +95631,9 @@ mAO dni bLu bCq -bCq spF bCq +bCq btG apg apg @@ -96723,7 +95864,7 @@ bxy jZP bJb jZP -jZP +vCP aoV bCq bHE @@ -96980,7 +96121,7 @@ bxy pPw qVu gCp -jZP +vCP aoV bCq bHE @@ -97237,7 +96378,7 @@ bxy sHJ xaG mnC -jZP +vCP aoV bCq bHE @@ -97494,7 +96635,7 @@ bxy gCM xIO bFg -bxy +atS aaf bCq bCq @@ -97751,7 +96892,7 @@ bxy bHA vrm qcq -bxy +atS aaH bCq bHE @@ -98008,7 +97149,7 @@ wdi ssw uVA eSn -jZP +mYT aaf bLv bHE @@ -98265,7 +97406,7 @@ sht bEQ vUf bKn -jZP +vCP aoV bLv bHE @@ -98522,7 +97663,7 @@ uRi dUO hMJ bKp -jZP +mYT aaf bLv bHE @@ -98779,7 +97920,7 @@ byE cBB byE bKo -bxy +atS aaH bCq bHE @@ -99036,7 +98177,7 @@ bGn bGn bGn bKq -bxy +atS aaf bCq vLt @@ -99731,7 +98872,7 @@ afv agf abc nxC -nxC +eez aqS aiT aiT @@ -99988,7 +99129,7 @@ afy agh abc aWZ -aWZ +pWC aqS aiT ajs @@ -100245,7 +99386,7 @@ afx agg abc apb -apb +amC aqS aiU ajr @@ -100779,7 +99920,7 @@ kji oIK maW maW -pWC +maW maW maW maW @@ -101036,7 +100177,7 @@ arP jsv arP fax -vCP +fax fax fax fax @@ -108733,7 +107874,7 @@ aiX aiX aiX aiX -ugf +ivv ajO aqk aKy @@ -110270,11 +109411,11 @@ ahl dOw aic dOw -ahn age ahn ahn ahn +ahn dGq anZ anZ @@ -111359,7 +110500,7 @@ bqP jMZ bRv bvh -btZ +bof njT pjC bCF @@ -112130,7 +111271,7 @@ eqr bLH cfE yew -btZ +bof oEw wLB fMR @@ -115996,7 +115137,7 @@ bIr cfk uyM biz -eez +bRO cwc rMs cAS @@ -117281,7 +116422,7 @@ bIr bHa xzX cvw -eez +bRO cvW cwk bPu @@ -117494,10 +116635,10 @@ aJK aAr xJs aSB -alO +vCP aaf aGX -alP +aIp aJO xpu aME @@ -117538,10 +116679,10 @@ bzs bzs bzs bzs -bzs -bzs +bRO +bRO wnr -bzs +bRO bzs bAw cAR @@ -117550,8 +116691,8 @@ cBd clf bzs fLK -bzs -bnc +cdH +bNd bnc bnc bnc @@ -122656,12 +121797,12 @@ byX aXq wuB vhn -bvx +bgc vtK rVO krk -bvx -bvx +bgc +bgc vHo dSv vid @@ -122912,7 +122053,7 @@ bbF byX aXq sYn -bgc +vhn bgc bgc bgc @@ -123907,7 +123048,7 @@ aaa aaa aaa aaf -aaa +wld aaa atS aaf @@ -124164,7 +123305,7 @@ aaa aaa aaa aaf -aaa +wld aaa atS aaf @@ -124461,16 +123602,16 @@ aEg aEg aEg kJu -kch -uPm -mov +bgc +bgc +bgc rWR -kch -kch -kch -kch -kch -kch +bgc +bgc +bgc +bgc +bgc +bgc byt bvK bvK @@ -124718,16 +123859,16 @@ biY bmd aEg jim -kch -nXo -eAu -fbf -eAu -hrL -lFj -cUo -fwx -kch +aEg +btp +btp +mBr +btp +btp +btp +btp +btp +bEC rYJ rYJ bFW @@ -124976,15 +124117,15 @@ blO aEg isD aEg -tdQ -lXn -tuF -wld -iqY -gmf -gmf +btp +btp +btp +btp +btp +btp +btp mBr -kch +bEC fGF bEA bEA @@ -125232,16 +124373,16 @@ bky jMV pMk sqe -aEg -pAV -wpy -eAu -rWR -kYc -dil -rYj -hyd -kch +bky +btp +btp +btp +btp +mBr +btp +btp +btp +bEC uUy uUy bFX @@ -125489,15 +124630,15 @@ bky xCn cri rEm -aEg -pAV -wpy -eAu -iyL -kYc -xNp -drM -auN +bky +btp +mBr +btp +btp +btp +btp +mBr +btp aEg aEg aEg @@ -125746,16 +124887,16 @@ bky iOg bky boF -aEg -coX -wpy -eAu -vsJ -kYc -xNp -drM -auN -aEg +bky +btp +btp +btp +btp +btp +btp +btp +btp +bky wIR bEF bky @@ -126003,16 +125144,16 @@ bky qDA bky boF -aEg -izI -wpy -eAu -rWR -kYc -nwC -izs -waH -aEg +bky +btp +btp +btp +btp +btp +btp +mBr +btp +bky pIP bEE bFY @@ -126260,16 +125401,16 @@ bky jXv bky blO -aEg -sjP -hmb -hJM -vGZ -xtg -nsO -nsO -nuW -aEg +bky +btp +mBr +btp +btp +mBr +btp +btp +btp +bky btp vqI bky @@ -126517,16 +125658,16 @@ aaf aaa bky boF -aEg -nXo -tIa -eAu -eAu -prg -uNU -uNU -apn -aEg +bky +btp +btp +btp +btp +btp +btp +btp +btp +bky btp vqI bky @@ -126774,16 +125915,16 @@ aaf aaf bky miz -aEg -qxG -aEg -oGf bky -aEg -aEg -aEg -aEg -aEg +bky +wWK +bky +bky +bky +bky +bky +bky +bky jLJ bEI bky @@ -127031,12 +126172,12 @@ aaf aaf bky irP -lce -wXG -tcp -mZC -kdl -lXT +yjb +yjb +yjb +yjb +yjb +yjb yjb yjb kRQ @@ -127287,13 +126428,13 @@ aaa aaa aaa bky -gpn -tep btp -bky -dnB -taT -bky +btp +btp +btp +btp +btp +btp btp btp bky @@ -127545,11 +126686,11 @@ aaa aaa bky bky -mnE bky bky bky -rXd +bky +bky bky bky bky @@ -127801,18 +126942,18 @@ aaa aaa aaa aaa -xkR -sDn -equ -dLB -gQd -fJe -ksB -hjM -uyV -rZB -cRa -gQd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa atS gXs aaf @@ -128058,18 +127199,18 @@ aaa aaa aaa aaa -xkR -qXf -yjs -nEE -xkR -rEQ -gQK -kFo -gtJ -uNf -ezu -gQd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaf aaa aaa @@ -128315,18 +127456,18 @@ aaa aaa aaa aaa -xkR -szx -miD -sWW -xkR -pqr -pqr -ezu -iRI -ezu -cxr -mFI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -128572,18 +127713,18 @@ aaa aaa aaa aaa -xkR -rKw -eQc -wWK -gQd -wOv -pqr -xkR -rhp -xkR -gQd -gQd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -128828,19 +127969,19 @@ aaa aaa aaa aaa -gXs -xkR -xkR -xkR -gQd -gQd -tEj -dOV -xkR -fGj -gQd -gQd -gXs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -129090,14 +128231,14 @@ aaa aaa aaa aaa -gQd -xkR -xkR -xkR -hTu -xkR -gQd -gXs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -129351,7 +128492,7 @@ aaa aaa aaa aaa -pBW +aaa aaa aaa aaa diff --git a/_maps/map_files/HoleStation/holestation.dmm b/_maps/map_files/HoleStation/holestation.dmm index d10cda69539a8..0dcbe6c7662b1 100644 --- a/_maps/map_files/HoleStation/holestation.dmm +++ b/_maps/map_files/HoleStation/holestation.dmm @@ -2215,9 +2215,6 @@ }, /turf/open/floor/mineral/plastitanium/airless, /area/space/nearstation) -"aiQ" = ( -/turf/closed/wall/r_wall, -/area/quartermaster/exploration_dock) "aiR" = ( /obj/machinery/computer/camera_advanced/xenobio, /obj/structure/cable/yellow{ @@ -5044,9 +5041,6 @@ }, /turf/open/openspace, /area/engine/atmos) -"atn" = ( -/turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) "atp" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -5575,10 +5569,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/crew_quarters/heads/chief) -"avp" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/quartermaster/exploration_dock) "avq" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -6420,9 +6410,6 @@ /obj/structure/window/reinforced/spawner, /turf/open/floor/plasteel, /area/hydroponics) -"ayy" = ( -/turf/closed/wall, -/area/quartermaster/exploration_dock) "ayA" = ( /obj/machinery/door/window/westleft, /obj/structure/cable/yellow{ @@ -7651,19 +7638,6 @@ /mob/living/simple_animal/chicken/hen, /turf/open/floor/grass, /area/ranch) -"aDI" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 13; - id = "exploration_home"; - name = "Exploration Dock"; - roundstart_template = /datum/map_template/shuttle/exploration/holestation; - width = 16; - dheight = 1 - }, -/turf/open/space/basic, -/area/space) "aDJ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -9908,7 +9882,7 @@ /obj/structure/sign/warning/vacuum/external, /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, -/area/quartermaster/exploration_dock) +/area/science/lab) "aMg" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/wood, @@ -11552,7 +11526,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "aRN" = ( /obj/machinery/light{ dir = 4 @@ -12347,7 +12321,7 @@ "aUP" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, -/area/quartermaster/exploration_dock) +/area/science/lab) "aUQ" = ( /obj/effect/spawner/structure/window/plasma/reinforced/shutter, /turf/open/floor/plating, @@ -12588,7 +12562,7 @@ "aVK" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, -/area/quartermaster/exploration_dock) +/area/science/lab) "aVL" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -12747,7 +12721,7 @@ req_access_txt = "47" }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "aWl" = ( /obj/structure/window, /obj/structure/chair/sofa/corp/right{ @@ -14098,7 +14072,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "bLW" = ( /obj/effect/turf_decal/tile/blue/tile_marquee, /obj/effect/turf_decal/tile/neutral/tile_marquee{ @@ -14523,7 +14497,7 @@ dir = 9 }, /turf/open/floor/plasteel/dark, -/area/quartermaster/exploration_dock) +/area/science/lab) "cXw" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/stripes/line{ @@ -15549,10 +15523,9 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "fEi" = ( -/obj/effect/landmark/start/exploration, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "fHt" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -16171,13 +16144,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "hyz" = ( -/obj/effect/landmark/start/exploration, /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "hEQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -16703,9 +16675,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "iWg" = ( -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ - dir = 8 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -16715,7 +16684,7 @@ dir = 10 }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "iXN" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall, @@ -17689,12 +17658,11 @@ /turf/closed/wall/r_wall, /area/ranch) "lHn" = ( -/obj/effect/landmark/start/exploration, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "lHt" = ( /obj/machinery/camera/autoname, /obj/structure/window/reinforced/survival_pod/spawner/east, @@ -17763,7 +17731,7 @@ dir = 10 }, /turf/open/floor/plasteel/dark, -/area/quartermaster/exploration_dock) +/area/science/lab) "lTd" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/cable/yellow{ @@ -17805,7 +17773,7 @@ dir = 4 }, /turf/closed/wall, -/area/quartermaster/exploration_dock) +/area/science/lab) "lYE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -18864,7 +18832,6 @@ /turf/open/floor/plating, /area/maintenance/central/secondary) "oWT" = ( -/obj/machinery/vendor/exploration, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -18873,7 +18840,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "oYa" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -20310,11 +20277,10 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/machinery/telecomms/relay/preset/exploration, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "tnZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -20612,7 +20578,7 @@ req_access_txt = "47" }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "tSm" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ @@ -20898,7 +20864,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "uNf" = ( /obj/machinery/sleeper{ dir = 4 @@ -21545,7 +21511,7 @@ dir = 8 }, /turf/closed/wall, -/area/quartermaster/exploration_dock) +/area/science/lab) "wvk" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -21574,9 +21540,6 @@ /turf/open/floor/plating, /area/medical/virology) "wBP" = ( -/obj/machinery/computer/objective{ - dir = 8 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -21585,7 +21548,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/quartermaster/exploration_dock) +/area/science/lab) "wCr" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46594,7 +46557,7 @@ anZ anZ anZ anZ -aDI +anZ anZ anZ anZ @@ -47362,7 +47325,7 @@ anZ anZ anZ anZ -aiQ +abV aRM lXz aRM @@ -47619,11 +47582,11 @@ anZ anZ anZ anZ -aiQ +abV hyz uLw fEi -atn +arg lHn aWj aSC @@ -47882,7 +47845,7 @@ iWg wBP tlT bKp -aiQ +abV aOT gpo wcb @@ -48133,13 +48096,13 @@ anZ anZ anZ aJi -aiQ -aiQ -ayy -ayy -avp +abV +abV +aSV +aSV +avP tPt -aiQ +abV abV abV abV diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1b7be538515f5..0d44b30e95747 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -8329,13 +8329,6 @@ }, /turf/open/floor/carpet/red, /area/security/detectives_office) -"aCy" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/structure/closet/radiation, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "aCz" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -20796,16 +20789,6 @@ icon_state = "platingdmg2" }, /area/maintenance/starboard) -"buW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/research/glass{ - name = "science shuttle dock"; - req_one_access_txt = "49" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "bve" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -35152,12 +35135,6 @@ }, /turf/open/floor/plasteel, /area/science/storage) -"cud" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "cue" = ( /obj/structure/cable{ icon_state = "0-2" @@ -35602,7 +35579,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "cuZ" = ( -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/science/misc_lab/range) "cvd" = ( /obj/structure/cable{ @@ -35988,26 +35966,6 @@ /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"cwb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) -"cwd" = ( -/obj/structure/table, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/item/gun/energy/laser/practice{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/gun/energy/laser/practice{ - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "cwe" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -36423,11 +36381,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/storage) -"cwZ" = ( -/obj/structure/target_stake, -/obj/item/target/syndicate, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "cxa" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, @@ -36617,13 +36570,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"cxP" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "cxQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36815,13 +36761,6 @@ "cyK" = ( /turf/closed/wall/r_wall, /area/science/mixing) -"cyM" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "cyN" = ( /obj/machinery/firealarm{ dir = 4; @@ -45457,18 +45396,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"drM" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 5; - height = 7; - id = "exploration_home"; - name = "Exploration Dock"; - roundstart_template = /datum/map_template/shuttle/exploration; - width = 13 - }, -/turf/open/space/basic, -/area/space) "drQ" = ( /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -45725,15 +45652,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"dyp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "dyS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46336,14 +46254,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"dGH" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "dHE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46792,9 +46702,6 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) -"dQI" = ( -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "dQQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46906,12 +46813,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"dUj" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "dVZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47570,12 +47471,6 @@ dir = 5 }, /area/crew_quarters/kitchen) -"eqG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "erb" = ( /obj/machinery/door/airlock/maintenance{ name = "Surgery Maintenance"; @@ -47797,23 +47692,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/security/brig) -"eyt" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Research Testing Range"; - req_one_access_txt = "47;49" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "ezq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48716,16 +48594,6 @@ luminosity = 2 }, /area/security/nuke_storage) -"eXl" = ( -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "eXp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49484,15 +49352,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"fyt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "fyu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49859,12 +49718,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"fFM" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "fFO" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -51953,12 +51806,6 @@ dir = 5 }, /area/crew_quarters/kitchen) -"gRW" = ( -/obj/machinery/computer/objective{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "gSc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -52615,12 +52462,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"hrp" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "hrL" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ @@ -52681,11 +52522,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) -"htz" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/science/shuttledock) "htB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -52810,15 +52646,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) -"hyq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "hyr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -52835,16 +52662,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"hyY" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/exploration, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "hzl" = ( /obj/effect/landmark/blobstart, /obj/structure/cable/yellow{ @@ -53081,18 +52898,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"hFV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Testing Range" - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "hGe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53161,12 +52966,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, /area/security/brig) -"hIy" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "hJc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53768,10 +53567,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"hZi" = ( -/obj/structure/lattice, -/turf/closed/wall, -/area/science/shuttledock) "hZo" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -54121,14 +53916,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"iiI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "iiP" = ( /obj/machinery/holopad, /obj/structure/chair{ @@ -54616,16 +54403,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"iuF" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/research/glass{ - name = "Research Testing Range"; - req_one_access_txt = "47;49" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) "iuU" = ( /obj/item/folder/yellow{ pixel_x = 4; @@ -55005,13 +54782,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"iHM" = ( -/obj/structure/closet/crate, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "iIk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -56220,12 +55990,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"juU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "jvl" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Port Mix to Ports" @@ -56798,15 +56562,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"jLY" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "jMj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -57359,10 +57114,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/engine/break_room) -"kfu" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "kfA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -57705,9 +57456,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"krD" = ( -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "krE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57770,10 +57518,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/hallway/primary/central) -"kss" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "kst" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -57898,15 +57642,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/break_room) -"kuN" = ( -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "kuS" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -57985,16 +57720,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"kxk" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -24 - }, -/obj/structure/window/reinforced, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "kxm" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58480,18 +58205,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"kMb" = ( -/obj/machinery/camera{ - c_tag = "Research Division Testing Range"; - dir = 1; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/exploration, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "kMq" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Chamber"; @@ -59106,12 +58819,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"lal" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "lan" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -59863,10 +59570,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"lwJ" = ( -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "lxf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -59953,12 +59656,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) -"lzk" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "lBe" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/brown{ @@ -60934,13 +60631,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"lZW" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/shuttledock) "mag" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61213,9 +60903,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"mjJ" = ( -/turf/closed/wall, -/area/science/shuttledock) "mkn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62042,17 +61729,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"mGY" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/machinery/camera{ - c_tag = "Science Shuttle Dock"; - dir = 4; - network = list("ss13","rd") - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "mHG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -62091,13 +61767,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark/corner, /area/engine/break_room) -"mIf" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/vendor/exploration, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "mIH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -63485,17 +63154,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"ntl" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/suit_storage_unit/exploration, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "ntB" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -64766,10 +64424,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/hallway/primary/port) -"obb" = ( -/obj/structure/target_stake, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "obq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65021,17 +64675,6 @@ "ojg" = ( /turf/closed/wall, /area/science/misc_lab/range) -"ojw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/obj/structure/rack, -/obj/item/hand_labeler, -/obj/item/wrench, -/obj/item/crowbar, -/turf/open/floor/plasteel, -/area/science/shuttledock) "okq" = ( /obj/machinery/camera{ c_tag = "Departure Lounge - Starboard Aft"; @@ -65341,15 +64984,6 @@ }, /turf/open/floor/plasteel/dark, /area/aisat) -"opZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "oqc" = ( /mob/living/simple_animal/kalo, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -66419,12 +66053,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"oZK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "oZL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -66476,9 +66104,6 @@ }, /turf/open/floor/plasteel/dark, /area/aisat) -"pcn" = ( -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "pcz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67818,12 +67443,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) -"pWj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "pWm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -68030,15 +67649,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"qcZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "qdE" = ( /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) @@ -68215,15 +67825,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/primary/port) -"qjB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "qka" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -68251,13 +67852,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/space/nearstation) -"qkM" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "qlF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -68302,16 +67896,6 @@ }, /turf/open/floor/plasteel/dark, /area/aisat) -"qmk" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/shuttledock) "qmp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68777,15 +68361,6 @@ }, /turf/open/floor/grass, /area/ranch) -"qzq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "qzE" = ( /obj/effect/turf_decal/plaque{ icon_state = "L11" @@ -69334,9 +68909,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"qOT" = ( -/turf/open/space/basic, -/area/science/shuttledock) "qPn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -69592,12 +69164,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"qYG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "qYW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -70280,17 +69846,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"rvY" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "rwd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -70758,11 +70313,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"rIW" = ( -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/plasteel, -/area/science/shuttledock) "rJG" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; @@ -71266,18 +70816,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"sdi" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "sdl" = ( /obj/effect/landmark/start/scientist, /obj/effect/turf_decal/stripes/line{ @@ -71672,12 +71210,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"sql" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "srh" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -71809,14 +71341,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"svW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "swL" = ( /obj/effect/turf_decal/tile/neutral/tile_full, /obj/item/kirbyplants/random, @@ -71844,12 +71368,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/security/prison) -"syh" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "syE" = ( /obj/machinery/firealarm{ dir = 1; @@ -71878,15 +71396,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"szA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "sAN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -72974,19 +72483,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) -"tmK" = ( -/obj/machinery/door/airlock/research/glass{ - name = "science shuttle dock"; - req_one_access_txt = "49" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "tmM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -73050,21 +72546,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"toC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/maintenance/department/science) "tqk" = ( /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -73569,17 +73050,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"tJT" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/suit_storage_unit/exploration, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "tLd" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/cable/yellow{ @@ -73833,15 +73303,6 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "tTj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plasteel, /area/maintenance/department/science) "tTl" = ( @@ -73949,18 +73410,6 @@ icon_state = "panelscorched" }, /area/maintenance/starboard/fore) -"tVY" = ( -/obj/structure/closet/crate, -/obj/item/target/alien, -/obj/item/target/alien, -/obj/item/target/clown, -/obj/item/target/clown, -/obj/item/target/syndicate, -/obj/item/target/syndicate, -/obj/item/gun/energy/laser/practice, -/obj/item/gun/energy/laser/practice, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "tWv" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/r_wall, @@ -74204,7 +73653,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -74434,20 +73882,6 @@ }, /turf/open/floor/wood, /area/library) -"ulC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = -4 - }, -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/plasteel, -/area/science/shuttledock) "umc" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -75106,16 +74540,6 @@ }, /turf/open/floor/plasteel, /area/engine/storage_shared) -"uEU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel, -/area/science/shuttledock) "uEV" = ( /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; @@ -76200,12 +75624,6 @@ /obj/effect/turf_decal/pool, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"vlO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "vms" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -77227,14 +76645,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"vRq" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "vRy" = ( /obj/structure/window/reinforced{ dir = 1; @@ -77391,10 +76801,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"vVq" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "vVE" = ( /obj/structure/window/reinforced{ dir = 4 @@ -77819,15 +77225,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/primary/central) -"wiK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "wiZ" = ( /obj/machinery/door/airlock/external{ name = "Security External Airlock"; @@ -78559,14 +77956,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"wAy" = ( -/obj/item/radio/intercom{ - pixel_y = -30 - }, -/obj/machinery/light, -/obj/structure/closet/radiation, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "wAJ" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -79944,15 +79333,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"xub" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "xul" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -80623,19 +80003,6 @@ /obj/machinery/light, /turf/open/floor/plasteel/dark, /area/aisat) -"xHK" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/shuttledock) "xHL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -80827,18 +80194,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"xOH" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "xPx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -80915,10 +80270,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) -"xQQ" = ( -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "xQX" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple{ @@ -81537,12 +80888,6 @@ }, /turf/open/floor/plasteel/dark, /area/aisat) -"ygk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "yhI" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/delivery, @@ -116542,7 +115887,7 @@ gLV gLV igl ufr -toC +oXJ oXJ qMp lxj @@ -117051,12 +116396,12 @@ cqV crW dwL gzO +dwL +dwL +dwL +dwL cuZ cuZ -cuZ -cuZ -cuZ -eyt ojg ojg ojg @@ -117308,15 +116653,15 @@ cqW crX dwL gzO -cuZ -cwb -lal -ygk -sdi -xOH -krD -krD -aCy +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa czD hXP cQn @@ -117565,15 +116910,15 @@ cgq cgq dwL gzO -cuZ -eqG -cwZ -vVq -cyM -opZ -krD -lwJ -tJT +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa czD cQv qIO @@ -117822,15 +117167,15 @@ suL lIj gXM rVl -cuZ -dyp -pcn -vVq -cyM -opZ -krD -lwJ -hyY +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa czD czF nGg @@ -118076,18 +117421,18 @@ ovj ovj ovj ovj -cuZ -iuF -cuZ -cuZ -eqG -pcn -vVq -cyM -opZ -krD -lwJ -kMb +dwL +dwL +dwL +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa czD czG cAN @@ -118333,18 +117678,18 @@ atE ovj cpH cqX -cuZ -fFM -cud -kxk -szA -hFV -qjB -dGH -hyq -pWj -lwJ -ntl +dwL +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa czD cQB cAO @@ -118590,18 +117935,18 @@ nbv atd dwX nbv -cuZ -jLY -lzk -qcZ -cwd -kfu -cxP -krD -qzq -qYG -krD -wAy +dwL +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa czD czI cAP @@ -118847,19 +118192,19 @@ nbv ovj ovj atd -cuZ -cuZ -obb -sql -krD -krD -krD -krD -opZ -krD -krD -krD -cEA +dwL +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaf aaf aaf @@ -119105,18 +118450,18 @@ ovj nbv nbv auc -cuZ -tVY -sql -hrp -krD -krD -krD -opZ -krD -krD -kss -cEA +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaf aaf lMJ @@ -119362,18 +118707,18 @@ ovj nbv nbv nbv -cuZ -mjJ -buW -mjJ -mjJ -mjJ -mjJ -tmK -mjJ -mjJ -mjJ -mjJ +dwL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119620,17 +118965,17 @@ nbv nbv nbv ovj -mjJ -juU -ulC -ojw -rvY -mGY -fyt -hIy -dQI -vRq -mjJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119877,17 +119222,17 @@ nbv nbv nbv ovj -mjJ -syh -dUj -dUj -qkM -svW -iiI -dUj -dUj -eXl -mjJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120134,17 +119479,17 @@ nbv nbv nbv ovj -mjJ -dQI -dQI -dQI -dQI -dQI -wiK -xub -dQI -iHM -hZi +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120391,17 +119736,17 @@ jah jah jah ovj -mjJ -xQQ -mIf -oZK -uEU -vlO -mjJ -qmk -mjJ -mjJ -mjJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120648,17 +119993,17 @@ vLD vLD vLD ctl -mjJ -htz -mjJ -kuN -gRW -rIW -htz -xHK -mjJ -qOT -lMJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120907,15 +120252,15 @@ aaf vLD aaa aaa -mjJ -htz -htz -htz -htz -lZW -htz -qOT -lMJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa lMJ lMJ lMJ @@ -121169,7 +120514,7 @@ aaa aaa aaa aaa -drM +aaa aaa aaa aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index f6810958eb7a8..b9f89dde48ae4 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -45305,14 +45305,6 @@ icon_state = "platingdmg3" }, /area/maintenance/department/science) -"cFy" = ( -/obj/machinery/suit_storage_unit/exploration, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel, -/area/science/shuttledock) "cFB" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, @@ -45382,16 +45374,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/science/robotics/lab) -"cNk" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/suit_storage_unit/exploration, -/turf/open/floor/plasteel, -/area/science/shuttledock) "cNN" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ppflowers, @@ -45526,14 +45508,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"cVs" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "cVH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -45764,19 +45738,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"dnX" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/shuttledock) "doa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -46607,15 +46568,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"etf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "evv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -46738,18 +46690,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/engine/engineering) -"eDT" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 5; - height = 7; - id = "exploration_home"; - name = "Exploration Dock"; - roundstart_template = /datum/map_template/shuttle/exploration; - width = 13 - }, -/turf/open/space/basic, -/area/space) "eEp" = ( /obj/structure/grille/broken, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -47827,16 +47767,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"fTg" = ( -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "fTY" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -48718,13 +48648,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"hbK" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/vendor/exploration, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "hbQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -48788,11 +48711,6 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit/departure_lounge) -"hhc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating/airless, -/area/science/shuttledock) "hhi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/engine, @@ -49269,13 +49187,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"hGA" = ( -/obj/effect/landmark/start/exploration, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "hGE" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49319,17 +49230,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"hIo" = ( -/obj/machinery/suit_storage_unit/exploration, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = -4 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "hJe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -49574,12 +49474,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"hVL" = ( -/obj/machinery/computer/objective{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "hWx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -49671,18 +49565,6 @@ }, /turf/open/floor/plasteel/dark, /area/library) -"icQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "idM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49918,17 +49800,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"iyX" = ( -/obj/machinery/suit_storage_unit/exploration, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "izf" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -50614,16 +50485,6 @@ }, /turf/open/floor/plating, /area/engine/engine_core) -"jyK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/exploration, -/turf/open/floor/plasteel, -/area/science/shuttledock) "jza" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -50790,10 +50651,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"jOb" = ( -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "jOB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -50831,9 +50688,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /turf/open/floor/plating, /area/maintenance/department/science) "jRI" = ( @@ -50915,9 +50769,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) -"jYA" = ( -/turf/open/space/basic, -/area/science/shuttledock) "jYQ" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 9 @@ -51954,12 +51805,6 @@ /obj/machinery/atmospherics/pipe/simple/purple/visible, /turf/open/floor/plasteel, /area/engine/atmos) -"ltK" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "lvk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -52250,12 +52095,6 @@ }, /turf/open/floor/plating, /area/storage/emergency/starboard) -"lLK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "lLM" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -53345,18 +53184,6 @@ }, /turf/open/floor/carpet, /area/library/lounge) -"nlM" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "nmx" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 8 @@ -53663,16 +53490,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"nGE" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/research/glass{ - name = "science shuttle dock"; - req_one_access_txt = "49" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "nGG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plating, @@ -54264,14 +54081,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) -"ore" = ( -/obj/effect/landmark/start/exploration, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "ory" = ( /obj/machinery/light{ dir = 4 @@ -54994,16 +54803,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"pjZ" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/science/shuttledock) "pkb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55022,15 +54821,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/chapel/dock) -"pkd" = ( -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "pkM" = ( /obj/machinery/door/airlock/external{ req_access_txt = "22" @@ -55065,15 +54855,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/hallway/primary/central) -"pnv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "pnN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -56840,12 +56621,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/engine/engineering) -"ruT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "rvk" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -57468,13 +57243,6 @@ /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/library/lounge) -"svR" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/shuttledock) "svT" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -57645,18 +57413,6 @@ /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel, /area/engine/engineering) -"sKq" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "sKF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -57675,11 +57431,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/engine, /area/engine/engineering) -"sNj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/science/shuttledock) "sNz" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58278,9 +58029,6 @@ /obj/docking_port/stationary/public_mining_dock, /turf/open/floor/plating, /area/construction/mining/aux_base) -"tDl" = ( -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "tEc" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -58320,11 +58068,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) -"tGE" = ( -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/plasteel, -/area/science/shuttledock) "tHk" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -58478,12 +58221,6 @@ icon_state = "panelscorched" }, /area/maintenance/department/science) -"tTQ" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "tUf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -58510,12 +58247,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/hallway/primary/central) -"tXm" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "tXn" = ( /obj/structure/sink{ dir = 4; @@ -58715,10 +58446,6 @@ icon_state = "wood-broken7" }, /area/crew_quarters/dorms) -"ujt" = ( -/obj/structure/lattice, -/turf/closed/wall, -/area/science/shuttledock) "ujA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -59124,13 +58851,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"uNt" = ( -/obj/structure/closet/crate, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/shuttledock) "uNz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -59472,9 +59192,6 @@ /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"vuQ" = ( -/turf/closed/wall, -/area/science/shuttledock) "vxl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -61305,19 +61022,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"xUr" = ( -/obj/machinery/door/airlock/research/glass{ - name = "science shuttle dock"; - req_one_access_txt = "49" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/shuttledock) "xVc" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -111080,17 +110784,17 @@ bkF bkF bwm bwm -vuQ -nGE -vuQ -vuQ -vuQ -vuQ -xUr -vuQ -hhc -hhc -hhc +bwm +bwm +bwm +bwm +bwm +bwm +bwm +bwm +bwm +aaa +aaa aaa aaa aaa @@ -111337,17 +111041,17 @@ iPz sXR sXR pwS -vuQ -ltK -hIo -cFy -iyX -cNk -etf -nlM -tDl -cVs -vuQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111594,17 +111298,17 @@ oNE oep bnd mlr -vuQ -tTQ -hGA -hGA -hGA -ore -icQ -sKq -tXm -fTg -vuQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111851,17 +111555,17 @@ taA qcH bnd nNN -vuQ -tDl -tDl -tDl -tDl -tDl -tDl -pnv -tDl -uNt -ujt +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112108,17 +111812,17 @@ sNz jtf bnd aht -vuQ -jOb -hbK -ruT -jyK -lLK -vuQ -pjZ -vuQ -vuQ -vuQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112365,17 +112069,17 @@ cOp lGS bnd aaa -vuQ -sNj -vuQ -pkd -hVL -tGE -sNj -dnX -vuQ -jYA -aht +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112624,15 +112328,15 @@ bkF aaa aaa aaa -vuQ -sNj -sNj -sNj -sNj -svR -sNj -jYA -aht +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112886,7 +112590,7 @@ aaa aaa aaa aaa -eDT +aaa aaa aaa aaa diff --git a/beestation.dme b/beestation.dme index 9d78cd49256e1..4a44e73620f76 100644 --- a/beestation.dme +++ b/beestation.dme @@ -2393,7 +2393,7 @@ #include "code\modules\jobs\job_types\deputy.dm" #include "code\modules\jobs\job_types\detective.dm" #include "code\modules\jobs\job_types\emt.dm" -#include "code\modules\jobs\job_types\exploration_team.dm" +// #include "code\modules\jobs\job_types\exploration_team.dm" // MonkeStation edit: Exploration temporarily disabled #include "code\modules\jobs\job_types\geneticist.dm" #include "code\modules\jobs\job_types\gimmick.dm" #include "code\modules\jobs\job_types\head_of_personnel.dm" diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 916e06fac94bf..d048f6ca93516 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -59,7 +59,7 @@ #define ACCESS_THEATRE 46 #define ACCESS_RESEARCH 47 #define ACCESS_MINING 48 -#define ACCESS_EXPLORATION 49 +// #define ACCESS_EXPLORATION 49 // MonkeStation edit: Exploration disabled temporarily #define ACCESS_MAILSORTING 50 #define ACCESS_VAULT 53 #define ACCESS_MINING_STATION 54 diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 91a85cdf07925..00c4da6ce11c5 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -20,13 +20,13 @@ #define RD_JF (1<<0) #define SCIENTIST (1<<1) -#define EXPLORATION_CREW (1<<2) -#define CHEMIST (1<<3) -#define CMO_JF (1<<4) -#define DOCTOR (1<<5) -#define GENETICIST (1<<6) -#define VIROLOGIST (1<<7) -#define EMT (1<<8) +// #define EXPLORATION_CREW (1<<2) // MonkeStation edit: Exploration temporarily disabled +#define CHEMIST (1<<2) +#define CMO_JF (1<<3) +#define DOCTOR (1<<4) +#define GENETICIST (1<<5) +#define VIROLOGIST (1<<6) +#define EMT (1<<7) #define CIVILIAN (1<<2) @@ -92,7 +92,7 @@ #define JOB_DISPLAY_ORDER_VIROLOGIST 24 #define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 25 #define JOB_DISPLAY_ORDER_SCIENTIST 26 -#define JOB_DISPLAY_ORDER_EXPLORATION 27 +// #define JOB_DISPLAY_ORDER_EXPLORATION 27 // MonkeStation edit: Exploration temporarily disabled #define JOB_DISPLAY_ORDER_ROBOTICIST 28 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 29 #define JOB_DISPLAY_ORDER_WARDEN 30 diff --git a/code/controllers/subsystem/processing/orbits.dm b/code/controllers/subsystem/processing/orbits.dm index 1675302c2f450..97df4da5b9453 100644 --- a/code/controllers/subsystem/processing/orbits.dm +++ b/code/controllers/subsystem/processing/orbits.dm @@ -10,9 +10,14 @@ PROCESSING_SUBSYSTEM_DEF(orbits) var/datum/orbital_map_tgui/orbital_map_tgui = new() - var/initial_space_ruins = 2 - var/initial_objective_beacons = 3 - var/initial_asteroids = 6 + // var/initial_space_ruins = 2 + // var/initial_objective_beacons = 3 + var/initial_asteroids = 11 // MonkeStation edit: ruins/objectives disabled + + // MonkeStation edit: renewable asteroids + var/current_asteroids = 0 // how many asteroids are there currently? + var/min_asteroids = 4 // how many asteroids is too few? + var/asteroid_renew = 4 // how many asteroids do we make when we have too few? var/orbits_setup = FALSE @@ -20,7 +25,7 @@ PROCESSING_SUBSYSTEM_DEF(orbits) var/datum/orbital_objective/current_objective - var/list/datum/ruin_event/ruin_events = list() + // var/list/datum/ruin_event/ruin_events = list() var/list/runnable_events @@ -56,7 +61,7 @@ PROCESSING_SUBSYSTEM_DEF(orbits) /datum/controller/subsystem/processing/orbits/Recover() orbital_maps |= SSorbits.orbital_maps possible_objectives |= SSorbits.possible_objectives - ruin_events |= SSorbits.ruin_events + // ruin_events |= SSorbits.ruin_events assoc_shuttles |= SSorbits.assoc_shuttles interdicted_shuttles |= SSorbits.interdicted_shuttles research_disks |= SSorbits.research_disks @@ -70,6 +75,8 @@ PROCESSING_SUBSYSTEM_DEF(orbits) orbital_map_tgui = SSorbits.orbital_map_tgui orbits_setup = SSorbits.orbits_setup + current_asteroids = SSorbits.current_asteroids + for(var/datum/tgui/map as() in SSorbits.open_orbital_maps) map?.close() @@ -95,14 +102,15 @@ PROCESSING_SUBSYSTEM_DEF(orbits) var/datum/orbital_map/orbital_map = orbital_maps[map_key] orbital_map.post_setup() orbits_setup = TRUE - //Create initial ruins - for(var/i in 1 to initial_space_ruins) - new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() - for(var/i in 1 to initial_objective_beacons) - new /datum/orbital_object/z_linked/beacon/ruin() + //Create initial ruins // MonkeStation edit: ruins/objectives disabled + // for(var/i in 1 to initial_space_ruins) + // new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() + // for(var/i in 1 to initial_objective_beacons) + // new /datum/orbital_object/z_linked/beacon/ruin() //Create asteroid belt for(var/i in 1 to initial_asteroids) new /datum/orbital_object/z_linked/beacon/ruin/asteroid() + current_asteroids += 1 /datum/controller/subsystem/processing/orbits/fire(resumed) if(resumed) @@ -112,22 +120,30 @@ PROCESSING_SUBSYSTEM_DEF(orbits) //Update UIs for(var/datum/tgui/tgui as() in open_orbital_maps) tgui.send_update() - //Check creating objectives / missions. - if(next_objective_time < world.time && length(possible_objectives) < 6) - create_objective() - next_objective_time = world.time + rand(30 SECONDS, 5 MINUTES) - //Check space ruin count - if(ruin_levels < 2 && prob(5)) - new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() + //Check creating objectives / missions. // MonkeStation edit: ruins/objectives disabled + // if(next_objective_time < world.time && length(possible_objectives) < 6) + // create_objective() + // next_objective_time = world.time + rand(30 SECONDS, 5 MINUTES) + // Check space ruin count + // if(ruin_levels < 2 && prob(5)) + // new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() //Check objective - if(current_objective) - if(current_objective.check_failed()) - priority_announce("Central Command priority objective failed.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) - QDEL_NULL(current_objective) - //Process events - for(var/datum/ruin_event/ruin_event as() in ruin_events) - if(!ruin_event.update()) - ruin_events.Remove(ruin_event) + // if(current_objective) + // if(current_objective.check_failed()) + // priority_announce("Central Command priority objective failed.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) + // QDEL_NULL(current_objective) + //Process events // MonkeStation edit: ruins/objectives disabled + // for(var/datum/ruin_event/ruin_event as() in ruin_events) + // if(!ruin_event.update()) + // ruin_events.Remove(ruin_event) + + // MonkeStation edit: makes asteroids renewable + // (arbitrary values tho) + if (current_asteroids < min_asteroids) + for (var/i in 1 to asteroid_renew) + new /datum/orbital_object/z_linked/beacon/ruin/asteroid() + current_asteroids += 1 + //Do processing. if(!resumed) . = ..() @@ -142,39 +158,39 @@ PROCESSING_SUBSYSTEM_DEF(orbits) set category = "Ghost" SSorbits.orbital_map_tgui.ui_interact(src) -/datum/controller/subsystem/processing/orbits/proc/create_objective() - var/static/list/valid_objectives = list( - /datum/orbital_objective/recover_blackbox = 3, - /datum/orbital_objective/nuclear_bomb = 1, - /datum/orbital_objective/assassination = 1, - /datum/orbital_objective/artifact = 2, - /datum/orbital_objective/vip_recovery = 1 - ) - if(!length(possible_objectives)) - priority_announce("Priority station objective received - Details transmitted to all available objective consoles. \ - [GLOB.station_name] will have funds distributed upon objective completion.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) - var/chosen = pickweight(valid_objectives) - if(!chosen) - return - var/datum/orbital_objective/objective = new chosen() - objective.generate_payout() - possible_objectives += objective - update_objective_computers() - -/datum/controller/subsystem/processing/orbits/proc/assign_objective(objective_computer, datum/orbital_objective/objective) - if(!possible_objectives.Find(objective)) - return "Selected objective is no longer available or has been claimed already." - if(current_objective) - return "An objective has already been selected and must be completed first." - objective.on_assign(objective_computer) - objective.generate_attached_beacon() - objective.announce() - current_objective = objective - possible_objectives.Remove(objective) - update_objective_computers() - return "Objective selected, good luck." - -/datum/controller/subsystem/processing/orbits/proc/update_objective_computers() - for(var/obj/machinery/computer/objective/computer as() in GLOB.objective_computers) - for(var/M in computer.viewing_mobs) - computer.update_static_data(M) +// /datum/controller/subsystem/processing/orbits/proc/create_objective() +// var/static/list/valid_objectives = list( +// /datum/orbital_objective/recover_blackbox = 3, +// /datum/orbital_objective/nuclear_bomb = 1, +// /datum/orbital_objective/assassination = 1, +// /datum/orbital_objective/artifact = 2, +// /datum/orbital_objective/vip_recovery = 1 +// ) +// if(!length(possible_objectives)) +// priority_announce("Priority station objective received - Details transmitted to all available objective consoles. \ +// [GLOB.station_name] will have funds distributed upon objective completion.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) +// var/chosen = pickweight(valid_objectives) +// if(!chosen) +// return +// var/datum/orbital_objective/objective = new chosen() +// objective.generate_payout() +// possible_objectives += objective +// update_objective_computers() + +// /datum/controller/subsystem/processing/orbits/proc/assign_objective(objective_computer, datum/orbital_objective/objective) +// if(!possible_objectives.Find(objective)) +// return "Selected objective is no longer available or has been claimed already." +// if(current_objective) +// return "An objective has already been selected and must be completed first." +// objective.on_assign(objective_computer) +// objective.generate_attached_beacon() +// objective.announce() +// current_objective = objective +// possible_objectives.Remove(objective) +// update_objective_computers() +// return "Objective selected, good luck." + +// /datum/controller/subsystem/processing/orbits/proc/update_objective_computers() +// for(var/obj/machinery/computer/objective/computer as() in GLOB.objective_computers) +// for(var/M in computer.viewing_mobs) +// computer.update_static_data(M) diff --git a/code/controllers/subsystem/zclear.dm b/code/controllers/subsystem/zclear.dm index 2b24576d027b5..986b9515bb231 100644 --- a/code/controllers/subsystem/zclear.dm +++ b/code/controllers/subsystem/zclear.dm @@ -146,6 +146,11 @@ SUBSYSTEM_DEF(zclear) LAZYREMOVE(autowipe, level) //Reset orbital body. QDEL_NULL(level.orbital_body) + + // MonkeStation edit: if only asteroids are cleared orbital bodies, we can subtract the asteroid counter here + // Otherwise, we need a way to distinguish between asteroids and other orbital bodies + SSorbits.current_asteroids -- + //Continue tracking after wipe_z_level(level.z_value, TRUE) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index ce8fe83fae261..b95f3db21585d 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -421,10 +421,12 @@ //Supply -/obj/item/circuitboard/computer/objective - name = "Nanotrasen objective console (Computer Board)" - icon_state = "supply" - build_path = /obj/machinery/computer/objective +// MonkeStation edit: Exploration disabled + +// /obj/item/circuitboard/computer/objective +// name = "Nanotrasen objective console (Computer Board)" +// icon_state = "supply" +// build_path = /obj/machinery/computer/objective /obj/item/circuitboard/computer/bounty name = "Nanotrasen bounty console (Computer Board)" diff --git a/code/modules/exploration_crew/exploration_shuttle.dm b/code/modules/exploration_crew/exploration_shuttle.dm index 9918f3721edfc..e1bde79a1ee18 100644 --- a/code/modules/exploration_crew/exploration_shuttle.dm +++ b/code/modules/exploration_crew/exploration_shuttle.dm @@ -1,10 +1,11 @@ -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration - name = "exploration shuttle console" - desc = "Used to pilot the exploration shuttle." - circuit = /obj/item/circuitboard/computer/shuttle/exploration_shuttle - shuttleId = "exploration" - possible_destinations = "exploration_home" - req_access = list(ACCESS_EXPLORATION) +// MonkeStation edit: Exploration +// /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration +// name = "exploration shuttle console" +// desc = "Used to pilot the exploration shuttle." +// circuit = /obj/item/circuitboard/computer/shuttle/exploration_shuttle +// shuttleId = "exploration" +// possible_destinations = "exploration_home" +// // req_access = list(ACCESS_EXPLORATION) /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration/linkShuttle(new_id) return diff --git a/code/modules/exploration_crew/exploration_vendor.dm b/code/modules/exploration_crew/exploration_vendor.dm index 9dac6964e3847..7450e0da8500c 100644 --- a/code/modules/exploration_crew/exploration_vendor.dm +++ b/code/modules/exploration_crew/exploration_vendor.dm @@ -36,6 +36,7 @@ GLOBAL_VAR_INIT(exploration_points, 0) GLOB.exploration_points -= amount /obj/machinery/vendor/exploration/get_points(obj/item/card/id/I) - if(!(ACCESS_EXPLORATION in I.access)) - return 0 - return GLOB.exploration_points + // if(!(ACCESS_EXPLORATION in I.access)) + // return 0 + // return GLOB.exploration_points + return 0 diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 0d8bdacae462e..7fbda41f4a782 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -135,7 +135,7 @@ ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, - ACCESS_HYDROPONICS, ACCESS_RANCHER, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_EXPLORATION, ACCESS_SURGERY, + ACCESS_HYDROPONICS, ACCESS_RANCHER, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, @@ -175,7 +175,7 @@ if(3) //medbay return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO) if(4) //research - return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_EXPLORATION, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK, ACCESS_RD_SERVER) + return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK, ACCESS_RD_SERVER) if(5) //engineering and maintenance return list(ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MECH_ENGINE, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_CE) if(6) //supply @@ -286,8 +286,8 @@ return "CMO Office" if(ACCESS_QM) return "Quartermaster" - if(ACCESS_EXPLORATION) - return "Exploration Dock" + // if(ACCESS_EXPLORATION) + // return "Exploration Dock" if(ACCESS_SURGERY) return "Surgery" if(ACCESS_THEATRE) @@ -378,7 +378,7 @@ // Engineering "Chief Engineer", "Station Engineer", "Atmospheric Technician", // R&D - "Research Director", "Scientist", "Roboticist", "Exploration Crew", + "Research Director", "Scientist", "Roboticist", // Medical "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Psychiatrist", // Security diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index a2952d01df15b..29c6f41c52300 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -24,13 +24,13 @@ ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_EXPLORATION, + ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_RANCHER) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_EXPLORATION, + ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_RANCHER) paycheck = PAYCHECK_COMMAND diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 143d4afa99bdf..09a7b34dcb0eb 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -15,8 +15,8 @@ outfit = /datum/outfit/job/quartermaster - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_EXPLORATION) - minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_EXPLORATION) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_CAR diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index a4f0231aa7fd1..9f8bc01892a88 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -19,12 +19,12 @@ outfit = /datum/outfit/job/rd - access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_EXPLORATION, + access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK, ACCESS_AUX_BASE, ACCESS_RD_SERVER, ACCESS_WEAPONS) - minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_EXPLORATION, + minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index d9cd819896535..6fc36fc990bea 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -15,9 +15,9 @@ outfit = /datum/outfit/job/scientist access = list(ACCESS_RND, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, - ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE, ACCESS_EXPLORATION) + ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE) minimal_access = list(ACCESS_RND, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, - ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_EXPLORATION) + ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index f755c39f31e9f..bb16ea41c1f50 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_INIT(medical_positions, list( GLOBAL_LIST_INIT(science_positions, list( "Research Director", "Scientist", - "Exploration Crew", + // "Exploration Crew", // MonkeStation edit: Exploration temporarily disabled "Roboticist")) diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 012d32d65c8e8..b6cae79398720 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -229,13 +229,14 @@ icon_state = "supply" build_path = /obj/machinery/computer/chef_order -/datum/design/board/objective - name = "Computer Design (Objective Console)" - desc = "Allows for the construction of circuit boards used to build a Objective Console." - id = "objective" - build_path = /obj/item/circuitboard/computer/objective - category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE +// MonkeStation edit: Exploration disabled +// /datum/design/board/objective +// name = "Computer Design (Objective Console)" +// desc = "Allows for the construction of circuit boards used to build a Objective Console." +// id = "objective" +// build_path = /obj/item/circuitboard/computer/objective +// category = list("Computer Boards") +// departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE /datum/design/board/cargorequest name = "Computer Design (Supply Request Console)" diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm index b26b920412ad2..d7c57b50747b3 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm @@ -1,14 +1,14 @@ GLOBAL_LIST_EMPTY(objective_computers) -/obj/machinery/computer/objective - name = "station objective console" - desc = "A networked console that downloads and displays currently assigned station objectives." - icon_screen = "bounty" - icon_keyboard = "tech_key" - light_color = LIGHT_COLOR_ORANGE - req_access = list( ) - circuit = /obj/item/circuitboard/computer/objective - var/list/viewing_mobs = list() +// /obj/machinery/computer/objective +// name = "station objective console" +// desc = "A networked console that downloads and displays currently assigned station objectives." +// icon_screen = "bounty" +// icon_keyboard = "tech_key" +// light_color = LIGHT_COLOR_ORANGE +// req_access = list( ) +// circuit = /obj/item/circuitboard/computer/objective +// var/list/viewing_mobs = list() /obj/machinery/computer/objective/Initialize(mapload, obj/item/circuitboard/C) . = ..() @@ -21,15 +21,15 @@ GLOBAL_LIST_EMPTY(objective_computers) /obj/machinery/computer/objective/ui_state(mob/user) return GLOB.default_state -/obj/machinery/computer/objective/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "Objective") - ui.open() - viewing_mobs += user +// /obj/machinery/computer/objective/ui_interact(mob/user, datum/tgui/ui) +// ui = SStgui.try_update_ui(user, src, ui) +// if(!ui) +// ui = new(user, src, "Objective") +// ui.open() +// viewing_mobs += user -/obj/machinery/computer/objective/ui_close(mob/user, datum/tgui/tgui) - viewing_mobs -= user +// /obj/machinery/computer/objective/ui_close(mob/user, datum/tgui/tgui) +// viewing_mobs -= user /obj/machinery/computer/objective/ui_static_data(mob/user) var/list/data = list() @@ -57,8 +57,8 @@ GLOBAL_LIST_EMPTY(objective_computers) return if(action != "assign") return - var/obj_id = params["id"] - for(var/datum/orbital_objective/objective in SSorbits.possible_objectives) - if(objective.id == obj_id) - say(SSorbits.assign_objective(src, objective)) - return + // var/obj_id = params["id"] + // for(var/datum/orbital_objective/objective in SSorbits.possible_objectives) + // if(objective.id == obj_id) + // say(SSorbits.assign_objective(src, objective)) + // return diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm index cee1c7204a51f..fad15a019d76d 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm @@ -393,9 +393,9 @@ ruin_event?.post_spawn(floor_turfs, center_z) - //Start running event - if(ruin_event) - SSorbits.ruin_events += ruin_event + //Start running event // MonkeStation edit: ruins/objectives disabled + // if(ruin_event) + // SSorbits.ruin_events += ruin_event SSair.unpause_z(center_z) diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_loader.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_loader.dm index 2433843d27747..17ef64b19816f 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_loader.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_part_loader.dm @@ -6,5 +6,5 @@ GLOBAL_LIST_EMPTY(loaded_ruin_parts) for(var/subtype in subtypesof(/datum/map_template/ruin_part)) var/datum/map_template/ruin_part/ruin_st = new subtype() GLOB.loaded_ruin_parts += ruin_st - message_admins("Loaded ruin parts") - log_mapping("Ruin parts loaded.") + message_admins("Loaded ruin parts - THIS SHOULD BE DISABLED!") + log_mapping("Ruin parts loaded. - THIS SHOULD BE DISABLED!") From 03c24858145a06c69dfe44509ff4730ce53ac821 Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Wed, 8 Mar 2023 19:48:05 -0600 Subject: [PATCH 2/3] I got one little slash and my linter got scared --- code/controllers/subsystem/processing/orbits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/processing/orbits.dm b/code/controllers/subsystem/processing/orbits.dm index 97df4da5b9453..bf742080d2f06 100644 --- a/code/controllers/subsystem/processing/orbits.dm +++ b/code/controllers/subsystem/processing/orbits.dm @@ -167,7 +167,7 @@ PROCESSING_SUBSYSTEM_DEF(orbits) // /datum/orbital_objective/vip_recovery = 1 // ) // if(!length(possible_objectives)) -// priority_announce("Priority station objective received - Details transmitted to all available objective consoles. \ +// priority_announce("Priority station objective received - Details transmitted to all available objective consoles. // [GLOB.station_name] will have funds distributed upon objective completion.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) // var/chosen = pickweight(valid_objectives) // if(!chosen) From 39b7515a700a04c8c3cc37df656549f6e16eb933 Mon Sep 17 00:00:00 2001 From: SeeBeeSee <86379371+SeeBeeSee@users.noreply.github.com> Date: Thu, 9 Mar 2023 10:22:57 -0600 Subject: [PATCH 3/3] Cleaned up commented code --- beestation.dme | 1 - code/__DEFINES/access.dm | 1 - code/__DEFINES/jobs.dm | 2 - .../subsystem/processing/orbits.dm | 62 ------------------- .../circuitboards/computer_circuitboards.dm | 7 --- .../exploration_crew/exploration_shuttle.dm | 9 --- .../exploration_crew/exploration_vendor.dm | 3 - .../research/designs/comp_board_designs.dm | 9 --- .../objective_computer.dm | 25 -------- .../ruin_generator/ruin_generator.dm | 4 -- 10 files changed, 123 deletions(-) diff --git a/beestation.dme b/beestation.dme index 4a44e73620f76..64a6e8189d6a5 100644 --- a/beestation.dme +++ b/beestation.dme @@ -2393,7 +2393,6 @@ #include "code\modules\jobs\job_types\deputy.dm" #include "code\modules\jobs\job_types\detective.dm" #include "code\modules\jobs\job_types\emt.dm" -// #include "code\modules\jobs\job_types\exploration_team.dm" // MonkeStation edit: Exploration temporarily disabled #include "code\modules\jobs\job_types\geneticist.dm" #include "code\modules\jobs\job_types\gimmick.dm" #include "code\modules\jobs\job_types\head_of_personnel.dm" diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index d048f6ca93516..c3c2f3478a17b 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -59,7 +59,6 @@ #define ACCESS_THEATRE 46 #define ACCESS_RESEARCH 47 #define ACCESS_MINING 48 -// #define ACCESS_EXPLORATION 49 // MonkeStation edit: Exploration disabled temporarily #define ACCESS_MAILSORTING 50 #define ACCESS_VAULT 53 #define ACCESS_MINING_STATION 54 diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 00c4da6ce11c5..4fc81d57f84c1 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -20,7 +20,6 @@ #define RD_JF (1<<0) #define SCIENTIST (1<<1) -// #define EXPLORATION_CREW (1<<2) // MonkeStation edit: Exploration temporarily disabled #define CHEMIST (1<<2) #define CMO_JF (1<<3) #define DOCTOR (1<<4) @@ -92,7 +91,6 @@ #define JOB_DISPLAY_ORDER_VIROLOGIST 24 #define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 25 #define JOB_DISPLAY_ORDER_SCIENTIST 26 -// #define JOB_DISPLAY_ORDER_EXPLORATION 27 // MonkeStation edit: Exploration temporarily disabled #define JOB_DISPLAY_ORDER_ROBOTICIST 28 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 29 #define JOB_DISPLAY_ORDER_WARDEN 30 diff --git a/code/controllers/subsystem/processing/orbits.dm b/code/controllers/subsystem/processing/orbits.dm index bf742080d2f06..540d1f03ab8e1 100644 --- a/code/controllers/subsystem/processing/orbits.dm +++ b/code/controllers/subsystem/processing/orbits.dm @@ -10,8 +10,6 @@ PROCESSING_SUBSYSTEM_DEF(orbits) var/datum/orbital_map_tgui/orbital_map_tgui = new() - // var/initial_space_ruins = 2 - // var/initial_objective_beacons = 3 var/initial_asteroids = 11 // MonkeStation edit: ruins/objectives disabled // MonkeStation edit: renewable asteroids @@ -25,8 +23,6 @@ PROCESSING_SUBSYSTEM_DEF(orbits) var/datum/orbital_objective/current_objective - // var/list/datum/ruin_event/ruin_events = list() - var/list/runnable_events var/event_probability = 60 @@ -102,12 +98,6 @@ PROCESSING_SUBSYSTEM_DEF(orbits) var/datum/orbital_map/orbital_map = orbital_maps[map_key] orbital_map.post_setup() orbits_setup = TRUE - //Create initial ruins // MonkeStation edit: ruins/objectives disabled - // for(var/i in 1 to initial_space_ruins) - // new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() - // for(var/i in 1 to initial_objective_beacons) - // new /datum/orbital_object/z_linked/beacon/ruin() - //Create asteroid belt for(var/i in 1 to initial_asteroids) new /datum/orbital_object/z_linked/beacon/ruin/asteroid() current_asteroids += 1 @@ -120,22 +110,6 @@ PROCESSING_SUBSYSTEM_DEF(orbits) //Update UIs for(var/datum/tgui/tgui as() in open_orbital_maps) tgui.send_update() - //Check creating objectives / missions. // MonkeStation edit: ruins/objectives disabled - // if(next_objective_time < world.time && length(possible_objectives) < 6) - // create_objective() - // next_objective_time = world.time + rand(30 SECONDS, 5 MINUTES) - // Check space ruin count - // if(ruin_levels < 2 && prob(5)) - // new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() - //Check objective - // if(current_objective) - // if(current_objective.check_failed()) - // priority_announce("Central Command priority objective failed.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) - // QDEL_NULL(current_objective) - //Process events // MonkeStation edit: ruins/objectives disabled - // for(var/datum/ruin_event/ruin_event as() in ruin_events) - // if(!ruin_event.update()) - // ruin_events.Remove(ruin_event) // MonkeStation edit: makes asteroids renewable // (arbitrary values tho) @@ -158,39 +132,3 @@ PROCESSING_SUBSYSTEM_DEF(orbits) set category = "Ghost" SSorbits.orbital_map_tgui.ui_interact(src) -// /datum/controller/subsystem/processing/orbits/proc/create_objective() -// var/static/list/valid_objectives = list( -// /datum/orbital_objective/recover_blackbox = 3, -// /datum/orbital_objective/nuclear_bomb = 1, -// /datum/orbital_objective/assassination = 1, -// /datum/orbital_objective/artifact = 2, -// /datum/orbital_objective/vip_recovery = 1 -// ) -// if(!length(possible_objectives)) -// priority_announce("Priority station objective received - Details transmitted to all available objective consoles. -// [GLOB.station_name] will have funds distributed upon objective completion.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) -// var/chosen = pickweight(valid_objectives) -// if(!chosen) -// return -// var/datum/orbital_objective/objective = new chosen() -// objective.generate_payout() -// possible_objectives += objective -// update_objective_computers() - -// /datum/controller/subsystem/processing/orbits/proc/assign_objective(objective_computer, datum/orbital_objective/objective) -// if(!possible_objectives.Find(objective)) -// return "Selected objective is no longer available or has been claimed already." -// if(current_objective) -// return "An objective has already been selected and must be completed first." -// objective.on_assign(objective_computer) -// objective.generate_attached_beacon() -// objective.announce() -// current_objective = objective -// possible_objectives.Remove(objective) -// update_objective_computers() -// return "Objective selected, good luck." - -// /datum/controller/subsystem/processing/orbits/proc/update_objective_computers() -// for(var/obj/machinery/computer/objective/computer as() in GLOB.objective_computers) -// for(var/M in computer.viewing_mobs) -// computer.update_static_data(M) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index b95f3db21585d..e5cba1bb62b3d 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -421,13 +421,6 @@ //Supply -// MonkeStation edit: Exploration disabled - -// /obj/item/circuitboard/computer/objective -// name = "Nanotrasen objective console (Computer Board)" -// icon_state = "supply" -// build_path = /obj/machinery/computer/objective - /obj/item/circuitboard/computer/bounty name = "Nanotrasen bounty console (Computer Board)" icon_state = "supply" diff --git a/code/modules/exploration_crew/exploration_shuttle.dm b/code/modules/exploration_crew/exploration_shuttle.dm index e1bde79a1ee18..8fb677edb176a 100644 --- a/code/modules/exploration_crew/exploration_shuttle.dm +++ b/code/modules/exploration_crew/exploration_shuttle.dm @@ -1,12 +1,3 @@ -// MonkeStation edit: Exploration -// /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration -// name = "exploration shuttle console" -// desc = "Used to pilot the exploration shuttle." -// circuit = /obj/item/circuitboard/computer/shuttle/exploration_shuttle -// shuttleId = "exploration" -// possible_destinations = "exploration_home" -// // req_access = list(ACCESS_EXPLORATION) - /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration/linkShuttle(new_id) return diff --git a/code/modules/exploration_crew/exploration_vendor.dm b/code/modules/exploration_crew/exploration_vendor.dm index 7450e0da8500c..8cfc94fd592f1 100644 --- a/code/modules/exploration_crew/exploration_vendor.dm +++ b/code/modules/exploration_crew/exploration_vendor.dm @@ -36,7 +36,4 @@ GLOBAL_VAR_INIT(exploration_points, 0) GLOB.exploration_points -= amount /obj/machinery/vendor/exploration/get_points(obj/item/card/id/I) - // if(!(ACCESS_EXPLORATION in I.access)) - // return 0 - // return GLOB.exploration_points return 0 diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index b6cae79398720..ab5fee837d692 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -229,15 +229,6 @@ icon_state = "supply" build_path = /obj/machinery/computer/chef_order -// MonkeStation edit: Exploration disabled -// /datum/design/board/objective -// name = "Computer Design (Objective Console)" -// desc = "Allows for the construction of circuit boards used to build a Objective Console." -// id = "objective" -// build_path = /obj/item/circuitboard/computer/objective -// category = list("Computer Boards") -// departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE - /datum/design/board/cargorequest name = "Computer Design (Supply Request Console)" desc = "Allows for the construction of circuit boards used to build a Supply Request Console." diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm index d7c57b50747b3..4a2d857e09738 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/objective_computer.dm @@ -1,15 +1,5 @@ GLOBAL_LIST_EMPTY(objective_computers) -// /obj/machinery/computer/objective -// name = "station objective console" -// desc = "A networked console that downloads and displays currently assigned station objectives." -// icon_screen = "bounty" -// icon_keyboard = "tech_key" -// light_color = LIGHT_COLOR_ORANGE -// req_access = list( ) -// circuit = /obj/item/circuitboard/computer/objective -// var/list/viewing_mobs = list() - /obj/machinery/computer/objective/Initialize(mapload, obj/item/circuitboard/C) . = ..() GLOB.objective_computers += src @@ -21,16 +11,6 @@ GLOBAL_LIST_EMPTY(objective_computers) /obj/machinery/computer/objective/ui_state(mob/user) return GLOB.default_state -// /obj/machinery/computer/objective/ui_interact(mob/user, datum/tgui/ui) -// ui = SStgui.try_update_ui(user, src, ui) -// if(!ui) -// ui = new(user, src, "Objective") -// ui.open() -// viewing_mobs += user - -// /obj/machinery/computer/objective/ui_close(mob/user, datum/tgui/tgui) -// viewing_mobs -= user - /obj/machinery/computer/objective/ui_static_data(mob/user) var/list/data = list() data["possible_objectives"] = list() @@ -57,8 +37,3 @@ GLOBAL_LIST_EMPTY(objective_computers) return if(action != "assign") return - // var/obj_id = params["id"] - // for(var/datum/orbital_objective/objective in SSorbits.possible_objectives) - // if(objective.id == obj_id) - // say(SSorbits.assign_objective(src, objective)) - // return diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm index fad15a019d76d..20af822a1fdef 100644 --- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm +++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/ruin_generator.dm @@ -393,10 +393,6 @@ ruin_event?.post_spawn(floor_turfs, center_z) - //Start running event // MonkeStation edit: ruins/objectives disabled - // if(ruin_event) - // SSorbits.ruin_events += ruin_event - SSair.unpause_z(center_z) log_mapping("Finished generating ruin at [center_x], [center_y], [center_z]")