From 2eed04454187d4955a5b0a7b8c4c7f76a9740b18 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 13:54:29 +0200 Subject: [PATCH 01/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 49 +++++++-------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index bcbb03c320ea0..df49dd7dea4f4 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -863,8 +863,7 @@ /turf/open/floor/circuit/telecomms/server, /area/science/server) "aoY" = ( -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, +/turf/open/floor/glass/reinforced/plasma, /area/asteroid/paradise/surface) "apg" = ( /obj/machinery/light{ @@ -19741,6 +19740,12 @@ /area/tcommsat/computer) "jBP" = ( /obj/item/toy/plush/flushed, +/obj/machinery/door/firedoor/border_only/closed{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only/closed{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/science/central) "jCv" = ( @@ -20308,6 +20313,7 @@ /obj/structure/sign/warning/securearea{ pixel_x = -32 }, +/mob/living/silicon/robot/shell, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -20552,10 +20558,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"jUv" = ( -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/mixing/chamber) "jUw" = ( /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) @@ -23810,14 +23812,7 @@ /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) "lyT" = ( -/obj/structure/lattice/catwalk/over, -/obj/machinery/button/door{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters"; - pixel_y = 32; - req_one_access_txt = "7;29;12" - }, -/turf/open/floor/plating/asteroid/basalt/planetary, +/turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "lyU" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -29910,7 +29905,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/item/robot_suit/prebuilt, /turf/open/floor/iron, /area/science/robotics) "oEv" = ( @@ -30870,9 +30864,6 @@ pixel_x = 1; pixel_y = 29 }, -/obj/item/borg/upgrade/ai{ - pixel_x = 2 - }, /turf/open/floor/iron/dark, /area/science/robotics) "oZT" = ( @@ -31655,13 +31646,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"pyQ" = ( -/obj/machinery/door/poddoor/incinerator_toxmix{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters" - }, -/turf/open/floor/plating, -/area/maintenance/department/science/central) "pyW" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, @@ -33779,10 +33763,7 @@ /turf/open/floor/wood, /area/asteroid/paradise/surface) "qBi" = ( -/obj/machinery/door/poddoor/incinerator_toxmix{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters" - }, +/obj/structure/holosign/barrier/atmos/robust, /turf/open/floor/plating, /area/science/mixing/chamber) "qBw" = ( @@ -34031,7 +34012,7 @@ /turf/open/floor/plating, /area/maintenance/department/science/central) "qMA" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/maintenance/department/science/central) "qMI" = ( @@ -123241,7 +123222,7 @@ kQw fnQ fnQ xJz -sHr +kQw fnQ fnQ fnQ @@ -135325,7 +135306,7 @@ qLe olN olN olN -pyQ +rZM nFR dou bOR @@ -136353,7 +136334,7 @@ olN olN olN cae -jUv +lyT aKf aBF aFj @@ -136610,7 +136591,7 @@ vqI vqI vqI cae -jUv +lyT aLf aej amV From 4106fefd3005f4c1a9e79551c076e33cad75fb5b Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 14:55:27 +0200 Subject: [PATCH 02/38] Update stock_parts.dm --- code/modules/research/stock_parts.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index d3d0d4224b9a5..c3727b06431bb 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -201,6 +201,18 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi new /obj/item/stock_parts/micro_laser(src) new /obj/item/stock_parts/matter_bin(src) +/obj/item/storage/part_replacer/engi //used on echo + +/obj/item/storage/part_replacer/engi/PopulateContents() + for(var/i in 1 to 10) + new /obj/item/stock_parts/manipulator/nano(src) + new /obj/item/stock_parts/micro_laser/high(src) + new /obj/item/stock_parts/matter_bin/adv(src) + + new /obj/item/stock_parts/cell/super(src) + new /obj/item/stock_parts/capacitor/super(src) + + /obj/item/storage/part_replacer/cyborg name = "rapid part exchange device" desc = "Special mechanical module made to store, sort, and apply standard machine parts." From 1ff8708cd97a3e9145cbae1cd2b1ee08e5676da0 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 14:55:32 +0200 Subject: [PATCH 03/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 1061 +++++++++++-------- 1 file changed, 609 insertions(+), 452 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index df49dd7dea4f4..a5062ca60ad4a 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -14,9 +14,6 @@ /area/medical/patients_rooms) "aaU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) @@ -176,6 +173,15 @@ }, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"aer" = ( +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = 10 + }, +/turf/closed/wall/mineral/titanium/survival/nodiagonal, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "aet" = ( /obj/effect/turf_decal/delivery, /obj/machinery/computer/rdservercontrol{ @@ -1219,7 +1225,6 @@ /obj/machinery/camera/autoname/directional/east{ network = list("ss13","engine") }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) "avB" = ( @@ -1783,8 +1788,8 @@ }) "aFU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/science/central) "aGd" = ( @@ -1991,6 +1996,7 @@ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/tech, /area/engine/engineering) "aJy" = ( @@ -2078,6 +2084,13 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) +"aKk" = ( +/obj/machinery/door/poddoor/incinerator_toxmix{ + id = "EmergancyescapeShutter"; + name = "Emergancy escape Shutters" + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "aKw" = ( /obj/machinery/modular_computer/console/preset/command, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -3046,9 +3059,6 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "bfI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "bga" = ( @@ -3369,6 +3379,8 @@ dir = 4; initialize_directions = 4 }, +/obj/effect/turf_decal/stripes/end, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/tech, /area/engine/engineering) "bmC" = ( @@ -3666,7 +3678,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/security/detectives_office) +/area/maintenance/department/engine/atmos) "bsw" = ( /obj/structure/railing, /turf/open/openspace, @@ -4876,7 +4888,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/hydroponics) +/area/maintenance/department/crew_quarters/bar) "bYp" = ( /obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/bot, @@ -5065,9 +5077,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 }, @@ -5274,9 +5283,31 @@ "ciD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/maintenance/two, -/obj/structure/closet/crate, +/obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) +"cjb" = ( +/obj/machinery/light/small, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "cjj" = ( /obj/effect/turf_decal/siding/white/corner{ alpha = 100; @@ -5898,6 +5929,10 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"cyb" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/maintenance/department/security/brig) "cyj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6363,10 +6398,6 @@ /area/science/explab) "cJP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -6375,9 +6406,13 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "32" + }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/engine/atmos) +/area/maintenance/department/engine/atmos) "cJQ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -6427,6 +6462,14 @@ /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"cLj" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "32" + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "cLw" = ( /obj/structure/toilet{ pixel_x = -1; @@ -6763,6 +6806,15 @@ /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/xenobiology) +"cVV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/structure/holosign/barrier/atmos/robust, +/turf/open/floor/plating, +/area/asteroid/paradise) "cWg" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/wood/broken, @@ -7618,6 +7670,9 @@ dir = 8; initialize_directions = 8 }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/tech, /area/engine/engineering) "dzp" = ( @@ -8678,15 +8733,12 @@ /area/crew_quarters/cafeteria) "ecx" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 + icon_state = "0-2" }, -/turf/open/floor/iron/tech, +/obj/machinery/power/port_gen/pacman, +/obj/item/stack/sheet/mineral/plasma/ten, +/turf/open/floor/plating, /area/engine/engineering) "ecH" = ( /obj/structure/stairs{ @@ -8940,13 +8992,13 @@ "ekR" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/glass, -/obj/structure/closet/emcloset, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/closet/firecloset/full, /turf/open/floor/iron/white, /area/science/research) "elx" = ( @@ -9739,11 +9791,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "External Gas to Loop" +/obj/structure/table, +/obj/item/card/id/job/station_engineer{ + pixel_x = 5; + pixel_y = 0 + }, +/obj/item/pipe_dispenser{ + pixel_y = 7 + }, +/obj/item/pipe_dispenser{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 }, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/engineering) "eEo" = ( @@ -10039,6 +10101,22 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"eMF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "External Gas to Loop" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "eMU" = ( /obj/structure/railing{ dir = 6 @@ -10200,14 +10278,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/chapel/office) +/area/maintenance/department/chapel) "eQh" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/structure/table/reinforced, /obj/item/folder/white{ pixel_x = -5 @@ -10234,6 +10309,9 @@ pixel_x = 1; pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "eQo" = ( @@ -10266,6 +10344,16 @@ /obj/item/clothing/glasses/hud/security/sunglasses, /turf/open/floor/carpet/red, /area/security/detectives_office) +"eQN" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/button/door{ + id = "EmergancyescapeShutter"; + name = "Emergancy escape Shutters"; + pixel_y = 26; + pixel_x = 27 + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "eQW" = ( /obj/machinery/power/apc/auto_name/directional/north{ pixel_y = 24 @@ -10579,6 +10667,17 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"eXU" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/door/poddoor/incinerator_toxmix{ + id = "EmergancyescapeShutterengine"; + name = "Emergancy escape Shutters" + }, +/turf/open/floor/plating, +/area/asteroid/paradise) "eYg" = ( /obj/structure/stairs{ dir = 8 @@ -10716,33 +10815,29 @@ dir = 8 }, /obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = 1; - pixel_y = 12 - }, -/obj/item/pipe_dispenser{ - pixel_y = 7 - }, /obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson{ - pixel_y = 1 +/obj/item/clothing/head/beret/atmos{ + pixel_x = 4; + pixel_y = -2 }, /obj/item/clothing/glasses/meson{ - pixel_x = 2 + pixel_y = 7; + pixel_x = -6 }, -/obj/item/card/id/job/atmospheric_technician{ - access = list(11); - pixel_y = -5 +/obj/item/clothing/glasses/meson{ + pixel_y = 7; + pixel_x = -6 }, /obj/item/clothing/glasses/meson/engine{ - pixel_y = -6 + pixel_y = 10; + pixel_x = 6 }, -/obj/item/clothing/head/beret/atmos{ - pixel_x = 4; - pixel_y = -2 +/obj/item/clothing/glasses/meson/engine{ + pixel_y = 10; + pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 }, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -11075,6 +11170,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/engine/engineering) +"fju" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "fkk" = ( /obj/item/trash/semki, /turf/open/floor/plating/beach/sand, @@ -11256,6 +11357,10 @@ dir = 1 }, /obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/sign/map/echo{ + dir = 1; + pixel_x = 32 + }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) "fqb" = ( @@ -11342,6 +11447,23 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) +"fsB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only/closed{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only/closed{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "EmergancyescapeShutterengine"; + name = "Emergancy escape Shutters"; + pixel_y = 26 + }, +/turf/open/floor/plating, +/area/asteroid/paradise) "fta" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -11747,6 +11869,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light, /turf/open/floor/iron, /area/security/brig) "fCo" = ( @@ -12104,10 +12227,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 1 - }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/binary/volume_pump{ + name = "Loop to Gas Output"; + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "fMJ" = ( @@ -12636,9 +12760,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 }, @@ -12674,7 +12795,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/disposal) +/area/maintenance/department/science/central) "fWF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -12714,6 +12835,9 @@ dir = 4; initialize_directions = 4 }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/tech, /area/engine/engineering) "fYS" = ( @@ -12909,10 +13033,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/engineering) "gdk" = ( @@ -15221,7 +15349,8 @@ dir = 8 }, /obj/structure/sign/map/echo{ - pixel_x = -32 + pixel_x = -32; + dir = 1 }, /turf/open/floor/iron/dark, /area/hallway/primary/aft{ @@ -16025,6 +16154,9 @@ /area/maintenance/department/engine) "hAp" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engineering) "hAB" = ( @@ -16511,6 +16643,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/engine/engineering) +"hNK" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "hNR" = ( /obj/machinery/door/airlock/command{ name = "Server Room"; @@ -16868,7 +17004,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/science/explab) +/area/maintenance/department/science/central) "hYR" = ( /obj/structure/fence/corner{ dir = 6 @@ -16931,17 +17067,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/power/port_gen/pacman, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow, -/obj/item/stack/sheet/mineral/plasma/ten, -/obj/item/wrench{ - pixel_x = -4; - pixel_y = 5 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "iad" = ( @@ -17308,15 +17434,12 @@ /area/crew_quarters/cafeteria) "ijV" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = -33 }, /obj/machinery/light, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -18230,6 +18353,10 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/science/research) +"iMu" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "iMI" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -18477,6 +18604,7 @@ /area/chapel/office) "iTA" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/light, /turf/open/floor/iron, /area/security/brig) "iUt" = ( @@ -19413,13 +19541,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"jsW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "jtr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -19455,18 +19576,15 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "jue" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "32" + }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/maintenance/department/engine/atmos) "juz" = ( /obj/structure/bed{ dir = 8 @@ -19708,8 +19826,8 @@ "jAB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/chapel) "jAN" = ( @@ -19746,6 +19864,11 @@ /obj/machinery/door/firedoor/border_only/closed{ dir = 8 }, +/obj/machinery/button/door{ + id = "EmergancyescapeShutter"; + name = "Emergancy escape Shutters"; + pixel_y = 26 + }, /turf/open/floor/plating, /area/maintenance/department/science/central) "jCv" = ( @@ -20524,14 +20647,10 @@ /turf/open/floor/iron/grid/steel, /area/science/mixing) "jTE" = ( -/obj/effect/turf_decal/box, /obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/engine/engineering) "jUk" = ( /obj/effect/landmark/start/assistant, @@ -20572,16 +20691,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 9 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "jUM" = ( @@ -20599,6 +20712,13 @@ }, /turf/open/floor/iron, /area/medical/surgery) +"jVb" = ( +/obj/machinery/door/poddoor/incinerator_toxmix{ + id = "EmergancyescapeShutter"; + name = "Emergancy escape Shutters" + }, +/turf/open/floor/plating, +/area/asteroid/paradise) "jVe" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -20914,9 +21034,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 4 }, @@ -21106,6 +21223,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) +"kgM" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "khi" = ( /obj/machinery/button/door{ id = "Cabin4"; @@ -21627,6 +21749,10 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/sign/map/echo{ + dir = 4; + pixel_x = 32 + }, /turf/open/openspace, /area/hallway/primary/fore{ name = "-1 Primary Hallway" @@ -22234,6 +22360,10 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"kJJ" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "kJL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22300,11 +22430,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 8 +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/item/wrench, /turf/open/floor/iron/tech, /area/engine/engineering) "kKY" = ( @@ -22529,11 +22662,8 @@ /turf/closed/wall, /area/maintenance/department/medical/morgue) "kQJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 }, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -22751,12 +22881,6 @@ /obj/machinery/hydroponics/soil, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"kXp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 5 - }, -/turf/closed/wall, -/area/engine/supermatter) "kXu" = ( /obj/machinery/vending/autodrobe/all_access, /obj/machinery/airalarm/directional/north, @@ -23549,7 +23673,6 @@ "lsm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/tree/jungle, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -23646,17 +23769,8 @@ /turf/open/floor/iron, /area/maintenance/department/medical/morgue) "lvc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/item/wrench, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/tech, +/obj/structure/cable/yellow, +/turf/open/floor/plating, /area/engine/engineering) "lvj" = ( /obj/structure/bookcase/random/adult, @@ -23849,7 +23963,8 @@ }, /obj/structure/closet/emcloset, /obj/structure/sign/map/echo{ - pixel_y = 32 + pixel_y = 32; + dir = 8 }, /turf/open/floor/glass/reinforced, /area/hallway/primary/fore{ @@ -23892,14 +24007,11 @@ /area/maintenance/department/science/xenobiology) "lAM" = ( /obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; name = "Gas to Filter" }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/dark, /area/engine/engineering) "lAN" = ( @@ -24712,7 +24824,7 @@ /area/maintenance/department/engine/atmos) "lVQ" = ( /obj/effect/spawner/lootdrop/maintenance/two, -/obj/structure/closet/emcloset/anchored, +/obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/maintenance/department/bridge) "lVX" = ( @@ -25026,6 +25138,15 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) +"mfz" = ( +/obj/machinery/button/door{ + id = "EmergancyescapeShutter"; + name = "Emergancy escape Shutters"; + pixel_y = 32; + req_one_access_txt = "7;29;12" + }, +/turf/open/floor/engine/vacuum, +/area/asteroid/paradise) "mgk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -25335,7 +25456,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/science/mixing) +/area/maintenance/department/science/central) "moU" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26334,9 +26455,6 @@ pixel_x = 7; pixel_y = 7 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /turf/open/floor/iron/dark, /area/engine/engineering) "mOp" = ( @@ -26973,6 +27091,15 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"ngK" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer"; + req_one_access_txt = "32" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "ngO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -26983,12 +27110,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"nhl" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 9 - }, -/turf/closed/wall, -/area/engine/supermatter) "nhs" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -27005,9 +27126,6 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "nhz" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -27019,6 +27137,12 @@ dir = 1 }, /obj/machinery/light, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "nhC" = ( @@ -27054,6 +27178,20 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"niA" = ( +/obj/structure/flora/junglebush/c, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/button/door{ + id = "EmergancyescapeShutterengine"; + name = "Emergancy escape Shutters"; + pixel_y = 26; + pixel_x = -27; + req_one_access_txt = "32" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "niN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter/flipped, @@ -27221,9 +27359,6 @@ /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/dark, /area/engine/engineering) "nnR" = ( @@ -27291,6 +27426,10 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"npx" = ( +/obj/machinery/door/poddoor/incinerator_toxmix, +/turf/open/floor/engine/vacuum, +/area/asteroid/paradise) "npY" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /turf/open/floor/iron/tech, @@ -27369,16 +27508,13 @@ /turf/open/floor/glass/reinforced, /area/crew_quarters/heads/cmo) "nrK" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/spawner/structure/window, /obj/structure/curtain/directional{ color = "#ACD1E9"; dir = 8; icon_state = "bathroom-open"; icon_type = "bathroom" }, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/surgery) "nrQ" = ( @@ -27402,7 +27538,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/security/prison) +/area/maintenance/department/engine/atmos) "ntA" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -28414,8 +28550,8 @@ /area/science/robotics) "nTF" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "nTR" = ( @@ -28873,7 +29009,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/security/brig) +/area/maintenance/department/eva) "ogE" = ( /obj/machinery/airalarm/engine{ dir = 8; @@ -29188,9 +29324,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/iron, /area/engine/engineering) "ooN" = ( @@ -30064,6 +30197,9 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 4 }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/tech, /area/engine/engineering) "oHx" = ( @@ -30417,7 +30553,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/bridge) +/area/maintenance/department/bridge) "oNv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -30564,9 +30700,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/dark, /area/engine/engineering) "oQQ" = ( @@ -30768,12 +30901,13 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "External Gas to Loop" }, /turf/open/floor/iron/dark, /area/engine/engineering) @@ -31075,6 +31209,11 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/prison/dark, /area/security/prison) +"pfB" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "pfN" = ( /obj/structure/window/reinforced{ dir = 1 @@ -31382,6 +31521,10 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"pqD" = ( +/obj/structure/sign/warning/radiation/rad_area, +/turf/closed/wall/r_wall/rust, +/area/asteroid/paradise) "pqE" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -31436,6 +31579,14 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"psK" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "psS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31495,7 +31646,7 @@ req_one_access_txt = "31;48" }, /turf/open/floor/plating, -/area/quartermaster/storage) +/area/maintenance/department/cargo) "ptj" = ( /obj/machinery/light_switch{ pixel_x = 24; @@ -31543,9 +31694,6 @@ "pvC" = ( /obj/effect/turf_decal/numbers/two_nine, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "pvV" = ( @@ -31935,12 +32083,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"pGF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 6 - }, -/turf/closed/wall, -/area/engine/supermatter) "pHe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/maintenance_hatch{ @@ -31959,8 +32101,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/plating, -/area/crew_quarters/heads/chief) +/area/maintenance/department/bridge) "pHp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -32367,6 +32512,17 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"pRN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 9 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "pRW" = ( /obj/structure/chair/office{ dir = 4 @@ -32546,7 +32702,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/crew_quarters/kitchen/coldroom) +/area/hallway/secondary/service) "pUZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door/incinerator_vent_atmos_aux{ @@ -32598,6 +32754,18 @@ }, /turf/open/floor/iron/white, /area/medical/surgery) +"pVR" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer"; + req_one_access_txt = "32" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "pVY" = ( /turf/closed/wall, /area/engine/engineering) @@ -32784,6 +32952,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, /turf/open/floor/iron, /area/security/brig) "qar" = ( @@ -32950,12 +33122,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"qey" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/closed/wall/r_wall, -/area/crew_quarters/heads/cmo) "qeO" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, @@ -32969,9 +33135,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 4 }, @@ -33251,11 +33414,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ dir = 8 }, -/obj/machinery/door/airlock/public/glass/incinerator{ - frequency = null; - req_access_txt = "11"; - req_one_access = null - }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "qkM" = ( @@ -33323,12 +33481,6 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"qms" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "qmz" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -33842,9 +33994,6 @@ dir = 8; pixel_x = -23 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -33963,6 +34112,16 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"qJR" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "qJS" = ( /turf/closed/wall/r_wall, /area/crew_quarters/cafeteria) @@ -34221,9 +34380,6 @@ name = "-2 Primary Hallway" }) "qRN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) @@ -34708,8 +34864,8 @@ /obj/structure/cable/yellow{ icon_state = "8-32" }, -/obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/maintenance/department/science/central) "rck" = ( @@ -34748,7 +34904,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/science/research) +/area/maintenance/department/science/xenobiology) "rcQ" = ( /obj/structure/railing{ dir = 1 @@ -34950,6 +35106,10 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"riH" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "riT" = ( /obj/machinery/button/door{ id = "meetingshutter"; @@ -35044,7 +35204,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/science/lab) +/area/maintenance/department/science/central) "rks" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/airless, @@ -35550,11 +35710,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"rvl" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/department/science/central) "rvq" = ( /obj/structure/railing/corner{ dir = 8 @@ -35593,7 +35748,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/science/lab) +/area/maintenance/department/science/central) "rwF" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -35716,14 +35871,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"rzV" = ( -/obj/structure/flora/rock/pile, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "rAh" = ( /obj/structure/table/glass, /obj/item/retractor{ @@ -36065,6 +36212,11 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"rIz" = ( +/obj/effect/spawner/lootdrop/maintenance/two, +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "rIZ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, @@ -36240,7 +36392,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/teleporter) +/area/maintenance/department/eva) "rNv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -36659,6 +36811,9 @@ }, /turf/open/floor/dock/drydock, /area/quartermaster/storage) +"sar" = ( +/turf/open/floor/engine/vacuum, +/area/asteroid/paradise) "sav" = ( /obj/effect/turf_decal/caution, /obj/machinery/computer/security/telescreen/toxins{ @@ -37335,8 +37490,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/sand/plating, -/obj/structure/grille, -/turf/open/floor/plating/asteroid/basalt/planetary, +/obj/effect/spawner/structure/window/depleteduranium, +/turf/open/floor/plating, /area/asteroid/paradise) "sru" = ( /obj/structure/chair/wood/normal{ @@ -37799,7 +37954,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/science/robotics) +/area/maintenance/department/science/central) "sGy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/ywflowers, @@ -37843,15 +37998,15 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "sGP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, /obj/structure/sign/painting/library{ pixel_x = 1; pixel_y = -32 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/iron, /area/medical/surgery) "sGX" = ( @@ -38602,9 +38757,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 }, @@ -38672,21 +38824,6 @@ /obj/effect/turf_decal/evac/evac_big, /turf/open/floor/iron, /area/maintenance/department/science/central) -"tcS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "tdh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -39050,6 +39187,18 @@ }, /turf/open/floor/iron, /area/security/brig) +"tjU" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "tko" = ( /turf/closed/wall, /area/security/detectives_office) @@ -39326,14 +39475,11 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "cmoshutter"; name = "CMO Office Shutters" }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "toz" = ( @@ -39370,6 +39516,11 @@ }, /turf/open/floor/prison, /area/security/prison) +"tpB" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "tpD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -39736,9 +39887,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 4 }, @@ -39842,6 +39990,9 @@ pixel_y = -24 }, /obj/machinery/airalarm/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "tyI" = ( @@ -40313,7 +40464,7 @@ /area/maintenance/department/engine/atmos) "tIP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 6 + dir = 4 }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) @@ -40418,12 +40569,9 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "tKv" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /turf/open/floor/iron/dark, /area/engine/engineering) "tKR" = ( @@ -40550,10 +40698,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"tOu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall/rust, -/area/asteroid/paradise) "tOv" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -41344,6 +41488,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/engine/engineering) "uet" = ( @@ -42202,15 +42347,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"uAD" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engine/engineering) "uAG" = ( /obj/structure/railing{ dir = 4 @@ -42252,6 +42388,9 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, /obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 6 + }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "uCw" = ( @@ -42611,9 +42750,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/maintenance/department/engine/atmos) "uNk" = ( /obj/machinery/computer/security/qm{ dir = 4 @@ -43673,7 +43810,8 @@ "vmm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/map/echo{ - pixel_x = -32 + pixel_x = -32; + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore{ @@ -44125,7 +44263,7 @@ "vvC" = ( /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plating, -/area/maintenance/department/medical/morgue) +/area/maintenance/department/crew_quarters/bar) "vwd" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) @@ -44172,6 +44310,11 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"vwM" = ( +/obj/structure/lattice/catwalk/over, +/obj/structure/closet/firecloset/full, +/turf/open/openspace, +/area/maintenance/department/engine/atmos) "vwV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -44309,6 +44452,10 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark, /area/security/prison) +"vBT" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/tech, +/area/asteroid/paradise) "vDt" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, @@ -44460,17 +44607,8 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/open/floor/iron/dark, /area/engine/engineering) -"vGz" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 10 - }, -/turf/closed/wall, -/area/engine/supermatter) "vHd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/item/stock_parts/micro_laser/ultra, @@ -44481,6 +44619,9 @@ dir = 4; initialize_directions = 4 }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /turf/open/floor/iron/tech, /area/engine/engineering) "vHe" = ( @@ -44605,6 +44746,10 @@ "vLP" = ( /turf/closed/wall/r_wall, /area/storage/tech) +"vLS" = ( +/obj/structure/grille, +/turf/closed/wall/r_wall, +/area/asteroid/paradise) "vMa" = ( /obj/effect/turf_decal/siding/wideplating/terracotta{ dir = 1 @@ -44824,9 +44969,6 @@ /turf/open/floor/carpet/blue, /area/bridge/meeting_room) "vSN" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/structure/cable/yellow{ @@ -45314,11 +45456,14 @@ /turf/open/floor/pod/dark, /area/maintenance/department/science/central) "wdX" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/turf/open/floor/iron/tech, /area/engine/engineering) "wef" = ( /obj/structure/cable{ @@ -45331,17 +45476,11 @@ dir = 8 }, /obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "wex" = ( @@ -46465,6 +46604,14 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"wFO" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "wFP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -46857,10 +47004,12 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/engineering) "wOQ" = ( @@ -46878,7 +47027,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/crew_quarters/heads/hor) +/area/maintenance/department/science/central) "wPi" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -47478,7 +47627,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/science/xenobiology) +/area/maintenance/department/engine) "xfL" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt/dust, @@ -47698,9 +47847,6 @@ "xkz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) @@ -47823,10 +47969,6 @@ }, /turf/open/floor/plating/rust, /area/science/test_area) -"xoi" = ( -/obj/effect/spawner/structure/window/depleteduranium, -/turf/open/floor/plating, -/area/asteroid/paradise) "xoR" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -48276,13 +48418,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/manifold/green/visible/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/binary/volume_pump{ + name = "Loop to Gas Output"; + dir = 8 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark, /area/engine/engineering) "xwU" = ( @@ -48409,6 +48550,12 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) +"xAh" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "xAi" = ( /obj/structure/chair/office/light{ dir = 1 @@ -48472,7 +48619,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/security/brig) +/area/maintenance/department/security/brig) "xBv" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -49319,7 +49466,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/storage/primary) +/area/maintenance/department/science/xenobiology) "xWe" = ( /obj/structure/lattice, /turf/open/openspace, @@ -49448,6 +49595,10 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) +"xZE" = ( +/obj/item/toy/plush/flushed, +/turf/open/floor/plating, +/area/asteroid/paradise) "xZI" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 @@ -49467,6 +49618,7 @@ dir = 8; initialize_directions = 8 }, +/obj/effect/turf_decal/stripes/end, /turf/open/floor/iron/tech, /area/engine/engineering) "yaq" = ( @@ -49812,6 +49964,11 @@ "yli" = ( /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) +"ylV" = ( +/obj/structure/flora/junglebush/large, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "ylY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -61332,7 +61489,7 @@ gNG fUV ozj qUD -oJl +vLS sLz lFQ mVg @@ -61846,7 +62003,7 @@ mFt cEu trB dwq -oJl +vLS wAx jmP sLz @@ -62099,10 +62256,10 @@ aLz ihL kEO fhM -lCB -tOu +cEk +hJN qki -xoi +fPc oJl lCB lCB @@ -62354,11 +62511,11 @@ xgK nXA dbV uBt -cEk -mVg -xGU -xTD -mIF +kgM +pfB +ylV +wFO +pRN sXg vqI vqI @@ -62612,11 +62769,11 @@ lRK nXA tIP avs -wEe -qjq -hCx -mFT -sLz +xAh +hNK +oJl +cVV +oJl vqI vqI jsp @@ -62871,9 +63028,9 @@ jnO lCS lCS mVg -cEk -mGS -blO +oJl +fsB +lCB vqI vqI jsp @@ -63117,7 +63274,7 @@ kzr wyz oNv wON -jsW +aaU xkz xkz aaU @@ -63128,10 +63285,10 @@ pQS oer biV sXB -blO -viX -xqU -hJN +oJl +eXU +lCB +lCB vqI vqI jsp @@ -63375,20 +63532,20 @@ rfT udt hAp wdX -oHn +qJR oHn vHd fYP bmi -uAD +eGr bcS gPs mHA lCS hJN -wFM +niA ozj -cEk +oJl vqI vqI jsp @@ -63397,11 +63554,11 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI +mVg +xGU +xTD +mIF +sXg vqI vqI vqI @@ -63645,7 +63802,7 @@ iQr ndX viX xqU -fPc +oJl vqI vqI jsp @@ -63654,11 +63811,11 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI +wEe +qjq +hCx +mFT +sLz vqI vqI vqI @@ -63902,7 +64059,7 @@ lCS eGc mmJ ycy -xqU +oJl vqI vqI jsp @@ -63911,11 +64068,11 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI +lCB +mVg +cEk +mGS +blO vqI vqI vqI @@ -64145,8 +64302,8 @@ oFu pOA wWC ijV -vGz -nhl +dXI +dXI ifQ bUC nFx @@ -64156,10 +64313,10 @@ lSc uTP jIs sXB -cFP -rzV -wyw -sLz +lCB +pVR +oJl +oJl vqI vqI jsp @@ -64168,12 +64325,12 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI -vqI +pqD +oJl +blO +viX +xqU +hJN vqI vqI vqI @@ -64425,12 +64582,12 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI -vqI +tpB +lCB +hJN +wFM +ozj +cEk vqI vqI vqI @@ -64682,12 +64839,12 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI -vqI +vBT +ngK +ndX +viX +xqU +fPc vqI vqI vqI @@ -64939,12 +65096,12 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI -vqI +cjb +lCB +eGc +mmJ +ycy +xqU vqI vqI vqI @@ -65173,8 +65330,8 @@ pHp pOA wWC oQF -pGF -kXp +dXI +dXI ocx nKs dZF @@ -65196,12 +65353,12 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI -vqI +psK +oJl +cFP +pVR +wyw +sLz vqI vqI vqI @@ -65453,11 +65610,11 @@ jsp jsp jsp vqI -vqI -vqI -vqI -vqI -vqI +fju +oJl +cEk +gNq +ccl vqI vqI vqI @@ -65686,8 +65843,8 @@ dta kXQ kHt dHA -tcS gYA +eMF oYL wef cdn @@ -66201,7 +66358,7 @@ fQW hag hNJ hNJ -qms +nrc bfI bfI bfI @@ -124270,7 +124427,7 @@ fic eZI nqP eZI -eZI +vwM iwb rUl pQk @@ -125262,7 +125419,7 @@ vqI vqI vqI vqI -kQw +vqI kQw fnQ fnQ @@ -125526,10 +125683,10 @@ vun xsQ oHx rgA -kQw -wak +eyu +tjU vvC -kQw +eyu eyu pIA hxS @@ -126546,7 +126703,7 @@ vqI vqI vqI vqI -hiB +eyu eyu fna liG @@ -127105,7 +127262,7 @@ qHP wzP qHP sls -vqE +iwb qGg quq qGg @@ -127362,7 +127519,7 @@ ozt hse hdJ hdJ -vqE +iwb tIJ mEU xtb @@ -131992,7 +132149,7 @@ ajB tRH vJn xHy -uNe +cLj kPn utb hTq @@ -134019,7 +134176,7 @@ tmO tmO tmO tmO -rZM +kJJ bDW jTq aAV @@ -135049,7 +135206,7 @@ uZl sld bXW xny -wZl +eQN hYK aYd fXL @@ -135306,7 +135463,7 @@ qLe olN olN olN -rZM +aKk nFR dou bOR @@ -136843,9 +137000,9 @@ vqI vqI vqI vqI -vqI -vqI -vqI +hiB +jVb +lCB vqI cae cae @@ -137100,9 +137257,9 @@ vqI vqI vqI vqI -vqI -vqI -vqI +hiB +xZE +lCB vqI vqI vqI @@ -137357,9 +137514,9 @@ vqI vqI vqI vqI -vqI -vqI -vqI +oJl +jVb +oJl vqI vqI vqI @@ -137614,9 +137771,9 @@ vqI vqI vqI vqI -vqI -vqI -vqI +oJl +mfz +npx vqI vqI vqI @@ -137871,9 +138028,9 @@ vqI vqI vqI vqI -vqI -vqI -vqI +oJl +sar +npx vqI vqI vqI @@ -190046,7 +190203,7 @@ pdR ouX eQW gmU -btO +riH oXe cyT oXe @@ -190583,7 +190740,7 @@ vqE cFb yeZ gEN -tAg +cyb fdX wFL tAg @@ -193901,7 +194058,7 @@ ctU ipu qTU qwF -qey +oFa nmv swK gTA @@ -198526,7 +198683,7 @@ sld uZl kkA fPf -wZl +iMu fyA vpI hxL @@ -199553,7 +199710,7 @@ rZM rZM aQk olN -rvl +hdM pyw nmV flL @@ -199810,7 +199967,7 @@ hZK rZM rZM olN -pZC +rIz pWN sld wSN @@ -262297,7 +262454,7 @@ tPk rOv uNl trd -nrQ +aer tqs kqB bqg @@ -263068,7 +263225,7 @@ qQk pbk pbk fxY -kAX +trd eFW bqg bqg From ca56ee8c8c5ef811d1d6ba24e8ff23cc5b048d7e Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 16:13:35 +0200 Subject: [PATCH 04/38] WIP --- _maps/map_files/EchoStation/EchoStation.dmm | 902 ++++++++++---------- 1 file changed, 452 insertions(+), 450 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index a5062ca60ad4a..ccea577250b05 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -173,15 +173,6 @@ }, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) -"aer" = ( -/obj/structure/sign/directions/evac{ - dir = 4; - pixel_y = 10 - }, -/turf/closed/wall/mineral/titanium/survival/nodiagonal, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "aet" = ( /obj/effect/turf_decal/delivery, /obj/machinery/computer/rdservercontrol{ @@ -1313,15 +1304,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/science/central) -"axk" = ( -/obj/structure/closet/crate/science, -/obj/item/circuitboard/computer/shuttle/exploration_shuttle, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/circuitboard/machine/shuttle/heater, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "axr" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1656,6 +1638,9 @@ /obj/machinery/microwave{ pixel_y = 5 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "aDn" = ( @@ -3917,9 +3902,6 @@ /obj/machinery/camera/directional/north{ network = list("ss13","medbay") }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "byu" = ( @@ -4543,6 +4525,11 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"bPl" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "bPo" = ( /obj/machinery/door/airlock/mining{ name = "Quartermaster's Office"; @@ -6668,9 +6655,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "medbay" - }, /obj/machinery/door/airlock/medical/glass{ emergency = 1; id_tag = "MedbayFoyer"; @@ -7077,6 +7061,11 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light, +/obj/structure/sign/map/echo{ + pixel_y = -32; + dir = 8; + name = "map - level 0" + }, /turf/open/floor/iron/freezer, /area/hallway/primary/fore{ name = "-1 Primary Hallway" @@ -7833,6 +7822,17 @@ "dCr" = ( /turf/open/floor/plating/beach/coastline_t, /area/asteroid/paradise/surface/sand) +"dCw" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/closet/crate/science{ + name = "extended shuttle construction kit"; + req_one_access_txt = "19;32" + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "dCL" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot, @@ -8652,6 +8652,7 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 }, +/obj/machinery/power/rad_collector/anchored, /turf/open/floor/plating, /area/engine/supermatter) "eaA" = ( @@ -9849,6 +9850,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/sign/map/echo{ + pixel_y = 32; + dir = 1; + name = "map - level 1" + }, /turf/open/floor/plating/asteroid/planetary, /area/hallway/primary/fore{ name = "-1 Primary Hallway" @@ -10677,7 +10683,7 @@ name = "Emergancy escape Shutters" }, /turf/open/floor/plating, -/area/asteroid/paradise) +/area/engine/engineering) "eYg" = ( /obj/structure/stairs{ dir = 8 @@ -10961,9 +10967,6 @@ }, /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"feq" = ( -/turf/open/openspace, -/area/quartermaster/qm) "few" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -11359,7 +11362,8 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/sign/map/echo{ dir = 1; - pixel_x = 32 + pixel_x = 32; + name = "map - level 3" }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) @@ -11451,12 +11455,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 }, -/obj/machinery/door/firedoor/border_only/closed{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only/closed{ - dir = 4 - }, /obj/machinery/button/door{ id = "EmergancyescapeShutterengine"; name = "Emergancy escape Shutters"; @@ -12232,6 +12230,7 @@ name = "Loop to Gas Output"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/iron/dark, /area/engine/engineering) "fMJ" = ( @@ -12350,6 +12349,9 @@ dir = 8 }, /obj/machinery/camera/autoname/directional/west, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -12897,9 +12899,7 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/quartermaster/qm) "fZv" = ( /obj/structure/table/reinforced, /obj/item/mmi{ @@ -14340,6 +14340,10 @@ /obj/effect/turf_decal/caution, /turf/open/floor/plating, /area/engine/supermatter) +"gFr" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "gFx" = ( /obj/machinery/computer/scan_consolenew, /obj/effect/turf_decal/bot, @@ -14460,10 +14464,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/bridge) -"gIa" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface/grass) "gIO" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/stripes/line{ @@ -14816,6 +14816,10 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"gRB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/dock/drydock, +/area/asteroid/paradise/surface) "gRR" = ( /obj/machinery/door/morgue{ dir = 1; @@ -14977,6 +14981,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/security/brig) +"gXd" = ( +/obj/structure/closet/crate/science, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "gXg" = ( /obj/machinery/computer/bounty, /obj/effect/turf_decal/stripes/line, @@ -15350,7 +15361,8 @@ }, /obj/structure/sign/map/echo{ pixel_x = -32; - dir = 1 + dir = 1; + name = "map - level 3" }, /turf/open/floor/iron/dark, /area/hallway/primary/aft{ @@ -15439,9 +15451,6 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) -"hiB" = ( -/turf/closed/wall, -/area/asteroid/paradise) "hiE" = ( /obj/structure/chair/office/light{ dir = 4 @@ -16068,7 +16077,7 @@ /area/asteroid/paradise/surface) "hyo" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 }, /turf/open/floor/iron/grid/steel, @@ -17038,7 +17047,9 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional, /turf/open/floor/plating, -/area/quartermaster/qm) +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "hZg" = ( /obj/machinery/requests_console{ department = "Tool Storage"; @@ -17067,7 +17078,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 9 + }, +/obj/structure/table, +/obj/item/storage/part_replacer/engi{ + pixel_y = 5 + }, +/obj/item/screwdriver{ + pixel_y = 3 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "iad" = ( @@ -17237,6 +17257,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/engine/engineering) +"ifz" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "ifA" = ( /turf/open/openspace, /area/engineering/hallway{ @@ -17842,6 +17867,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/dock/drydock, /area/quartermaster/storage) +"ixU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/dock/drydock, +/area/asteroid/paradise/surface) "iya" = ( /obj/effect/turf_decal/sand/plating, /turf/closed/mineral/random/air, @@ -18565,10 +18595,6 @@ pixel_x = -32; pixel_y = 34 }, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 4 - }, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -18914,7 +18940,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/power/rad_collector, /turf/open/floor/iron/dark, /area/engine/engineering) "jaU" = ( @@ -19636,15 +19661,6 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) -"jxa" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "jxc" = ( /obj/machinery/modular_computer/console/preset/engineering{ dir = 8 @@ -19858,12 +19874,6 @@ /area/tcommsat/computer) "jBP" = ( /obj/item/toy/plush/flushed, -/obj/machinery/door/firedoor/border_only/closed{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only/closed{ - dir = 8 - }, /obj/machinery/button/door{ id = "EmergancyescapeShutter"; name = "Emergancy escape Shutters"; @@ -20427,6 +20437,18 @@ /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/r_wall, /area/medical/medbay/central) +"jMX" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer"; + req_one_access_txt = "32" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "jNd" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -20464,6 +20486,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"jNZ" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "jOo" = ( /turf/closed/mineral/random/air, /area/engine/atmos) @@ -20526,9 +20554,6 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "medbay" - }, /obj/machinery/door/airlock/grunge{ name = "Morgue"; req_one_access_txt = "6;5;4;28" @@ -20712,13 +20737,6 @@ }, /turf/open/floor/iron, /area/medical/surgery) -"jVb" = ( -/obj/machinery/door/poddoor/incinerator_toxmix{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters" - }, -/turf/open/floor/plating, -/area/asteroid/paradise) "jVe" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -21066,12 +21084,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"kct" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/crew_quarters/kitchen) "kcv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -21751,7 +21763,8 @@ }, /obj/structure/sign/map/echo{ dir = 4; - pixel_x = 32 + pixel_x = 32; + name = "map - level 1" }, /turf/open/openspace, /area/hallway/primary/fore{ @@ -22038,9 +22051,7 @@ /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) "kAS" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - piping_layer = 2 - }, +/obj/machinery/atmospherics/components/unary/cryo_cell, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -22639,9 +22650,6 @@ pixel_y = 10 }, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "kQs" = ( @@ -22665,6 +22673,9 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "kQZ" = ( @@ -23676,6 +23687,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/sign/map/echo{ + pixel_y = 32; + dir = 4; + name = "map - level 3" + }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) "lsu" = ( @@ -23962,10 +23978,6 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/structure/sign/map/echo{ - pixel_y = 32; - dir = 8 - }, /turf/open/floor/glass/reinforced, /area/hallway/primary/fore{ name = "-1 Primary Hallway" @@ -25138,15 +25150,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"mfz" = ( -/obj/machinery/button/door{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters"; - pixel_y = 32; - req_one_access_txt = "7;29;12" - }, -/turf/open/floor/engine/vacuum, -/area/asteroid/paradise) "mgk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -25165,10 +25168,6 @@ /obj/effect/landmark/loneops, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) -"mgK" = ( -/obj/structure/railing, -/turf/open/openspace, -/area/quartermaster/qm) "mgL" = ( /obj/machinery/camera/directional/north{ network = list("ss13","engine") @@ -26436,7 +26435,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 4 }, /obj/structure/table, @@ -26444,6 +26443,10 @@ pixel_x = -4; pixel_y = 10 }, +/obj/item/tank/internals/plasma{ + pixel_x = 7; + pixel_y = 7 + }, /obj/item/analyzer{ pixel_x = 1 }, @@ -26451,10 +26454,6 @@ pixel_x = -2; pixel_y = 11 }, -/obj/item/tank/internals/plasma{ - pixel_x = 7; - pixel_y = 7 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "mOp" = ( @@ -27191,7 +27190,7 @@ req_one_access_txt = "32" }, /turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) +/area/engine/engineering) "niN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter/flipped, @@ -27426,10 +27425,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"npx" = ( -/obj/machinery/door/poddoor/incinerator_toxmix, -/turf/open/floor/engine/vacuum, -/area/asteroid/paradise) "npY" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /turf/open/floor/iron/tech, @@ -27684,6 +27679,10 @@ }, /turf/open/floor/iron, /area/hydroponics) +"nyt" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "nyB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -28263,9 +28262,6 @@ name = "Medbay"; req_one_access_txt = "5" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "medbay" - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "nKc" = ( @@ -28829,9 +28825,6 @@ pixel_x = 5; pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, @@ -28891,10 +28884,6 @@ /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) "oer" = ( -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 5; - pixel_y = 4 - }, /obj/item/stack/sheet/glass/fifty{ pixel_x = -3; pixel_y = 3 @@ -28903,11 +28892,6 @@ pixel_x = -5; pixel_y = 1 }, -/obj/item/stack/sheet/plasteel{ - amount = 10; - pixel_x = -2; - pixel_y = 2 - }, /obj/item/stack/sheet/rglass{ amount = 30; pixel_x = 2; @@ -28917,14 +28901,6 @@ pixel_x = -2; pixel_y = -1 }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 4; - pixel_y = -1 - }, /obj/item/stack/rods/fifty, /obj/structure/table, /turf/open/floor/iron/tech, @@ -29085,10 +29061,6 @@ }, /area/science/lab) "oiK" = ( -/obj/machinery/airalarm/directional/north{ - dir = 1; - pixel_y = -23 - }, /mob/living/simple_animal/bot/mulebot{ home_destination = "QM #3"; suffix = "#3" @@ -29100,6 +29072,7 @@ location = "QM #3" }, /obj/effect/turf_decal/delivery, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/quartermaster/warehouse) "oiS" = ( @@ -29685,12 +29658,11 @@ /turf/open/floor/iron/white, /area/science/lab) "ove" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8; - pixel_x = 4 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "ovg" = ( @@ -29796,9 +29768,6 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "oxs" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/openspace, /area/hydroponics) "oxy" = ( @@ -30190,18 +30159,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/quartermaster/warehouse) -"oHn" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "oHx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -31252,7 +31209,8 @@ }, /obj/item/kirbyplants/random, /obj/structure/sign/map/echo{ - pixel_y = -32 + pixel_y = -32; + name = "map - level 2" }, /turf/open/floor/iron/dark/corner{ dir = 1 @@ -31682,6 +31640,9 @@ }, /turf/open/floor/wood, /area/medical/exam_room) +"pux" = ( +/turf/open/floor/dock/drydock, +/area/asteroid/paradise/surface) "pvd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -32025,9 +31986,6 @@ /turf/open/floor/iron/dark, /area/security/brig) "pFZ" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/structure/table, /obj/effect/turf_decal/siding/white{ dir = 9 @@ -32064,6 +32022,9 @@ pixel_x = 11; pixel_y = -6 }, +/obj/structure/railing{ + dir = 9 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "pGn" = ( @@ -32503,6 +32464,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ dir = 9 }, +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10; + pixel_x = -2; + pixel_y = 2 + }, /turf/open/floor/iron/tech, /area/engine/engineering) "pRe" = ( @@ -32512,6 +32491,13 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"pRt" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "pRN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -33335,13 +33321,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"qjr" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/obj/structure/frame, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "qjF" = ( /obj/structure/railing{ dir = 8 @@ -33735,11 +33714,18 @@ /turf/open/openspace, /area/science/lab) "qwe" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/critter, +/mob/living/simple_animal/chicken/turkey{ + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); + desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; + health = 200; + maxHealth = 200; + melee_damage = 5; + minbodytemp = 2.7; + name = "Tom" }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/dock/drydock, /area/asteroid/paradise/surface) "qwi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -34120,6 +34106,7 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/tech, /area/engine/engineering) "qJS" = ( @@ -34132,13 +34119,11 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) @@ -35337,6 +35322,16 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/ai_monitored/security/armory) +"rmD" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "rmX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/conveyor/inverted{ @@ -36811,9 +36806,6 @@ }, /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"sar" = ( -/turf/open/floor/engine/vacuum, -/area/asteroid/paradise) "sav" = ( /obj/effect/turf_decal/caution, /obj/machinery/computer/security/telescreen/toxins{ @@ -37035,32 +37027,25 @@ name = "Engineering Viewing Platform" }) "seY" = ( -/obj/effect/turf_decal/sand/plating, +/obj/structure/closet/crate/engineering{ + name = "extended shuttle construction kit"; + req_one_access_txt = "19;32" + }, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/plasma_refiner, +/obj/item/circuitboard/machine/exploration_equipment_vendor, +/obj/item/shuttle_creator, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/stack/sheet/rglass{ - amount = 30; - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/stack/sheet/plasteel/fifty, -/obj/item/circuitboard/machine/shuttle/engine/plasma{ - pixel_y = 3 - }, -/obj/item/circuitboard/machine/shuttle/engine/plasma{ - pixel_x = -6 - }, -/obj/item/shuttle_creator{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/circuitboard/machine/exploration_equipment_vendor{ - pixel_y = 5 - }, -/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/computer/shuttle/exploration_shuttle, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "sff" = ( @@ -37123,6 +37108,9 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) +"sgR" = ( +/turf/open/space/basic, +/area/asteroid/paradise/surface) "sho" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -38135,6 +38123,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/sign/map/echo{ + pixel_y = 32; + name = "map - level 2" + }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) "sLz" = ( @@ -38811,6 +38803,13 @@ }, /turf/open/floor/wood, /area/chapel/office) +"tcs" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/engine/engineering) "tcM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -39543,6 +39542,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = 32 + }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "tqq" = ( @@ -40417,6 +40420,13 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"tIr" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/engine/engineering) "tIw" = ( /obj/structure/railing{ dir = 4 @@ -40469,10 +40479,10 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "tIU" = ( +/obj/structure/reagent_dispensers/water_cooler, /obj/structure/railing{ - dir = 1 + dir = 9 }, -/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -40572,6 +40582,7 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark, /area/engine/engineering) "tKR" = ( @@ -40664,9 +40675,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/machinery/computer/crew{ dir = 8; req_one_access = list(5,4) @@ -41488,7 +41496,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/engine/engineering) "uet" = ( @@ -42759,9 +42766,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/quartermaster/qm) "uNl" = ( /obj/structure/barricade/wooden/crude, /obj/machinery/door/airlock/maintenance_hatch{ @@ -43811,7 +43816,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/map/echo{ pixel_x = -32; - dir = 8 + dir = 8; + name = "map - level 0" }, /turf/open/floor/iron, /area/hallway/primary/fore{ @@ -44611,17 +44617,13 @@ /area/engine/engineering) "vHd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/stock_parts/matter_bin/super, -/obj/item/stock_parts/matter_bin/super, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4; initialize_directions = 4 }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, /turf/open/floor/iron/tech, /area/engine/engineering) "vHe" = ( @@ -44733,6 +44735,10 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/asteroid/paradise/surface) +"vLe" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/dock/drydock, +/area/asteroid/paradise/surface) "vLx" = ( /obj/structure/sign/painting/library{ pixel_y = 1 @@ -44845,10 +44851,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"vPG" = ( -/obj/effect/spawner/structure/window, -/turf/open/openspace, -/area/quartermaster/qm) "vPP" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/structure/disposalpipe/segment{ @@ -45197,9 +45199,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/quartermaster/qm) "vYe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -45463,6 +45463,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/tech, /area/engine/engineering) "wef" = ( @@ -45787,6 +45788,9 @@ pixel_x = -2; pixel_y = 2 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "wjm" = ( @@ -46211,7 +46215,8 @@ /obj/effect/spawner/randomvend/cola, /obj/machinery/airalarm/directional/west, /obj/structure/sign/map/echo{ - pixel_y = 32 + pixel_y = 32; + name = "map - level 2" }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) @@ -46823,12 +46828,6 @@ "wLe" = ( /turf/open/floor/engine/light, /area/holodeck/small) -"wLz" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/quartermaster/qm) "wLQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49080,6 +49079,9 @@ dir = 8 }, /obj/machinery/processor, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "xMR" = ( @@ -49120,6 +49122,10 @@ "xOo" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/asteroid/paradise/surface) +"xOI" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/dock/drydock, +/area/asteroid/paradise/surface) "xPb" = ( /obj/effect/turf_decal/siding/wideplating/terracotta/corner{ dir = 8 @@ -49475,12 +49481,12 @@ /turf/closed/wall/r_wall, /area/bridge) "xWj" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -49595,10 +49601,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"xZE" = ( -/obj/item/toy/plush/flushed, -/turf/open/floor/plating, -/area/asteroid/paradise) "xZI" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 @@ -63285,10 +63287,10 @@ pQS oer biV sXB -oJl +sXB eXU -lCB -lCB +lCS +lCS vqI vqI jsp @@ -63533,7 +63535,7 @@ udt hAp wdX qJR -oHn +vHd vHd fYP bmi @@ -63542,10 +63544,10 @@ bcS gPs mHA lCS -hJN +bPl niA -ozj -oJl +gFr +sXB vqI vqI jsp @@ -63799,10 +63801,10 @@ hsv tVm iPj iQr -ndX -viX -xqU -oJl +pRt +tIr +nyt +sXB vqI vqI jsp @@ -64056,10 +64058,10 @@ uAb wzE nIe lCS -eGc -mmJ -ycy -oJl +jNZ +tcs +ifz +sXB vqI vqI jsp @@ -64313,10 +64315,10 @@ lSc uTP jIs sXB -lCB -pVR -oJl -oJl +lCS +jMX +sXB +sXB vqI vqI jsp @@ -126966,10 +126968,10 @@ dGh aGO afw cOp -kct -kct -kct -kct +cOp +cOp +cOp +cOp oxs rpH rGq @@ -128018,8 +128020,8 @@ wcC jME rId rId -feq -mgK +rId +isl vsW xvB wxq @@ -128275,8 +128277,8 @@ nSF jME fdi oln -vPG -ueV +oln +fdi mRY swS gwg @@ -128523,7 +128525,7 @@ ttY byq tND kQc -jxa +fMk mIN ueO leg @@ -128532,7 +128534,7 @@ tWL jME rId rId -feq +rId hYY eve uVo @@ -128788,9 +128790,9 @@ stZ jME wZF rId -wPp -wLz -ueV +rId +rId +fdi bPo vHu ueV @@ -129046,7 +129048,7 @@ gDp xiD rId tIU -xpy +rmD fOY xpy gwn @@ -137000,9 +137002,9 @@ vqI vqI vqI vqI -hiB -jVb -lCB +vqI +vqI +vqI vqI cae cae @@ -137257,9 +137259,9 @@ vqI vqI vqI vqI -hiB -xZE -lCB +vqI +vqI +vqI vqI vqI vqI @@ -137514,9 +137516,9 @@ vqI vqI vqI vqI -oJl -jVb -oJl +vqI +vqI +vqI vqI vqI vqI @@ -137771,9 +137773,9 @@ vqI vqI vqI vqI -oJl -mfz -npx +vqI +vqI +vqI vqI vqI vqI @@ -138028,9 +138030,9 @@ vqI vqI vqI vqI -oJl -sar -npx +vqI +vqI +vqI vqI vqI vqI @@ -256505,17 +256507,17 @@ dvc dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +rxi +rxi +rxi +rxi +xOo +lzi +ueT +kLl +sgR +sgR +rxi dvc dvc dvc @@ -256762,17 +256764,17 @@ dvc dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +rxi +rxi +kNb +mUP +sqh +nNY +rxi +wjA +sgR +sgR +rxi dvc dvc dvc @@ -256786,17 +256788,17 @@ kxS kxS rxi rxi -rxi -rxi -rxi -xOo -lzi -ueT -kLl -rxi -rxi -kxS -rxi +pux +gRB +gRB +gRB +gRB +gRB +pux +pux +pux +pux +gRB rxi kxS kxS @@ -257019,17 +257021,17 @@ dvc dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +coy +wjA +ial +xOo +tMK +rxi +eKt +dCw +sgR +sgR +cwc dvc dvc dvc @@ -257043,17 +257045,17 @@ kxS kxS kxS rxi -rxi -kNb -mUP -sqh -nNY -rxi -wjA -rxi -kxS -rxi -rxi +gRB +gRB +pux +pux +pux +vLe +pux +pux +pux +gRB +gRB seY ove rxi @@ -257276,17 +257278,17 @@ dvc dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +coy +nQC +prd +oqm +ial +ial +ial +kFv +vRk +lRf +rxi dvc dvc dvc @@ -257299,18 +257301,18 @@ kxS kxS kxS rxi -coy -wjA -gIa -xOo -tMK rxi -eKt +gRB +gRB +pux +gRB +pux +gRB qwe -rxi -qjr -cwc -rxi +ixU +gRB +pux +pux xBv ggb rxi @@ -257533,17 +257535,17 @@ dvc dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +coy +bty +ofC +ial +ial +otu +rxi +gXd +vuq +kNb +rxi dvc dvc dvc @@ -257556,18 +257558,18 @@ kxS kxS kxS rxi -coy -nQC -prd -oqm -ial -ial -ial -kFv -vRk -lRf -rxi rxi +pux +gRB +gRB +gRB +gRB +gRB +gRB +gRB +gRB +gRB +pux upA khr rxi @@ -257790,17 +257792,17 @@ dvc dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +coy +xOo +rxi +rxi +sHG +mon +yeM +ial +mon +jqW +rxi dvc dvc yli @@ -257813,18 +257815,18 @@ kxS kxS kxS rxi -coy -bty -ofC -ial -ial -otu -rxi -axk -vuq -kNb -rxi rxi +pux +gRB +gRB +gRB +gRB +pux +gRB +gRB +pux +ixU +pux nIC ggb rxi @@ -258047,17 +258049,17 @@ kxS dvc dvc dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc -dvc +rxi +wjA +xOo +rxi +fuO +dlw +xOo +xOo +rxi +rxi +rxi dvc dvc yli @@ -258070,18 +258072,18 @@ kxS kxS rxi rxi -coy -xOo -rxi -rxi -sHG -mon -yeM -gIa -mon -jqW -rxi rxi +gRB +gRB +gRB +pux +xOI +pux +gRB +pux +gRB +gRB +gRB gnb hJJ rxi @@ -258328,17 +258330,17 @@ kxS rxi rxi rxi -wjA -xOo -rxi -fuO -dlw -xOo -xOo -rxi -rxi -kxS -rxi +gRB +pux +pux +pux +pux +pux +gRB +gRB +gRB +pux +pux kxS rxi rxi @@ -262454,7 +262456,7 @@ tPk rOv uNl trd -aer +nrQ tqs kqB bqg From f912f282113ecc941fd4bc3ff439178ef0a4de25 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 16:33:42 +0200 Subject: [PATCH 05/38] Update robot.dm --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 1715cb7dd0177..5a18d8c6f6102 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1232,7 +1232,7 @@ /mob/living/silicon/robot/shell shell = TRUE - cell = null + cell = /obj/item/stock_parts/cell/high /mob/living/silicon/robot/mouse_buckle_handling(mob/living/M, mob/living/user) //Don't try buckling on INTENT_HARM so that silicons can search people's inventories without loading them From 0dd83a137bf9f06488f6dc3d89784ac91b23bd9a Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 16:38:28 +0200 Subject: [PATCH 06/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index ccea577250b05..9d8797dcdc254 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -27231,9 +27231,6 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "nlo" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -27245,7 +27242,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/side, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/turf/open/floor/iron/white, /area/science/lab) "nlE" = ( /obj/structure/railing{ @@ -42918,10 +42916,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white/side{ - dir = 4 + dir = 8 }, /area/science/lab) "uQG" = ( From 233029b3a90b557a440cb456b2b6c45f2bb9f8cd Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 16:38:52 +0200 Subject: [PATCH 07/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 9d8797dcdc254..76ae034a549fb 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -18184,7 +18184,7 @@ dir = 4 }, /turf/open/floor/iron/white/side{ - dir = 8 + dir = 4 }, /area/science/lab) "iIl" = ( From a6f94d6a798aadb6dcf99d81f7c5c62ee48cd04e Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 16:41:46 +0200 Subject: [PATCH 08/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 76ae034a549fb..3ac1b516a69cc 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -9794,8 +9794,7 @@ }, /obj/structure/table, /obj/item/card/id/job/station_engineer{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/pipe_dispenser{ pixel_y = 7 From 5061563ea1fb86e55a9e038a9642c3c3b03ee47a Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 20:57:38 +0200 Subject: [PATCH 09/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 601 +++++--------------- 1 file changed, 127 insertions(+), 474 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 3ac1b516a69cc..1237be9692d09 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -3672,13 +3672,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/engine) -"bty" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/frame/computer{ - anchored = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "btG" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -5273,28 +5266,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"cjb" = ( -/obj/machinery/light/small, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/obj/item/storage/box/lights/mixed{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "cjj" = ( /obj/effect/turf_decal/siding/white/corner{ alpha = 100; @@ -5561,10 +5532,6 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"coy" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/asteroid/paradise/surface) "coF" = ( /obj/structure/closet/crate/hydroponics{ req_access_txt = "35;28" @@ -5839,12 +5806,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/crew_quarters/heads/chief) -"cwc" = ( -/obj/machinery/shuttle/engine/plasma{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "cwz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7292,12 +7253,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"dlw" = ( -/obj/machinery/door/airlock/external/glass{ - autoclose = 0.1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "dme" = ( /obj/structure/railing{ dir = 4 @@ -7822,17 +7777,6 @@ "dCr" = ( /turf/open/floor/plating/beach/coastline_t, /area/asteroid/paradise/surface/sand) -"dCw" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/closet/crate/science{ - name = "extended shuttle construction kit"; - req_one_access_txt = "19;32" - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "dCL" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot, @@ -9876,12 +9820,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"eGc" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "eGr" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -10057,10 +9995,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"eKt" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "eKX" = ( /turf/closed/wall, /area/chapel/office) @@ -11172,12 +11106,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/engine/engineering) -"fju" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "fkk" = ( /obj/item/trash/semki, /turf/open/floor/plating/beach/sand, @@ -11544,10 +11472,6 @@ }, /turf/open/floor/plating, /area/security/prison) -"fuO" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/asteroid/paradise/surface) "fuQ" = ( /obj/structure/fence/corner{ dir = 5 @@ -14980,13 +14904,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/security/brig) -"gXd" = ( -/obj/structure/closet/crate/science, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "gXg" = ( /obj/machinery/computer/bounty, /obj/effect/turf_decal/stripes/line, @@ -16290,11 +16207,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/engine) -"hCx" = ( -/obj/structure/flora/rock/pile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "hCL" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -17096,10 +17008,6 @@ }, /turf/open/floor/iron/solarpanel, /area/asteroid/paradise/surface) -"ial" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "iao" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -19375,9 +19283,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"jqW" = ( -/turf/closed/wall/mineral/plastitanium, -/area/asteroid/paradise/surface) "jqY" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -1 @@ -22224,11 +22129,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/bridge) -"kFv" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "kGr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -22471,9 +22371,6 @@ }, /turf/open/floor/iron, /area/science/misc_lab) -"kLl" = ( -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "kLU" = ( /turf/open/floor/iron, /area/engine/atmos) @@ -22506,9 +22403,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"kNb" = ( -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "kNj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -23960,18 +23854,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) -"lzi" = ( -/obj/machinery/door/poddoor/shutters{ - id = "exploration" - }, -/obj/machinery/button/door{ - desc = "A remote control switch."; - id = "exploration"; - name = "Exploration Shuttle Shutters"; - pixel_y = 24 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "lzp" = ( /obj/structure/railing{ dir = 4 @@ -24644,15 +24526,6 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) -"lRf" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "lRg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -25381,13 +25254,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"mmJ" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "mni" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -25410,11 +25276,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"mon" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "moy" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -26134,18 +25995,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"mFT" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 9 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "mGM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -26160,13 +26009,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/bridge) -"mGS" = ( -/obj/structure/flora/rock/pile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "mHA" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/corner, @@ -26228,17 +26070,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"mIF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "mIN" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -26668,10 +26499,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"mUP" = ( -/obj/machinery/door/airlock/shuttle, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "mVg" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, @@ -27010,13 +26837,6 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/brig) -"ndX" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "ned" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -27089,15 +26909,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"ngK" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "ngO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -28356,13 +28167,6 @@ /obj/structure/railing, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"nNY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "nOn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -28442,10 +28246,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) -"nQC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "nQI" = ( /obj/structure/fence{ dir = 8 @@ -28929,11 +28729,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"ofC" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "ofE" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing, @@ -29387,13 +29182,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"oqm" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -32; - pixel_y = -1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "oqn" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 32; @@ -29584,18 +29372,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"otu" = ( -/mob/living/simple_animal/chicken/turkey{ - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); - desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; - health = 200; - maxHealth = 200; - melee_damage = 5; - minbodytemp = 2.7; - name = "Tom" - }, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "otW" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -31476,21 +31252,10 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"pqD" = ( -/obj/structure/sign/warning/radiation/rad_area, -/turf/closed/wall/r_wall/rust, -/area/asteroid/paradise) "pqE" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/cafeteria) -"prd" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "psm" = ( /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -31534,14 +31299,6 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"psK" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "psS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -32737,18 +32494,6 @@ }, /turf/open/floor/iron/white, /area/medical/surgery) -"pVR" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "pVY" = ( /turf/closed/wall, /area/engine/engineering) @@ -33313,11 +33058,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"qjq" = ( -/obj/structure/flora/grass/jungle/b, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "qjF" = ( /obj/structure/railing{ dir = 8 @@ -37105,9 +36845,6 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) -"sgR" = ( -/turf/open/space/basic, -/area/asteroid/paradise/surface) "sho" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37465,11 +37202,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"sqh" = ( -/obj/machinery/light/small/broken/directional/west, -/obj/structure/frame, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "sqm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, @@ -38021,10 +37753,6 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, /area/maintenance/department/chapel) -"sHG" = ( -/obj/machinery/light/small/broken/directional/east, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "sHI" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -39512,11 +39240,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"tpB" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "tpD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -40638,10 +40361,6 @@ /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"tMK" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "tNh" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, @@ -41507,12 +41226,6 @@ /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, /area/medical/apothecary) -"ueT" = ( -/obj/machinery/door/poddoor/shutters{ - id = "exploration" - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "ueV" = ( /turf/closed/wall, /area/quartermaster/qm) @@ -43718,13 +43431,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"viX" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "vjc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -44187,12 +43893,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"vuq" = ( -/obj/machinery/atmospherics/components/unary/plasma_refiner{ - dir = 8 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "vuE" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 @@ -44455,10 +44155,6 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark, /area/security/prison) -"vBT" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/tech, -/area/asteroid/paradise) "vDt" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, @@ -44886,12 +44582,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"vRk" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "vRv" = ( /obj/structure/table/reinforced, /obj/item/paper/guides/recycler, @@ -45796,10 +45486,6 @@ }, /turf/open/openspace, /area/engine/atmos) -"wjA" = ( -/obj/structure/girder, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "wjR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/grid/steel, @@ -46254,11 +45940,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"wyw" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/grass/jungle, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "wyz" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -46521,13 +46202,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"wEe" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/structure/flora/rock/pile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "wEs" = ( /obj/item/radio/intercom{ dir = 1; @@ -46599,13 +46273,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"wFM" = ( -/obj/structure/flora/junglebush/c, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "wFO" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/dirt, @@ -48810,10 +48477,6 @@ }, /turf/open/floor/iron/tech, /area/engine/engineering) -"xGU" = ( -/obj/structure/flora/junglebush/large, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "xHy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -49116,9 +48779,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"xOo" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/asteroid/paradise/surface) "xOI" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/dock/drydock, @@ -49780,13 +49440,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"yeM" = ( -/obj/structure/flora/rock/pile, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "yeS" = ( /obj/structure/stairs{ dir = 8 @@ -63553,11 +63206,11 @@ jsp jsp jsp vqI -mVg -xGU -xTD -mIF -sXg +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -63810,11 +63463,11 @@ jsp jsp jsp vqI -wEe -qjq -hCx -mFT -sLz +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -64067,11 +63720,11 @@ jsp jsp jsp vqI -lCB -mVg -cEk -mGS -blO +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -64324,12 +63977,12 @@ jsp jsp jsp vqI -pqD -oJl -blO -viX -xqU -hJN +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -64581,12 +64234,12 @@ jsp jsp jsp vqI -tpB -lCB -hJN -wFM -ozj -cEk +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -64838,12 +64491,12 @@ jsp jsp jsp vqI -vBT -ngK -ndX -viX -xqU -fPc +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -65095,12 +64748,12 @@ jsp jsp jsp vqI -cjb -lCB -eGc -mmJ -ycy -xqU +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -65352,12 +65005,12 @@ jsp jsp jsp vqI -psK -oJl -cFP -pVR -wyw -sLz +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -65609,11 +65262,11 @@ jsp jsp jsp vqI -fju -oJl -cEk -gNq -ccl +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -256504,17 +256157,17 @@ dvc dvc dvc dvc -rxi -rxi -rxi -rxi -xOo -lzi -ueT -kLl -sgR -sgR -rxi +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc dvc @@ -256761,17 +256414,17 @@ dvc dvc dvc dvc -rxi -rxi -kNb -mUP -sqh -nNY -rxi -wjA -sgR -sgR -rxi +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc dvc @@ -257018,17 +256671,17 @@ dvc dvc dvc dvc -coy -wjA -ial -xOo -tMK -rxi -eKt -dCw -sgR -sgR -cwc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc dvc @@ -257275,17 +256928,17 @@ dvc dvc dvc dvc -coy -nQC -prd -oqm -ial -ial -ial -kFv -vRk -lRf -rxi +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc dvc @@ -257532,17 +257185,17 @@ dvc dvc dvc dvc -coy -bty -ofC -ial -ial -otu -rxi -gXd -vuq -kNb -rxi +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc dvc @@ -257789,17 +257442,17 @@ dvc dvc dvc dvc -coy -xOo -rxi -rxi -sHG -mon -yeM -ial -mon -jqW -rxi +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc yli @@ -258046,17 +257699,17 @@ kxS dvc dvc dvc -rxi -wjA -xOo -rxi -fuO -dlw -xOo -xOo -rxi -rxi -rxi +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc +dvc dvc dvc yli From eb90d2b2ad0c588b8679a7b4ba7eb78fdb1e2b86 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 21:24:05 +0200 Subject: [PATCH 10/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 456 ++++++++++---------- 1 file changed, 231 insertions(+), 225 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 1237be9692d09..e27a9a35bced3 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -715,7 +715,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -860,7 +862,7 @@ /turf/open/floor/circuit/telecomms/server, /area/science/server) "aoY" = ( -/turf/open/floor/glass/reinforced/plasma, +/turf/open/floor/catwalk_floor, /area/asteroid/paradise/surface) "apg" = ( /obj/machinery/light{ @@ -3895,6 +3897,9 @@ /obj/machinery/camera/directional/north{ network = list("ss13","medbay") }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "byu" = ( @@ -5137,6 +5142,10 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"ceq" = ( +/obj/structure/fence, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "ceR" = ( /obj/structure/table, /obj/machinery/status_display/ai{ @@ -6268,22 +6277,8 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "cHR" = ( -/obj/item/beacon{ - pixel_y = 3 - }, -/obj/effect/turf_decal/numbers, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/no_effect_signpost{ - name = "Echo station"; - pixel_x = -10; - pixel_y = 19 - }, -/turf/open/floor/iron/techmaint/planetary, +/obj/structure/fence/cut/large, +/turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) "cIr" = ( /obj/machinery/holopad, @@ -7253,25 +7248,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"dme" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "dmN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -11649,13 +11625,13 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "fzw" = ( +/obj/structure/ladder, /obj/effect/turf_decal/stripes/end{ - dir = 8 + dir = 4 }, /obj/structure/railing{ - dir = 9 + dir = 5 }, -/obj/structure/ladder, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "fzx" = ( @@ -13513,7 +13489,9 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "gnb" = ( -/obj/machinery/computer/objective, +/obj/machinery/computer/objective{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -14739,10 +14717,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"gRB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/dock/drydock, -/area/asteroid/paradise/surface) "gRR" = ( /obj/machinery/door/morgue{ dir = 1; @@ -16365,8 +16339,6 @@ /turf/open/floor/engine, /area/science/xenobiology) "hJJ" = ( -/obj/effect/turf_decal/sand/plating, -/obj/item/chair/plastic, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -17775,9 +17747,8 @@ /turf/open/floor/dock/drydock, /area/quartermaster/storage) "ixU" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/dock/drydock, +/turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) "iya" = ( /obj/effect/turf_decal/sand/plating, @@ -18503,6 +18474,9 @@ pixel_y = 34 }, /obj/item/kirbyplants/random, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "iTq" = ( @@ -18914,6 +18888,19 @@ dir = 8 }, /area/science/lab) +"jfF" = ( +/obj/item/clothing/under/rank/cargo/exploration{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/radio/headset/headset_exploration{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "jfU" = ( /obj/machinery/door/airlock/medical{ name = "Psychologist"; @@ -18938,6 +18925,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) +"jhl" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/numbers, +/obj/item/beacon{ + pixel_y = 3 + }, +/obj/structure/no_effect_signpost{ + name = "Echo station"; + pixel_x = -10; + pixel_y = 19 + }, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "jhG" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, /obj/machinery/atmospherics/components/binary/pump{ @@ -19237,6 +19242,16 @@ /obj/structure/flora/rock/pile, /turf/closed/mineral/random/air, /area/asteroid/paradise) +"jpc" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "jpr" = ( /obj/structure/railing{ dir = 8 @@ -21209,6 +21224,10 @@ "kkD" = ( /turf/closed/mineral/bscrystal, /area/asteroid/paradise) +"kkG" = ( +/obj/structure/fence/cut/medium, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "kkJ" = ( /obj/structure/railing{ dir = 4 @@ -22450,6 +22469,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"kNZ" = ( +/obj/structure/fence/end{ + dir = 8 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "kOc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt/dust, @@ -27212,6 +27237,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/explab) +"npb" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/medbay/central) "npi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line, @@ -27971,19 +28003,11 @@ /turf/open/openspace, /area/crew_quarters/heads/hor) "nIC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/chair/plastic, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/clothing/under/rank/cargo/exploration{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/radio/headset/headset_exploration{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/blood/gibs/torso, -/obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "nIF" = ( @@ -28559,6 +28583,9 @@ pixel_x = -32 }, /obj/machinery/camera/autoname/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -29431,8 +29458,22 @@ /turf/open/floor/iron/white, /area/science/lab) "ove" = ( +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/plasma_refiner, +/obj/item/circuitboard/machine/exploration_equipment_vendor, +/obj/item/shuttle_creator, +/obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, +/obj/item/circuitboard/computer/shuttle/exploration_shuttle, +/obj/structure/closet/crate/secure/engineering{ + name = "extended shuttle construction kit"; + req_one_access_txt = "19;32" + }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -29732,14 +29773,6 @@ "oCE" = ( /turf/open/openspace, /area/engine/atmos) -"oCL" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "oDI" = ( /obj/structure/fence/corner{ dir = 6 @@ -31394,9 +31427,6 @@ }, /turf/open/floor/wood, /area/medical/exam_room) -"pux" = ( -/turf/open/floor/dock/drydock, -/area/asteroid/paradise/surface) "pvd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -33462,7 +33492,7 @@ minbodytemp = 2.7; name = "Tom" }, -/turf/open/floor/dock/drydock, +/turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) "qwi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -35238,6 +35268,12 @@ }, /turf/open/floor/pod/dark, /area/science/research) +"rro" = ( +/obj/structure/fence/cut/medium{ + dir = 8 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "rrr" = ( /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, @@ -35807,23 +35843,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"rFm" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "rFo" = ( /obj/structure/flora/rock/pile/largejungle{ pixel_x = -2; @@ -36764,25 +36783,14 @@ name = "Engineering Viewing Platform" }) "seY" = ( -/obj/structure/closet/crate/engineering{ - name = "extended shuttle construction kit"; - req_one_access_txt = "19;32" +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ + dir = 4 }, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/circuitboard/machine/plasma_refiner, -/obj/item/circuitboard/machine/exploration_equipment_vendor, -/obj/item/shuttle_creator, /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/circuitboard/computer/shuttle/exploration_shuttle, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "sff" = ( @@ -36830,7 +36838,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -38528,6 +38535,11 @@ }, /turf/open/floor/wood, /area/chapel/office) +"tcf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/rock/pile, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "tcs" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -39262,10 +39274,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/sign/directions/evac{ - dir = 4; - pixel_y = 32 - }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "tqq" = ( @@ -39280,6 +39288,10 @@ icon_state = "4-8" }, /obj/machinery/digital_clock/directional/north, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = 42 + }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) "tqL" = ( @@ -44428,10 +44440,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/asteroid/paradise/surface) -"vLe" = ( -/obj/structure/flora/rock/pile, -/turf/open/floor/dock/drydock, -/area/asteroid/paradise/surface) "vLx" = ( /obj/structure/sign/painting/library{ pixel_y = 1 @@ -48284,12 +48292,10 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "xBv" = ( -/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "xBP" = ( @@ -48779,10 +48785,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"xOI" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/dock/drydock, -/area/asteroid/paradise/surface) "xPb" = ( /obj/effect/turf_decal/siding/wideplating/terracotta/corner{ dir = 8 @@ -49141,9 +49143,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -49327,6 +49327,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/crew_quarters/dorms) +"ybQ" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "ycc" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -128429,7 +128435,7 @@ bDD bDD kmh ttY -jLp +npb jLp ttY obC @@ -128686,9 +128692,9 @@ pqE izl jKp oax -xpy -xpy -oCL +jpc +gDp +xWj xWj wxm wxm @@ -128944,9 +128950,9 @@ vmg adf anK sfL -rFm -rFm -dme +vcM +vcM +vcM vcM vcM uAS @@ -255668,7 +255674,7 @@ kxS rxi rxi kxS -rxi +jhl rxi kxS rxi @@ -255929,7 +255935,7 @@ fzw rxi rxi kxS -rxi +kxS rxi kxS kxS @@ -256180,19 +256186,19 @@ yli kxS kxS rxi -kxS -rxi +cPg +ceq cHR rxi -rxi -rxi -rxi -rxi -rxi kxS kxS kxS -yli +rxi +kxS +kxS +ceq +ceq +wpX yli yli yli @@ -256437,20 +256443,20 @@ yli kxS kxS rxi +xAa +kxS +kxS +rxi +kxS +kxS +kxS +kxS +rxi rxi -pux -gRB -gRB -gRB -gRB -gRB -pux -pux -pux -pux -gRB rxi kxS +kNZ +kxS kxS yli yli @@ -256694,18 +256700,18 @@ kxS kxS kxS kxS +hgC +kxS +kxS +kxS rxi -gRB -gRB -pux -pux -pux -vLe -pux -pux -pux -gRB -gRB +rxi +rxi +rxi +rxi +kxS +rxi +kxS seY ove rxi @@ -256952,19 +256958,19 @@ kxS kxS rxi rxi -gRB -gRB -pux -gRB -pux -gRB +rxi +kxS +rxi +rxi +rxi +rxi qwe -ixU -gRB -pux -pux +rxi +kxS +rxi +kxS xBv -ggb +tcf rxi rxi kxS @@ -257208,18 +257214,18 @@ kxS kxS kxS rxi +kxS +kxS +kxS +rxi +rxi +rxi +rxi +kxS +rxi +kxS +rxi rxi -pux -gRB -gRB -gRB -gRB -gRB -gRB -gRB -gRB -gRB -pux upA khr rxi @@ -257466,19 +257472,19 @@ kxS kxS rxi rxi -pux -gRB -gRB -gRB -gRB -pux -gRB -gRB -pux +kxS +kxS +kxS +rxi +kxS +kxS +kxS +kxS +rxi ixU -pux +rxi nIC -ggb +jfF rxi rxi kxS @@ -257723,17 +257729,17 @@ kxS rxi rxi rxi -gRB -gRB -gRB -pux -xOI -pux -gRB -pux -gRB -gRB -gRB +kxS +rxi +kxS +kxS +kxS +rxi +rxi +kxS +rxi +kxS +rxi gnb hJJ rxi @@ -257980,18 +257986,18 @@ kxS rxi rxi rxi -gRB -pux -pux -pux -pux -pux -gRB -gRB -gRB -pux -pux kxS +kxS +kxS +rxi +rxi +rxi +kxS +rxi +rxi +kxS +rxi +rro rxi rxi kxS @@ -258236,19 +258242,19 @@ kxS rxi kxS rxi -kxS -rxi -rxi -rxi -rxi -rxi -rxi +ybQ +ceq rxi kxS -rxi +kxS +kxS +kxS kxS rxi rxi +kkG +ceq +ybQ rxi kxS kxS From 8b747a32ee3504cf45f3d68bf73ddcdce122d126 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 22:47:59 +0200 Subject: [PATCH 11/38] echo fixes --- _maps/map_files/EchoStation/EchoStation.dmm | 100 +++++++++++--------- code/datums/mapgen/GrassGenerator.dm | 2 +- 2 files changed, 57 insertions(+), 45 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index e27a9a35bced3..b3ed1dda9a74f 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -862,7 +862,8 @@ /turf/open/floor/circuit/telecomms/server, /area/science/server) "aoY" = ( -/turf/open/floor/catwalk_floor, +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, /area/asteroid/paradise/surface) "apg" = ( /obj/machinery/light{ @@ -8798,6 +8799,11 @@ "ehJ" = ( /turf/open/openspace, /area/maintenance/department/chapel) +"eij" = ( +/obj/structure/lattice/catwalk/over, +/obj/structure/lattice/catwalk/over, +/turf/closed/mineral/random/air, +/area/asteroid/paradise) "eit" = ( /obj/structure/toilet{ pixel_x = -1; @@ -9713,9 +9719,6 @@ dir = 10 }, /obj/structure/table, -/obj/item/card/id/job/station_engineer{ - pixel_x = 5 - }, /obj/item/pipe_dispenser{ pixel_y = 7 }, @@ -17746,10 +17749,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"ixU" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "iya" = ( /obj/effect/turf_decal/sand/plating, /turf/closed/mineral/random/air, @@ -21413,6 +21412,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"koY" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/item/card/id/job/station_engineer/access, +/turf/open/floor/iron, +/area/engine/engineering) "kpC" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/railing, @@ -23089,6 +23095,11 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"lfu" = ( +/obj/structure/lattice/catwalk/over, +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, +/area/asteroid/paradise/surface) "lfw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -46911,7 +46922,8 @@ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 + pixel_x = -24; + cell_type = /obj/item/stock_parts/cell/hyper }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -65243,7 +65255,7 @@ sjD rIZ pHp cmT -wWC +koY kQJ fap eEl @@ -133132,7 +133144,7 @@ vqI vqI vqI vqI -vqI +eij vqI vqI vqI @@ -256190,9 +256202,9 @@ cPg ceq cHR rxi -kxS -kxS -kxS +rxi +rxi +rxi rxi kxS kxS @@ -256447,10 +256459,10 @@ xAa kxS kxS rxi +rxi kxS -kxS -kxS -kxS +rxi +rxi rxi rxi rxi @@ -256701,15 +256713,15 @@ kxS kxS kxS hgC -kxS -kxS -kxS rxi rxi rxi rxi rxi -kxS +rxi +rxi +rxi +rxi rxi kxS seY @@ -256959,7 +256971,7 @@ kxS rxi rxi rxi -kxS +rxi rxi rxi rxi @@ -257215,15 +257227,15 @@ kxS kxS rxi kxS -kxS -kxS rxi rxi rxi rxi kxS rxi -kxS +rxi +rxi +rxi rxi rxi upA @@ -257472,16 +257484,16 @@ kxS kxS rxi rxi -kxS -kxS -kxS +rxi +rxi +rxi +rxi rxi kxS +rxi kxS -kxS -kxS rxi -ixU +rxi rxi nIC jfF @@ -257731,14 +257743,14 @@ rxi rxi kxS rxi -kxS -kxS -kxS rxi rxi -kxS rxi -kxS +rxi +rxi +rxi +rxi +rxi rxi gnb hJJ @@ -257756,7 +257768,7 @@ yli yli dAb qSH -aoY +lfu aoY aoY vcy @@ -257988,11 +258000,11 @@ rxi rxi kxS kxS -kxS rxi rxi rxi -kxS +rxi +rxi rxi rxi kxS @@ -258014,7 +258026,7 @@ dAb dAb vZe aoY -aoY +lfu aoY ykS dAb @@ -258247,9 +258259,9 @@ ceq rxi kxS kxS -kxS -kxS -kxS +rxi +rxi +rxi rxi rxi kkG @@ -258272,7 +258284,7 @@ dAb cZp aoY aoY -aoY +lfu msV kiz dAb diff --git a/code/datums/mapgen/GrassGenerator.dm b/code/datums/mapgen/GrassGenerator.dm index 1ff56ec4a75c6..f01f5f692cbc3 100644 --- a/code/datums/mapgen/GrassGenerator.dm +++ b/code/datums/mapgen/GrassGenerator.dm @@ -40,7 +40,7 @@ var/turf/gen_turf = t var/BIOME_RANDOM_SQUARE_DRIFT = 2 var/drift_x = (gen_turf.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom - var/drift_y = (gen_turf.y + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom + var/drift_y = (gen_turf.y + rand(0, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom var/height = text2num(rustg_noise_get_at_coordinates("[height_seed]", "[drift_x]", "[drift_y]")) From b797065e423cb0af7da1bfc9f66484fdf8286772 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 22:50:28 +0200 Subject: [PATCH 12/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index b3ed1dda9a74f..983d69d0a0196 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -9729,6 +9729,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, +/obj/item/card/id/job/station_engineer/access, /turf/open/floor/iron/dark, /area/engine/engineering) "eEo" = ( @@ -21412,13 +21413,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"koY" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/item/card/id/job/station_engineer/access, -/turf/open/floor/iron, -/area/engine/engineering) "kpC" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/railing, @@ -65255,7 +65249,7 @@ sjD rIZ pHp cmT -koY +wWC kQJ fap eEl From 17aa99d801bd8db7d0d9bc8d2061ac8e293f2153 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 23:04:26 +0200 Subject: [PATCH 13/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 983d69d0a0196..e4fed6dea5917 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -9730,6 +9730,25 @@ dir = 5 }, /obj/item/card/id/job/station_engineer/access, +/obj/merge_conflict_marker{ + name = "---Merge Conflict Marker---"; + desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_y = 7 + }, +/obj/item/pipe_dispenser{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/obj/item/card/id/job/station_engineer, /turf/open/floor/iron/dark, /area/engine/engineering) "eEo" = ( From 26e179ffbf6af58a16c9562c56724e67c572911a Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 23:22:27 +0200 Subject: [PATCH 14/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index e4fed6dea5917..219f7aad91142 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -8801,7 +8801,6 @@ /area/maintenance/department/chapel) "eij" = ( /obj/structure/lattice/catwalk/over, -/obj/structure/lattice/catwalk/over, /turf/closed/mineral/random/air, /area/asteroid/paradise) "eit" = ( From 31f68a0fd49366e7d65e0b64c87dff581655b052 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 23:25:25 +0200 Subject: [PATCH 15/38] Dang lattice. --- _maps/map_files/EchoStation/EchoStation.dmm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 219f7aad91142..a6d250cdc4e78 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -8799,10 +8799,6 @@ "ehJ" = ( /turf/open/openspace, /area/maintenance/department/chapel) -"eij" = ( -/obj/structure/lattice/catwalk/over, -/turf/closed/mineral/random/air, -/area/asteroid/paradise) "eit" = ( /obj/structure/toilet{ pixel_x = -1; @@ -23107,11 +23103,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"lfu" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, -/area/asteroid/paradise/surface) "lfw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -133156,7 +133147,7 @@ vqI vqI vqI vqI -eij +vqI vqI vqI vqI @@ -257780,7 +257771,7 @@ yli yli dAb qSH -lfu +aoY aoY aoY vcy @@ -258038,7 +258029,7 @@ dAb dAb vZe aoY -lfu +aoY aoY ykS dAb @@ -258296,7 +258287,7 @@ dAb cZp aoY aoY -lfu +aoY msV kiz dAb From 4f1159e1e50f5304272b9ed0d91116c6d27241cf Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 23:28:47 +0200 Subject: [PATCH 16/38] :angry: --- _maps/map_files/EchoStation/EchoStation.dmm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index a6d250cdc4e78..84b890549368b 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -9724,11 +9724,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, -/obj/item/card/id/job/station_engineer/access, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, From 21e3d3c418e11ba6da66c9be55e80ab4283ef0f6 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 26 Aug 2024 23:31:09 +0200 Subject: [PATCH 17/38] :trollface: --- _maps/map_files/EchoStation/EchoStation.dmm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 84b890549368b..eb0ce352e7386 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -9714,20 +9714,6 @@ dir = 10 }, /obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_y = 7 - }, -/obj/item/pipe_dispenser{ - pixel_x = 1; - pixel_y = 12 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table, /obj/item/pipe_dispenser{ pixel_y = 7 }, From 5cf4bf8b8078202a2b9cfb59982584ded2939bfe Mon Sep 17 00:00:00 2001 From: Markus Date: Wed, 28 Aug 2024 08:18:42 +0200 Subject: [PATCH 18/38] fixed surgery apc connection --- _maps/map_files/EchoStation/EchoStation.dmm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index eb0ce352e7386..819dea011ff51 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -2168,12 +2168,12 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "aLU" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/medical/surgery) "aMt" = ( @@ -12106,6 +12106,9 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron, /area/medical/surgery) "fMh" = ( From 9edd2985528bc068e404157ac50eabbfa0e3a637 Mon Sep 17 00:00:00 2001 From: Markus Date: Wed, 28 Aug 2024 13:07:28 +0200 Subject: [PATCH 19/38] fixed disposals (again) --- _maps/map_files/EchoStation/EchoStation.dmm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 819dea011ff51..1f40154ff894c 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -715,9 +715,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -19242,7 +19240,7 @@ /area/asteroid/paradise) "jpc" = ( /obj/structure/disposalpipe/junction/flip{ - dir = 1 + dir = 8 }, /turf/open/floor/iron/dark/side{ dir = 8 @@ -28581,9 +28579,6 @@ pixel_x = -32 }, /obj/machinery/camera/autoname/directional/west, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -36836,6 +36831,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central{ name = "-2 Primary Hallway" From 39041b74d122458d7e2998d5e8224fa30f3c4d3e Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 30 Aug 2024 12:16:39 +0200 Subject: [PATCH 20/38] review fixes + misc --- _maps/map_files/EchoStation/EchoStation.dmm | 193 ++++++++++---------- 1 file changed, 101 insertions(+), 92 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 4ce3c73879737..3bbc21757a71a 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -5694,6 +5694,9 @@ /turf/open/floor/plating, /area/security/warden) "crG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron, /area/science/robotics) "crS" = ( @@ -8135,32 +8138,6 @@ /turf/open/floor/iron/dark, /area/security/brig) "dNx" = ( -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_y = 3 - }, -/obj/item/stack/sheet/plasteel{ - amount = 15; - pixel_x = 2 - }, -/obj/item/stack/sheet/mineral/plasma/fifty{ - amount = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 2; - pixel_y = 3 - }, /obj/effect/turf_decal/stripes/corner, /obj/structure/table, /obj/machinery/requests_console{ @@ -8174,6 +8151,15 @@ pixel_x = 1; pixel_y = 29 }, +/obj/item/borg/upgrade/rename{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/borg/upgrade/rename{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/storage/belt/utility, /turf/open/floor/iron/dark, /area/science/robotics) "dNK" = ( @@ -8991,7 +8977,7 @@ "enN" = ( /obj/effect/turf_decal/siding/white, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/recharge_station, +/obj/item/kirbyplants/random, /obj/structure/railing{ layer = 4 }, @@ -9081,12 +9067,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"epb" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/closed/mineral/random/air, -/area/engine/atmos) "epj" = ( /obj/machinery/stasis{ dir = 8 @@ -12801,15 +12781,9 @@ name = "-3 Primary Hallway" }) "fZv" = ( -/obj/structure/table/reinforced, -/obj/item/mmi{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/mmi{ - pixel_y = 11 +/obj/structure/bodycontainer/morgue{ + dir = 2 }, -/obj/item/storage/backpack/duffelbag/sec/surgery, /turf/open/floor/iron/white, /area/science/robotics) "fZy" = ( @@ -16099,6 +16073,44 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/closet/crate/science{ + desc = "A science full of materials crate."; + name = "science materials crate" + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/stack/sheet/plasteel{ + amount = 15; + pixel_x = 2 + }, +/obj/item/stack/sheet/mineral/plasma/fifty{ + amount = 5 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -1; + pixel_y = 1 + }, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics) "hvK" = ( @@ -18771,9 +18783,6 @@ "iWs" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/wardrobe/robo_wardrobe, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -19738,10 +19747,10 @@ /area/engine/engineering) "jxw" = ( /obj/effect/turf_decal/siding/white, -/obj/item/kirbyplants/random, /obj/structure/railing{ layer = 4 }, +/obj/machinery/recharge_station, /turf/open/floor/iron, /area/science/robotics) "jxW" = ( @@ -20549,29 +20558,20 @@ "jOI" = ( /obj/effect/turf_decal/bot, /obj/structure/table, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/storage/belt/utility, /obj/item/clothing/glasses/welding{ pixel_x = 2; pixel_y = -1 }, -/obj/item/clothing/head/utility/welding{ - pixel_x = -2; - pixel_y = 3 - }, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/item/clothing/head/utility/welding{ + pixel_x = -2; + pixel_y = 3 + }, /turf/open/floor/iron/dark, /area/science/robotics) "jPg" = ( @@ -20843,19 +20843,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/borg/upgrade/rename{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/borg/upgrade/rename{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/electrical, /turf/open/floor/iron/dark, /area/science/robotics) "jXs" = ( @@ -22671,6 +22658,24 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/engine) +"kRM" = ( +/obj/structure/table/reinforced, +/obj/item/mmi{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/mmi{ + pixel_y = 11 + }, +/obj/item/storage/backpack/duffelbag/sec/surgery, +/obj/machinery/requests_console{ + department = "Robotics Lab"; + name = "Robotics RC"; + pixel_x = 32; + receive_ore_updates = 1 + }, +/turf/open/floor/iron/white, +/area/science/robotics) "kSi" = ( /obj/structure/railing{ dir = 10 @@ -22758,8 +22763,13 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/aug_manipulator, /obj/effect/turf_decal/bot, +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = -7 + }, +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = 7 + }, /turf/open/floor/iron/dark, /area/science/robotics) "kVh" = ( @@ -23410,15 +23420,7 @@ /turf/closed/wall, /area/maintenance/department/eva) "lku" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/machinery/requests_console{ - department = "Robotics Lab"; - name = "Robotics RC"; - pixel_x = 32; - receive_ore_updates = 1 - }, +/obj/machinery/aug_manipulator, /turf/open/floor/iron/white, /area/science/robotics) "lkw" = ( @@ -26601,10 +26603,10 @@ /turf/open/floor/iron/dark, /area/security/warden) "mRz" = ( -/obj/structure/reagent_dispensers/water_cooler, /obj/structure/railing{ dir = 9 }, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -28400,6 +28402,10 @@ /obj/structure/railing, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) +"nOm" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/science/robotics) "nOn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -31986,6 +31992,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/camera/directional/north{ + network = list("ss13","rd") + }, /turf/open/floor/iron/dark, /area/science/robotics) "pKz" = ( @@ -47353,12 +47362,12 @@ /turf/open/floor/wood, /area/crew_quarters/cafeteria) "xiD" = ( -/obj/structure/railing, /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/structure/railing, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -47389,13 +47398,13 @@ /obj/structure/railing/corner, /obj/structure/railing/corner, /obj/machinery/firealarm/directional/south, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = -7 - }, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = 7 - }, /obj/structure/railing/corner, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/toolbox/electrical, /turf/open/floor/iron/dark, /area/science/robotics) "xiY" = ( @@ -60093,7 +60102,7 @@ lEu bod vHR sfR -epb +jOo jOo jRB vgG @@ -197568,7 +197577,7 @@ gXD ohi fZv eVJ -eVJ +nOm crG rJc cpg @@ -197824,7 +197833,7 @@ ise ise ohi lku -eVJ +kRM ohi iWs xiY From 067b83f532a36a5a70f76ac4d2aead5e451213b1 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 30 Aug 2024 14:58:58 +0200 Subject: [PATCH 21/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 3bbc21757a71a..48afc79b6383e 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -753,9 +753,9 @@ /obj/item/computer_hardware/hard_drive/role/quartermaster{ pixel_y = 6 }, -/obj/item/card/id/job/shaft_miner, /obj/effect/turf_decal/bot, /obj/item/clothing/glasses/welding, +/obj/item/card/id/job/shaft_miner, /turf/open/floor/carpet/orange, /area/quartermaster/qm) "aoo" = ( From 207fd59a04a0bf4b406ccdb28e581acd129f92b6 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 11:46:46 +0200 Subject: [PATCH 22/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 424 ++------------------ 1 file changed, 27 insertions(+), 397 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 7498cc5d01fed..43ff1695094a1 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -1267,13 +1267,6 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/simple_pipes/general/visible, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "aAe" = ( @@ -3782,53 +3775,6 @@ pixel_y = 2 }, /obj/item/storage/belt/utility, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_y = 3 - }, -/obj/item/stack/sheet/plasteel{ - amount = 15; - pixel_x = 2 - }, -/obj/item/stack/sheet/mineral/plasma/fifty{ - amount = 5 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/table, -/obj/machinery/requests_console{ - department = "Robotics Lab"; - name = "Robotics RC"; - pixel_x = -32; - pixel_y = -2; - receive_ore_updates = 1 - }, -/obj/structure/sign/painting/library{ - pixel_x = 1; - pixel_y = 29 - }, -/obj/item/borg/upgrade/ai{ - pixel_x = 2 - }, /obj/machinery/light{ dir = 1 }, @@ -4366,9 +4312,6 @@ req_access_txt = "10" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /turf/open/floor/engine, /area/engine/supermatter) "bOR" = ( @@ -8098,7 +8041,7 @@ }, /obj/structure/holosign/barrier/atmos/robust, /turf/open/floor/plating, -/area/asteroid/paradise) +/area/engine/engineering) "dJr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -10313,15 +10256,6 @@ /area/security/detectives_office) "eQJ" = ( /obj/structure/holosign/barrier/atmos/robust, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/door/poddoor/incinerator_toxmix{ - id = "EmergancyescapeShutter"; - name = "Emergancy Escape Shutters" - }, /turf/open/floor/plating, /area/science/mixing/chamber) "eQO" = ( @@ -11689,28 +11623,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/light, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "fzZ" = ( @@ -14374,26 +14286,13 @@ }, /area/asteroid/paradise/surface) "gRi" = ( -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "32" }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -14440,18 +14339,6 @@ icon_type = "bathroom" }, /obj/effect/spawner/structure/window, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/spawner/structure/window, -/obj/structure/curtain/directional{ - color = "#ACD1E9"; - dir = 8; - icon_state = "bathroom-open"; - icon_type = "bathroom" - }, /turf/open/floor/plating, /area/medical/surgery) "gTh" = ( @@ -15479,40 +15366,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5 - }, -/obj/item/holosign_creator/medical{ - pixel_x = -4; - pixel_y = 17 - }, -/obj/item/toy/figure/cmo{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/stamp/cmo{ - pixel_x = -2 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 1; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = 1; - pixel_y = -32 - }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "hvb" = ( @@ -16724,7 +16577,7 @@ pixel_y = 26 }, /turf/open/floor/plating, -/area/asteroid/paradise) +/area/engine/engineering) "ifm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -21667,29 +21520,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/light{ - dir = 1; - light_color = "#7AC3FF" - }, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/sign/poster/official/ian{ - pixel_y = 32 - }, -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","medbay") - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "kEO" = ( @@ -23030,18 +22860,6 @@ dir = 5 }, /obj/item/card/id/job/station_engineer, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "External Gas to Loop" - }, /obj/effect/turf_decal/delivery, /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/dark, @@ -25648,7 +25466,21 @@ /turf/open/floor/iron, /area/maintenance/department/bridge) "mHA" = ( -/obj/item/kirbyplants/random, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/tech, /area/engine/engineering) @@ -25765,13 +25597,7 @@ "mKL" = ( /obj/effect/turf_decal/bot, /obj/structure/table, -/obj/item/clothing/glasses/welding{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/item/storage/belt/utility, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -25779,33 +25605,10 @@ pixel_x = -2; pixel_y = 3 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/storage/belt/utility, /obj/item/clothing/glasses/welding{ pixel_x = 2; pixel_y = -1 }, -/obj/item/clothing/head/utility/welding{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/science/robotics) "mLd" = ( @@ -26057,25 +25860,6 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/directional/south, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/airalarm/directional/north{ - pixel_y = -23 - }, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #3"; - suffix = "#3" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #3" - }, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/quartermaster/warehouse) "mRE" = ( @@ -26457,17 +26241,7 @@ /area/quartermaster/storage) "mZx" = ( /obj/effect/turf_decal/siding/white, -/obj/structure/railing{ - layer = 4 - }, /obj/machinery/recharge_station, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/siding/white, -/obj/item/kirbyplants/random, /obj/structure/railing, /turf/open/floor/iron, /area/science/robotics) @@ -27645,25 +27419,11 @@ /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "nIe" = ( -/obj/machinery/light/small, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/obj/item/storage/box/lights/mixed{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, +/obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/light/small, /turf/open/floor/iron/tech, /area/engine/engineering) "nIh" = ( @@ -28117,9 +27877,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "nUa" = ( @@ -28935,8 +28692,8 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) "oqB" = ( -/obj/machinery/smartfridge/sci, -/turf/open/floor/iron/white, +/obj/machinery/smartfridge/organ, +/turf/closed/wall, /area/science/robotics) "oqF" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -37434,32 +37191,13 @@ }, /obj/effect/turf_decal/bot, /obj/structure/railing/corner, -/obj/structure/railing/corner, /obj/machinery/firealarm/directional/south, -/obj/structure/railing/corner, /obj/structure/table, /obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, /obj/item/storage/toolbox/electrical, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/bot, -/obj/structure/railing/corner, -/obj/machinery/firealarm/directional/south, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = -7 - }, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = 7 - }, /turf/open/floor/iron/dark, /area/science/robotics) "sJC" = ( @@ -37832,7 +37570,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/sand/plating, /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/asteroid/paradise) @@ -38607,23 +38344,6 @@ dir = 8; name = "Gas to Filter" }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Gas to Filter" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /turf/open/floor/iron/dark, /area/engine/engineering) "tmO" = ( @@ -38667,10 +38387,6 @@ name = "Gas to Chamber" }, /obj/effect/turf_decal/delivery, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /turf/open/floor/engine, /area/engine/supermatter) "tnQ" = ( @@ -41934,9 +41650,6 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /turf/open/floor/engine, /area/engine/supermatter) "uRn" = ( @@ -42042,11 +41755,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/trunk/multiz/down{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -42088,24 +41796,8 @@ pixel_x = -1; pixel_y = 1 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/multiz/down{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics) "uSG" = ( @@ -44026,30 +43718,15 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/general/hidden/layer2, -/obj/machinery/atmospherics/components/unary/portables_connector/layer4, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/mapping_helpers/simple_pipes/general/visible, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "vNS" = ( @@ -44138,20 +43815,9 @@ /turf/open/openspace, /area/medical/medbay/central) "vQO" = ( -/obj/effect/turf_decal/siding/white, /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, -/obj/structure/railing{ - layer = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/recharge_station, /obj/structure/railing, /turf/open/floor/iron, /area/science/robotics) @@ -45068,30 +44734,9 @@ pixel_y = 34 }, /obj/item/kirbyplants/random, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/item/radio/intercom{ - pixel_y = 24 - }, -/obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 34 - }, -/obj/effect/turf_decal/bot, /obj/structure/disposalpipe/multiz{ dir = 4 }, -/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/medical/medbay/central) "wps" = ( @@ -45110,11 +44755,6 @@ pixel_x = 32; receive_ore_updates = 1 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd"); dir = 4 @@ -48389,16 +48029,6 @@ }, /obj/item/kirbyplants/random, /obj/effect/decal/cleanable/dirt/dust, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/random, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -62069,9 +61699,9 @@ jFN jrW mdi kYB -oJl +sXB dJe -oJl +sXB vqI vqI jsp @@ -62326,9 +61956,9 @@ jnO lCS lCS mVg -oJl +sXB ieX -lCB +lCS vqI vqI jsp From 8047a5c435a65040695b199daeb49ae93bb00c13 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 11:50:47 +0200 Subject: [PATCH 23/38] undid grassgenerator changes --- code/datums/mapgen/GrassGenerator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/mapgen/GrassGenerator.dm b/code/datums/mapgen/GrassGenerator.dm index f01f5f692cbc3..1ff56ec4a75c6 100644 --- a/code/datums/mapgen/GrassGenerator.dm +++ b/code/datums/mapgen/GrassGenerator.dm @@ -40,7 +40,7 @@ var/turf/gen_turf = t var/BIOME_RANDOM_SQUARE_DRIFT = 2 var/drift_x = (gen_turf.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom - var/drift_y = (gen_turf.y + rand(0, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom + var/drift_y = (gen_turf.y + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom var/height = text2num(rustg_noise_get_at_coordinates("[height_seed]", "[drift_x]", "[drift_y]")) From d2d536139a1d7f63700e0c87f6c3a73edd2bb8dc Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:01:05 +0200 Subject: [PATCH 24/38] undid the added RPED change --- _maps/map_files/EchoStation/EchoStation.dmm | 11 +++++++---- code/modules/research/stock_parts.dm | 12 ------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 43ff1695094a1..4ff318b280352 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -28921,7 +28921,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "ouX" = ( @@ -47098,9 +47100,10 @@ dir = 9 }, /obj/structure/table, -/obj/item/storage/part_replacer/engi{ - pixel_y = 5 - }, +/obj/item/stock_parts/matter_bin/super, +/obj/item/stock_parts/matter_bin/super, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/stock_parts/micro_laser/ultra, /obj/item/screwdriver{ pixel_y = 3 }, diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index c3727b06431bb..d3d0d4224b9a5 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -201,18 +201,6 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi new /obj/item/stock_parts/micro_laser(src) new /obj/item/stock_parts/matter_bin(src) -/obj/item/storage/part_replacer/engi //used on echo - -/obj/item/storage/part_replacer/engi/PopulateContents() - for(var/i in 1 to 10) - new /obj/item/stock_parts/manipulator/nano(src) - new /obj/item/stock_parts/micro_laser/high(src) - new /obj/item/stock_parts/matter_bin/adv(src) - - new /obj/item/stock_parts/cell/super(src) - new /obj/item/stock_parts/capacitor/super(src) - - /obj/item/storage/part_replacer/cyborg name = "rapid part exchange device" desc = "Special mechanical module made to store, sort, and apply standard machine parts." From 73032531d8618bc9232a502768652035d33223f8 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:11:22 +0200 Subject: [PATCH 25/38] cl / map merger error? From 482386f496ee44bf69c713ef8657d46d062452c7 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:14:04 +0200 Subject: [PATCH 26/38] removed area var edit --- _maps/map_files/EchoStation/EchoStation.dmm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 4ff318b280352..2b063b9bc986d 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -10816,11 +10816,6 @@ "fdh" = ( /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"fdi" = ( -/turf/closed/wall, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "fdq" = ( /obj/structure/railing/corner{ dir = 8 @@ -127207,7 +127202,7 @@ jME agQ qRI oln -fdi +agQ amg swS gwg @@ -127721,7 +127716,7 @@ wZF uir uir rId -fdi +agQ bPo vHu ueV From 715707eafb649e27cda5048187f010a19ad01958 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:27:16 +0200 Subject: [PATCH 27/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 31 ++++----------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 2b063b9bc986d..90d47a621e0f4 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -17040,12 +17040,6 @@ }, /turf/open/openspace, /area/maintenance/department/science/central) -"isl" = ( -/obj/structure/railing, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "isW" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 1 @@ -28468,12 +28462,6 @@ /obj/item/hand_labeler, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"oln" = ( -/obj/effect/spawner/structure/window, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "olw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -35254,11 +35242,6 @@ /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/maintenance/department/bridge) -"rId" = ( -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "rIj" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -38089,9 +38072,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional, /turf/open/floor/plating, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "tih" = ( /mob/living/simple_animal/kalo{ desc = "The Perma brig's cute grass snake."; @@ -126944,8 +126925,8 @@ qma jME uir uir -rId -isl +uir +dvo vsW xvB wxq @@ -127201,7 +127182,7 @@ nSF jME agQ qRI -oln +qRI agQ amg swS @@ -127458,7 +127439,7 @@ tWL jME uir uir -rId +uir thU eve uVo @@ -127715,7 +127696,7 @@ jME wZF uir uir -rId +uir agQ bPo vHu From 9930e19400ac37379a2e5d1f290e48c162d0519b Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:28:21 +0200 Subject: [PATCH 28/38] added pickaxe at the bottom of the cave --- _maps/map_files/EchoStation/EchoStation.dmm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 90d47a621e0f4..24595a7c00b64 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -4485,6 +4485,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"bSW" = ( +/obj/item/pickaxe, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "bSX" = ( /obj/machinery/computer/prisoner/management, /obj/machinery/power/apc/auto_name/directional/north{ @@ -69408,7 +69412,7 @@ mUB klh wsA vqI -sLz +bSW cEk nve nve From 1806c10469dd885d9d9d0bd989d21a66d1e6e4b9 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:32:38 +0200 Subject: [PATCH 29/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 24595a7c00b64..a1f26b2ea65cf 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -3891,7 +3891,7 @@ /obj/item/toy/plush/flushed, /obj/machinery/button/door{ id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters"; + name = "Emergancy Escape Shutters"; pixel_y = 26 }, /turf/open/floor/plating, @@ -28680,7 +28680,7 @@ /area/crew_quarters/heads/captain/private) "oqB" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall, +/turf/open/space/basic, /area/science/robotics) "oqF" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -43615,7 +43615,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/button/door{ id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters"; + name = "Emergancy Escape Shutters"; pixel_y = 26; pixel_x = 27 }, From f949cdee2e4e4261972e8b54902b48e97d83728f Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:38:32 +0200 Subject: [PATCH 30/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index a1f26b2ea65cf..3e901cb802146 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -5791,7 +5791,7 @@ }, /obj/machinery/door/poddoor/incinerator_toxmix{ id = "EmergancyescapeShutterengine"; - name = "Emergancy escape Shutters" + name = "Emergancy Escape Shutters" }, /turf/open/floor/plating, /area/engine/engineering) @@ -16572,7 +16572,7 @@ }, /obj/machinery/button/door{ id = "EmergancyescapeShutterengine"; - name = "Emergancy escape Shutters"; + name = "Emergancy Escape Shutters"; pixel_y = 26 }, /turf/open/floor/plating, @@ -41031,7 +41031,7 @@ }, /obj/machinery/button/door{ id = "EmergancyescapeShutterengine"; - name = "Emergancy escape Shutters"; + name = "Emergancy Escape Shutters"; pixel_y = 26; pixel_x = -27; req_one_access_txt = "32" From cffa59c044b642436685594a59a4cdf9cc03ff13 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 12:42:55 +0200 Subject: [PATCH 31/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 3e901cb802146..d188d0cc558a7 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -2221,9 +2221,8 @@ }, /obj/machinery/button/door{ id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters"; - pixel_x = 32; - req_one_access_txt = "7;29;12" + name = "Emergancy Escape Shutters"; + pixel_x = 32 }, /turf/open/floor/engine, /area/science/mixing/chamber) From c8c664a62bd16d69911ee6b4effda95472f4deac Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 13:03:05 +0200 Subject: [PATCH 32/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index d188d0cc558a7..b4a29a0abdc32 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -21639,9 +21639,11 @@ pixel_x = 2; pixel_y = 2 }, -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 2 + }, +/obj/structure/disposalpipe/segment{ + dir = 2 }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) From 641879cdddb2e1e52dff132876044bc6c29c23e6 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 13:19:35 +0200 Subject: [PATCH 33/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 33 ++++++++++++++------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index b4a29a0abdc32..b8ca195101325 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -2325,7 +2325,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/tech, /area/engine/engineering) "aUN" = ( /obj/structure/table/reinforced, @@ -4311,6 +4311,9 @@ req_access_txt = "10" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/supermatter) "bOR" = ( @@ -21642,9 +21645,6 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "kIV" = ( @@ -36718,9 +36718,6 @@ /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) "sxA" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -38327,6 +38324,9 @@ dir = 8; name = "Gas to Filter" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/iron/dark, /area/engine/engineering) "tmO" = ( @@ -38370,6 +38370,10 @@ name = "Gas to Chamber" }, /obj/effect/turf_decal/delivery, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/engine, /area/engine/supermatter) "tnQ" = ( @@ -41633,6 +41637,9 @@ /obj/machinery/ai_slipper{ uses = 10 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/engine, /area/engine/supermatter) "uRn" = ( @@ -41781,6 +41788,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/multiz/down{ + dir = 8 + }, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics) "uSG" = ( @@ -43106,6 +43116,9 @@ "vuh" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/iron/dark, /area/engine/engineering) "vun" = ( @@ -47131,6 +47144,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) "xvi" = ( @@ -47845,9 +47861,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -38 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, /obj/item/storage/secure/briefcase{ pixel_y = 6 }, From 11692cf2b483f5dfb8bd0fbad6766736665f6ae4 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 13:27:53 +0200 Subject: [PATCH 34/38] Update EchoStation.dmm From b1fe9942dd7a709d7ba9d623742a6756d2ea6c15 Mon Sep 17 00:00:00 2001 From: Markus Date: Sun, 8 Sep 2024 19:28:22 +0200 Subject: [PATCH 35/38] added two exploration radio keys and a pipe dispenser --- _maps/map_files/EchoStation/EchoStation.dmm | 60 ++++++++++----------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index b8ca195101325..f9faeaab09aec 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -9430,25 +9430,11 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "eyV" = ( -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/circuitboard/machine/plasma_refiner, -/obj/item/circuitboard/machine/exploration_equipment_vendor, -/obj/item/shuttle_creator, -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/circuitboard/computer/shuttle/exploration_shuttle, -/obj/structure/closet/crate/secure/engineering{ - name = "extended shuttle construction kit"; - req_one_access_txt = "19;32" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/pipedispenser, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "ezs" = ( @@ -9798,19 +9784,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"eEQ" = ( -/obj/item/clothing/under/rank/cargo/exploration{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/radio/headset/headset_exploration{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/blood/gibs/torso, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "eFI" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -11701,9 +11674,26 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "fBR" = ( +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/circuitboard/machine/plasma_refiner, +/obj/item/circuitboard/machine/exploration_equipment_vendor, +/obj/item/shuttle_creator, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/circuitboard/computer/shuttle/exploration_shuttle, +/obj/structure/closet/crate/secure/engineering{ + name = "extended shuttle construction kit"; + req_one_access_txt = "19;32" + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/item/encryptionkey/headset_expteam, +/obj/item/encryptionkey/headset_expteam, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "fBW" = ( @@ -19839,6 +19829,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/item/clothing/under/rank/cargo/exploration{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/item/radio/headset/headset_exploration{ + pixel_x = -1; + pixel_y = -1 + }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "jNR" = ( @@ -256751,7 +256751,7 @@ rxi rxi rxi pFg -eEQ +uXr rxi rxi kxS From c3ea838bb7f2709b0a4774feac27ec3f56b68608 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 9 Sep 2024 12:31:34 +0200 Subject: [PATCH 36/38] fixed open space --- _maps/map_files/EchoStation/EchoStation.dmm | 28 +++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index f9faeaab09aec..1d7dcf5951c42 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -1928,6 +1928,11 @@ }, /turf/open/floor/grass/no_border, /area/bridge) +"aMI" = ( +/obj/machinery/aug_manipulator, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/science/robotics) "aMY" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/dirt/planetary, @@ -18115,7 +18120,14 @@ }, /area/asteroid/paradise/surface) "iWJ" = ( -/obj/machinery/aug_manipulator, +/obj/structure/table/reinforced, +/obj/item/mmi{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/mmi{ + pixel_y = 11 + }, /turf/open/floor/iron/white, /area/science/robotics) "iWK" = ( @@ -28681,7 +28693,8 @@ /area/crew_quarters/heads/captain/private) "oqB" = ( /obj/machinery/smartfridge/organ, -/turf/open/space/basic, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, /area/science/robotics) "oqF" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -44737,14 +44750,9 @@ /area/medical/medbay/central) "wps" = ( /obj/structure/table/reinforced, -/obj/item/mmi{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/mmi{ - pixel_y = 11 +/obj/item/storage/backpack/duffelbag/sec/surgery{ + pixel_y = 5 }, -/obj/item/storage/backpack/duffelbag/sec/surgery, /obj/machinery/requests_console{ department = "Robotics Lab"; name = "Robotics RC"; @@ -197095,7 +197103,7 @@ ise ohi iWJ wps -ohi +aMI jhW xiY eni From aead751b4f0d7129d62aa851e1f4282363546148 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 9 Sep 2024 21:47:46 +0200 Subject: [PATCH 37/38] readded the crashed shuttle in the shuttle construction area --- _maps/map_files/EchoStation/EchoStation.dmm | 315 ++++++++++++++++---- 1 file changed, 252 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 1d7dcf5951c42..d4442fce60b35 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -1064,6 +1064,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating/airless, /area/maintenance/disposal) +"avM" = ( +/obj/structure/girder, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "avP" = ( /obj/effect/landmark/start/head_of_personnel, /obj/machinery/newscaster{ @@ -2743,6 +2747,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engine/atmos) +"bdK" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/asteroid/paradise/surface) "bdN" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -2773,6 +2781,18 @@ /obj/structure/sign/departments/custodian, /turf/closed/wall, /area/crew_quarters/cafeteria) +"beC" = ( +/obj/machinery/door/poddoor/shutters{ + id = "exploration" + }, +/obj/machinery/button/door{ + desc = "A remote control switch."; + id = "exploration"; + name = "Exploration Shuttle Shutters"; + pixel_y = 24 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "bfz" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plating/asteroid/planetary, @@ -4529,6 +4549,11 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/engine/engineering) +"bUp" = ( +/obj/machinery/light/small/broken/directional/west, +/obj/structure/frame, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "bUy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -6022,6 +6047,10 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"cDJ" = ( +/obj/machinery/door/airlock/shuttle, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "cDM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -6809,6 +6838,10 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"ddK" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/asteroid/paradise/surface/grass) "ddW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -9288,6 +9321,13 @@ "evW" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) +"evY" = ( +/obj/structure/closet/crate/science, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface/grass) "ewb" = ( /obj/structure/frame/machine, /turf/open/floor/iron, @@ -9789,6 +9829,9 @@ }, /turf/open/floor/iron, /area/security/brig) +"eEx" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface/grass) "eFI" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -10560,6 +10603,10 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel, /area/asteroid/paradise/surface) +"eXP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "eYg" = ( /obj/structure/stairs{ dir = 8 @@ -12558,6 +12605,15 @@ /obj/structure/fence, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"fXE" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 1 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "fXL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12610,6 +12666,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"fZk" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/frame/computer{ + anchored = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "fZy" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180 @@ -13864,6 +13927,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) +"gGF" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "gGH" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -14972,6 +15042,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"hmW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "hnn" = ( /obj/structure/railing/corner{ dir = 4 @@ -15369,6 +15446,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/bridge) +"hvc" = ( +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "hvh" = ( /obj/effect/turf_decal/siding/blue{ dir = 10 @@ -16519,6 +16600,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/mixing) +"ibU" = ( +/obj/machinery/shuttle/engine/plasma{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "idf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -16592,6 +16679,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/engine/engineering) +"ifq" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface) "ift" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17220,6 +17311,13 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"iwx" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "iwF" = ( /obj/machinery/light{ light_color = "#7AC3FF" @@ -17348,6 +17446,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/tech, /area/science/mixing) +"iAe" = ( +/turf/closed/wall/mineral/plastitanium, +/area/asteroid/paradise/surface) "iAz" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18739,18 +18840,8 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "jox" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/critter, -/mob/living/simple_animal/chicken/turkey{ - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); - desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; - health = 200; - maxHealth = 200; - melee_damage = 5; - minbodytemp = 2.7; - name = "Tom" - }, -/turf/open/floor/plating/dirt/planetary, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/mineral/titanium, /area/asteroid/paradise/surface) "joL" = ( /obj/structure/flora/rock/pile, @@ -19260,6 +19351,12 @@ dir = 10 }, /area/hallway/primary/aft) +"jCb" = ( +/obj/machinery/door/poddoor/shutters{ + id = "exploration" + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "jCv" = ( /obj/structure/dresser, /turf/open/floor/wood, @@ -20343,6 +20440,10 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/dark, /area/engine/engineering) +"kaM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "kaZ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -21008,6 +21109,10 @@ }, /turf/open/floor/iron, /area/storage/tech) +"ktr" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "ktL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -22362,6 +22467,13 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"lcI" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/obj/structure/frame, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "lcQ" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -24047,6 +24159,12 @@ }, /turf/open/floor/iron, /area/hydroponics) +"lRV" = ( +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "lSc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -28197,6 +28315,12 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"odd" = ( +/obj/machinery/atmospherics/components/unary/plasma_refiner{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "odG" = ( /obj/effect/spawner/structure/window/hollow/survival_pod/directional, /obj/structure/curtain/directional{ @@ -28589,6 +28713,13 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/pod/dark, /area/maintenance/department/cargo) +"oni" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -32; + pixel_y = -1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "onC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37180,6 +37311,10 @@ dir = 9 }, /area/hallway/primary/central) +"sJp" = ( +/obj/structure/girder, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "sJv" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -38242,6 +38377,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"tlo" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "tlw" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, @@ -38632,6 +38771,19 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/central) +"tsP" = ( +/mob/living/simple_animal/chicken/turkey{ + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); + desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; + health = 200; + maxHealth = 200; + melee_damage = 5; + minbodytemp = 2.7; + name = "Tom" + }, +/obj/structure/closet/crate/critter, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface/grass) "tsU" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -39086,6 +39238,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/crew_quarters/dorms) +"tEN" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "tFb" = ( /obj/machinery/defibrillator_mount{ pixel_y = -24 @@ -40286,6 +40445,9 @@ "uhc" = ( /turf/closed/wall, /area/medical/surgery) +"uhf" = ( +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "uhk" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -41274,6 +41436,9 @@ dir = 1 }, /area/science/research) +"uIp" = ( +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "uIx" = ( /obj/effect/turf_decal/tile/dark_green{ dir = 1 @@ -41930,6 +42095,11 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/iron, /area/bridge) +"uUe" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "uUf" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -42321,6 +42491,11 @@ dir = 4 }, /area/hallway/primary/aft) +"vbB" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "vbG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment, @@ -45058,6 +45233,12 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/engine) +"wwq" = ( +/obj/machinery/door/airlock/external/glass{ + autoclose = 0.1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "wwW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -45678,6 +45859,11 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"wKp" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "wKG" = ( /turf/closed/wall/rust, /area/crew_quarters/cryopods) @@ -47436,6 +47622,9 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"xCs" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface) "xCw" = ( /obj/machinery/computer/security/hos, /obj/item/toy/plush/carpplushie{ @@ -254952,7 +255141,7 @@ kxS ygG rxi kxS -rxi +ktr kxS kxS kxS @@ -255723,10 +255912,10 @@ kxS kxS rxi rxi -kxS -rxi -rxi -rxi +eEx +beC +jCb +uIp rxi rxi kxS @@ -255978,12 +256167,12 @@ kxS hgC rxi rxi +uhf +cDJ +bUp +hmW rxi -rxi -rxi -rxi -rxi -rxi +sJp rxi rxi kxS @@ -256233,17 +256422,17 @@ kxS kxS rxi rxi -rxi -rxi -rxi -rxi -rxi +bdK +sJp +ktr +xCs +tlo rxi jox -rxi -kxS -rxi +gGF kxS +lcI +ibU jNx vBi rxi @@ -256490,16 +256679,16 @@ kxS kxS rxi kxS -rxi -rxi -rxi -rxi -kxS -rxi -rxi -rxi -rxi -rxi +bdK +eXP +tEN +oni +kaM +ktr +ktr +vbB +lRV +fXE rxi upA khr @@ -256747,16 +256936,16 @@ kxS kxS rxi rxi +bdK +fZk +wKp +ktr +ktr +tsP rxi -rxi -rxi -rxi -rxi -kxS -rxi -kxS -rxi -rxi +evY +odd +uhf rxi pFg uXr @@ -257004,16 +257193,16 @@ kxS rxi rxi rxi -kxS -rxi -rxi -rxi -rxi -rxi -rxi -rxi +ddK +xCs rxi rxi +hvc +uUe +iwx +ktr +uUe +iAe rxi ubz fBR @@ -257262,13 +257451,13 @@ rxi rxi rxi kxS -kxS -rxi -rxi -rxi -rxi -rxi +avM +xCs rxi +ifq +wwq +xCs +xCs rxi kxS rxi From e82e21226be755aa8c3700d4988c336556c953f6 Mon Sep 17 00:00:00 2001 From: Markus Date: Sat, 14 Sep 2024 23:43:52 +0200 Subject: [PATCH 38/38] Update EchoStation.dmm --- _maps/map_files/EchoStation/EchoStation.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 854c9e333e83f..11ad950a7e09d 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -20646,9 +20646,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, -/obj/item/card/id/job/station_engineer, /obj/effect/turf_decal/delivery, /obj/machinery/light_switch/directional/west, +/obj/item/card/id/job/atmospheric_technician{ + access = list(11) + }, /turf/open/floor/iron/dark, /area/engine/engineering) "kgl" = ( @@ -42252,8 +42254,6 @@ "uTq" = ( /obj/item/circuitboard/machine/shuttle/engine/plasma, /obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/circuitboard/machine/shuttle/heater, /obj/item/circuitboard/machine/shuttle/heater, /obj/item/circuitboard/machine/shuttle/heater, /obj/item/circuitboard/machine/plasma_refiner,