From d3a9467db361e3c245b889a1ecd47cbb56f27600 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Wed, 22 Sep 2021 22:49:35 -0700 Subject: [PATCH 1/9] Pod time --- _maps/map_files/Delta/delta.dmm | 525 +++++++++++++++++++------------- 1 file changed, 305 insertions(+), 220 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 0947c97f5d1..27f0914dc9f 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -62099,26 +62099,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "sw_maint_airlock"; - pixel_y = 25; - tag_airpump = "sw_maint_pump"; - tag_chamber_sensor = "sw_maint_sensor"; - tag_exterior_door = "sw_maint_outer"; - tag_interior_door = "sw_maint_inner" - }, -/obj/machinery/airlock_sensor{ - id_tag = "sw_maint_sensor"; - pixel_y = 33 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1379; - id_tag = "sw_maint_pump" - }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/space) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -62127,19 +62109,9 @@ }, /area/maintenance/port) "cFP" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "interior access button"; - pixel_x = -24; - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, -/area/maintenance/port) +/area/space) "cFR" = ( /obj/structure/grille{ density = 0; @@ -62640,14 +62612,18 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_outer"; - locked = 1; - name = "West Maintenance External Access" +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/space) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -63049,15 +63025,15 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/unary/portables_connector{ +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 28 + }, +/obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/space) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -63558,18 +63534,9 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIu" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_inner"; - locked = 1; - name = "West Maintenance External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/space) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -64030,10 +63997,16 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/space) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -64053,6 +64026,7 @@ /area/maintenance/port) "cJP" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cJR" = ( @@ -64765,8 +64739,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/wrench, /obj/item/crowbar/red, -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/maintenance/port) "cLD" = ( @@ -66691,17 +66664,8 @@ /turf/space, /area/space/nearstation) "cPY" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "exterior access button"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/structure/lattice/catwalk, /turf/space, -/area/space/nearstation) +/area/maintenance/port) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -66877,14 +66841,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/fitness) -"cQs" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/maintenance/port) "cQu" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -66893,10 +66849,8 @@ }, /area/maintenance/port) "cQv" = ( -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall, +/area/space) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -67458,10 +67412,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cRD" = ( -/obj/structure/rack, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/floor/plating, +/area/space) "cRE" = ( /obj/machinery/light/small{ dir = 8 @@ -68168,9 +68120,9 @@ }, /area/crew_quarters/fitness) "cTg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/turf/simulated/wall/rust, -/area/maintenance/port) +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/pod_2) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -68179,10 +68131,10 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cTi" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/shuttle/pod_2) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -69097,15 +69049,9 @@ icon_state = "escape" }, /area/crew_quarters/fitness) -"cUP" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/turf/simulated/floor/plating, -/area/maintenance/port) "cUQ" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/plating, -/area/maintenance/port) +/turf/space, +/area/shuttle/pod_2) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, @@ -69669,18 +69615,20 @@ }, /area/medical/medbay3) "cWk" = ( -/obj/structure/table, -/obj/item/bikehorn/rubberducky, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall, +/area/shuttle/pod_2) "cWl" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWn" = ( @@ -70427,9 +70375,25 @@ }, /area/crew_quarters/fitness) "cXR" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "sw_maint_airlock"; + pixel_y = 25; + tag_airpump = "sw_maint_pump"; + tag_chamber_sensor = "sw_maint_sensor"; + tag_exterior_door = "sw_maint_outer"; + tag_interior_door = "sw_maint_inner" + }, +/obj/machinery/airlock_sensor{ + id_tag = "sw_maint_sensor"; + pixel_y = 33 + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + id_tag = "sw_maint_pump" + }, +/turf/simulated/floor/plasteel, /area/maintenance/port) "cXS" = ( /obj/structure/cable{ @@ -70447,6 +70411,9 @@ /area/maintenance/port) "cXT" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cXU" = ( @@ -94899,6 +94866,11 @@ }, /turf/space, /area/space) +"eBk" = ( +/obj/effect/spawner/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "eCs" = ( /obj/structure/cable{ d1 = 4; @@ -94953,6 +94925,12 @@ icon_state = "red" }, /area/security/brig) +"eNd" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/space, +/area/space/nearstation) "eNm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -95092,6 +95070,20 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/security/permabrig) +"fcI" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "interior access button"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "fdI" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -95803,6 +95795,10 @@ }, /turf/simulated/floor/engine, /area/toxins/mixing) +"hjj" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/space) "hjo" = ( /obj/structure/closet/crate, /obj/effect/landmark/costume/random, @@ -95851,6 +95847,12 @@ icon_state = "white" }, /area/hallway/primary/central) +"hoZ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) "hzb" = ( /obj/machinery/light{ dir = 4 @@ -96209,6 +96211,12 @@ }, /turf/simulated/floor/wood, /area/medical/psych) +"iJz" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutral" + }, +/area/space) "iKj" = ( /obj/machinery/light_switch{ pixel_x = -23; @@ -96512,6 +96520,9 @@ }, /turf/simulated/floor/plasteel, /area/security/seceqstorage) +"jJF" = ( +/turf/simulated/floor/plating, +/area/shuttle/pod_2) "jKp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -96593,6 +96604,15 @@ }, /turf/simulated/floor/plating, /area/security/seceqstorage) +"kct" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_outer"; + locked = 1; + name = "West Maintenance External Access" + }, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "khY" = ( /obj/structure/cable{ d1 = 1; @@ -96678,6 +96698,10 @@ icon_state = "red" }, /area/security/seceqstorage) +"kom" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "koC" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small{ @@ -96729,6 +96753,12 @@ icon_state = "vault" }, /area/security/prisonershuttle) +"kBz" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/space) "kCi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -97058,6 +97088,10 @@ icon_state = "dark" }, /area/turret_protected/aisat) +"lWt" = ( +/obj/structure/lattice, +/turf/space, +/area/space) "lZw" = ( /obj/machinery/ai_status_display{ pixel_x = -32 @@ -97644,6 +97678,19 @@ icon_state = "red" }, /area/security/prisonershuttle) +"nFI" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_inner"; + locked = 1; + name = "West Maintenance External Access"; + req_access_txt = "10;13" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "nFL" = ( /obj/machinery/light/small{ dir = 1 @@ -98504,6 +98551,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) +"rau" = ( +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "raB" = ( /obj/structure/grille/broken, /obj/structure/lattice, @@ -98967,6 +99021,10 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"ssL" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/space) "suy" = ( /obj/machinery/firealarm{ dir = 1; @@ -98984,6 +99042,12 @@ /obj/item/seeds/glowshroom, /turf/simulated/floor/plasteel, /area/security/permabrig) +"sxH" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "sxS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -98995,6 +99059,11 @@ icon_state = "white" }, /area/toxins/misc_lab) +"syt" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "sAW" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/plasteel{ @@ -100040,6 +100109,18 @@ icon_state = "neutral" }, /area/maintenance/starboard) +"vMN" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "exterior access button"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "vOc" = ( /obj/structure/table, /obj/item/taperecorder, @@ -100373,6 +100454,10 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"xtL" = ( +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "xuC" = ( /obj/structure/cable{ d1 = 1; @@ -118762,6 +118847,10 @@ aaa aaa aaa aaa +cQv +hjj +hjj +cQv aaa aaa aaa @@ -118770,12 +118859,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +xtL +lWt aaa aaa aaa @@ -119015,16 +119100,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -acF -aaa -aaa -aaa -aaa -aaa +cFN +cFN +cFN +cIu +bPS +ssL +ssL +cQv aaa aaa aaa @@ -119032,6 +119115,8 @@ aaa aaa aaa aaa +lWt +xtL aaa aaa aaa @@ -119272,15 +119357,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -acF -aaa -aaa -aaa -aaa +cFP +cGw +cHe +cJL +eNd +cRD +cRD +cQv aaa aaa aaa @@ -119289,6 +119373,7 @@ aaa aaa aaa aaa +xtL aaa aaa aaa @@ -119529,24 +119614,24 @@ aaa aaa aaa aaa +cFN +cFN +cFN +cIu +bPS +cRD +cRD +cQv +cQv +hjj +hjj +cQv +cQv aaa aaa -aaa -aaa -acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +lWt +xtL +lWt aaa aaa aaa @@ -119790,20 +119875,20 @@ abj abj aaa aaa -acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bPS +cRD +cRD +cRD +hoZ +iJz +iJz +cRD +cQv +cQv aaa +lWt +xtL +lWt aaa aaa aaa @@ -120047,21 +120132,21 @@ cie cie bXU aaa -acF +bPS +kBz +oEG +cRD +oEG +oEG +oEG +cRD +cRD +cQv aaa -abj -aaa -abj -abj -abj -aaa -abj -abj -abj -aaa -abj -abj -abj +lWt +vMN +bPS +vXX aaa aaa aaa @@ -120303,22 +120388,22 @@ bXU bXU bXU bXU -abj -cPY -cHA -cHA -cJK +vXX +bPS +cWn cHA cHA cHA -cJK cHA +cQv +cRD +jJF +cTg +cUQ +cWk +kct cHA -cCx -cJK -cCx -cCx -abj +vXX aaa aaa aaa @@ -120560,21 +120645,21 @@ cie cie cie bXU -dmq -cGw +cPY +cHA +drn cHA -cjV cJP cLC -cHA -cQs +rau +cQv cRD cTi cTg -cUP +cUQ cWk cXR -cCx +cHA aaa aaa aaa @@ -120818,21 +120903,21 @@ abj cbb bXU dmq -cFN +drn +drn cHA -cJL cWl -cYb -cHA +kom +sxH cQv -drn -drn -cTg +cRD +cTi +cWk cUQ -cWl -cYb -cCx -abj +cWk +nFI +cHA +vXX aaa aaa aaa @@ -121075,19 +121160,19 @@ cda cbb cDx bXU -cIu +drn +drn cHA cHA -cjX -cLz +syt cHA cHA -cjX +dtU +drn +cJK cHA cHA -cHA -cjX -cHA +fcI cHA abj aaa @@ -121332,8 +121417,8 @@ cCg cbb cDx bXU -cFP -cHe +drn +drn cIv dhG cLA @@ -121345,7 +121430,7 @@ cLA drn cWm cXT -cHA +eBk abj aaa aaa From 2a5ac996edd2fae1b3ae7d50a01481dca53716b0 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Fri, 24 Sep 2021 19:59:39 -0700 Subject: [PATCH 2/9] Engi-Pod --- _maps/map_files/Delta/delta.dmm | 484 ++++++++++++++++++-------------- 1 file changed, 267 insertions(+), 217 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 27f0914dc9f..0703bfa99c9 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -211,12 +211,13 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "adg" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) -"adh" = ( -/obj/effect/spawner/window/shuttle, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/shuttle/pod_2) +/area/hallway/secondary/entry) +"adh" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -257,18 +258,11 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "adz" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adK" = ( /obj/machinery/light/small{ dir = 4 @@ -300,20 +294,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"adP" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) -"adQ" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) "adT" = ( /obj/docking_port/stationary{ dir = 2; @@ -378,16 +358,8 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aeg" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "aey" = ( /obj/machinery/light/small{ dir = 8 @@ -428,10 +400,11 @@ }, /area/hallway/secondary/entry) "aeK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "aeL" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -62100,7 +62073,7 @@ /area/maintenance/port) "cFN" = ( /turf/simulated/wall/mineral/titanium, -/area/space) +/area/shuttle/pod_2) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -62109,9 +62082,18 @@ }, /area/maintenance/port) "cFP" = ( -/obj/effect/spawner/window/shuttle, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cFR" = ( /obj/structure/grille{ density = 0; @@ -62612,18 +62594,15 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 1 }, /turf/simulated/floor/mineral/titanium/blue, -/area/space) +/area/shuttle/pod_2) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -63025,15 +63004,16 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" }, /turf/simulated/floor/mineral/titanium/blue, -/area/space) +/area/shuttle/pod_2) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -63533,10 +63513,6 @@ /obj/item/paper/holodeck, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) -"cIu" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/space) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -63997,16 +63973,9 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/space) +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/port) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -66664,7 +66633,12 @@ /turf/space, /area/space/nearstation) "cPY" = ( -/turf/space, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/simulated/floor/plating, /area/maintenance/port) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -67412,8 +67386,14 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cRD" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, /turf/simulated/floor/plating, -/area/space) +/area/maintenance/port) "cRE" = ( /obj/machinery/light/small{ dir = 8 @@ -68120,9 +68100,8 @@ }, /area/crew_quarters/fitness) "cTg" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/shuttle/pod_2) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -68131,10 +68110,11 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cTi" = ( +/obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/shuttle/pod_2) +/area/maintenance/port) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -69051,7 +69031,7 @@ /area/crew_quarters/fitness) "cUQ" = ( /turf/space, -/area/shuttle/pod_2) +/area/maintenance/port) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, @@ -69615,8 +69595,17 @@ }, /area/medical/medbay3) "cWk" = ( -/turf/simulated/wall, -/area/shuttle/pod_2) +/obj/docking_port/mobile/pod{ + dir = 4; + id = "pod4"; + name = "escape pod 4" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cWl" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/shieldgen, @@ -94930,7 +94919,7 @@ name = "Escape Pod" }, /turf/space, -/area/space/nearstation) +/area/maintenance/port) "eNm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -95692,6 +95681,10 @@ "gTW" = ( /turf/simulated/floor/plasteel, /area/security/securearmoury) +"gWJ" = ( +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plating, +/area/maintenance/port) "haD" = ( /obj/structure/cable{ d2 = 8; @@ -95805,6 +95798,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) +"hkc" = ( +/obj/structure/sign/pods{ + pixel_x = -32 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "hly" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -95851,8 +95851,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/space) +/area/maintenance/port) "hzb" = ( /obj/machinery/light{ dir = 4 @@ -96061,6 +96062,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"ieM" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_2) "ifj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -96212,11 +96217,14 @@ /turf/simulated/floor/wood, /area/medical/psych) "iJz" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" +/obj/item/radio/intercom{ + pixel_y = 25 }, -/area/space) +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "iKj" = ( /obj/machinery/light_switch{ pixel_x = -23; @@ -96521,8 +96529,9 @@ /turf/simulated/floor/plasteel, /area/security/seceqstorage) "jJF" = ( +/obj/structure/closet/wardrobe/grey, /turf/simulated/floor/plating, -/area/shuttle/pod_2) +/area/maintenance/port) "jKp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -96754,11 +96763,16 @@ }, /area/security/prisonershuttle) "kBz" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, -/area/space) +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "kCi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -97078,6 +97092,17 @@ icon_state = "grimy" }, /area/chapel/office) +"lOx" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "lVO" = ( /obj/machinery/turretid/lethal{ control_area = "\improper Telecoms Central Compartment"; @@ -97089,9 +97114,9 @@ }, /area/turret_protected/aisat) "lWt" = ( -/obj/structure/lattice, -/turf/space, -/area/space) +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_4) "lZw" = ( /obj/machinery/ai_status_display{ pixel_x = -32 @@ -98313,6 +98338,12 @@ }, /turf/simulated/floor/plating, /area/security/permasolitary) +"pZG" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/space/nearstation) "qcA" = ( /obj/docking_port/stationary{ dwidth = 4; @@ -98469,6 +98500,10 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) +"qTT" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/port) "qVp" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ @@ -99022,9 +99057,10 @@ /turf/simulated/floor/plasteel, /area/security/permasolitary) "ssL" = ( -/obj/structure/closet/emcloset, +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/space) +/area/hallway/secondary/entry) "suy" = ( /obj/machinery/firealarm{ dir = 1; @@ -99297,6 +99333,10 @@ /obj/item/paper_bin, /turf/simulated/floor/plating, /area/security/permabrig) +"tvE" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "tFw" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -99988,6 +100028,10 @@ icon_state = "dark" }, /area/tcommsat/chamber) +"vDR" = ( +/obj/structure/lattice, +/turf/simulated/wall/r_wall, +/area/maintenance/port) "vDY" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -100160,6 +100204,12 @@ icon_state = "whitepurple" }, /area/toxins/misc_lab) +"waa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/maintenance/port) "wdH" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -100455,9 +100505,9 @@ }, /area/hallway/primary/central) "xtL" = ( -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "xuC" = ( /obj/structure/cable{ d1 = 1; @@ -118844,13 +118894,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -cQv -hjj -hjj -cQv +dmq +dmq +dmq +dmq +cJK +cJK +cHA aaa aaa aaa @@ -118859,8 +118909,8 @@ aaa aaa aaa aaa -xtL -lWt +acF +abj aaa aaa aaa @@ -119099,15 +119149,15 @@ aaa aaa aaa aaa -aaa cFN cFN cFN -cIu -bPS -ssL -ssL -cQv +tvE +cJL +cHA +cXX +cXX +cHA aaa aaa aaa @@ -119115,8 +119165,8 @@ aaa aaa aaa aaa -lWt -xtL +abj +acF aaa aaa aaa @@ -119355,16 +119405,17 @@ aaa aaa aaa aaa -aaa -aaa +vXX +ieM cFP cGw cHe cJL eNd -cRD -cRD -cQv +drn +drn +cHA +abj aaa aaa aaa @@ -119372,8 +119423,7 @@ aaa aaa aaa aaa -aaa -xtL +acF aaa aaa aaa @@ -119613,25 +119663,25 @@ aaa aaa aaa aaa -aaa cFN cFN cFN -cIu -bPS +tvE +cJL +cHA cRD -cRD -cQv +cXU +cHA cQv hjj hjj -cQv -cQv +cHA +cHA aaa aaa -lWt -xtL -lWt +abj +acF +abj aaa aaa aaa @@ -119872,23 +119922,23 @@ abj abj abj abj -abj -aaa -aaa -bPS -cRD -cRD -cRD +vDR +dmq +cHA +cHA +drn +waa +drn hoZ -iJz -iJz -cRD -cQv -cQv +dpX +cLA +dtU +cHA +cHA aaa -lWt -xtL -lWt +abj +acF +abj aaa aaa aaa @@ -120131,19 +120181,19 @@ cie cie cie bXU +qTT +pZG +drn +dhG +drn +drn +drn +dhG +drn +cCy +cHA aaa -bPS -kBz -oEG -cRD -oEG -oEG -oEG -cRD -cRD -cQv -aaa -lWt +abj vMN bPS vXX @@ -120388,19 +120438,19 @@ bXU bXU bXU bXU -vXX -bPS -cWn +lOx +pZG +drn cHA cHA cHA cHA -cQv -cRD +cHA +drn jJF -cTg +cJK cUQ -cWk +cHA kct cHA vXX @@ -120646,18 +120696,18 @@ cie cie bXU cPY -cHA drn +dhG cHA cJP cLC rau -cQv -cRD -cTi -cTg +cHA +drn +dsr +cJK cUQ -cWk +cHA cXR cHA aaa @@ -120904,17 +120954,17 @@ cbb bXU dmq drn -drn +cXU cHA cWl kom sxH -cQv -cRD +cHA +gWJ cTi -cWk +cHA cUQ -cWk +cHA nFI cHA vXX @@ -121161,7 +121211,7 @@ cbb cDx bXU drn -drn +dhG cHA cHA syt @@ -121417,7 +121467,7 @@ cCg cbb cDx bXU -drn +dhG drn cIv dhG @@ -142119,10 +142169,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +acC +acC +acC adb adb adb @@ -142376,13 +142426,13 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aey acC -afc +adg +aeg +aeg +acC +xtL +hkc adZ adZ agm @@ -142633,14 +142683,14 @@ aaa aaa aaa aaa -adh +acC adz -adP aeg -aez -aeK +aeg +ssL afh aea +aea afM ajZ ahg @@ -142890,14 +142940,14 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aeA +acC +adh +adh +adh acC afj aeb +aeb afN agn agH @@ -143147,10 +143197,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +aeK +cWk +aeK adb adb adb @@ -143404,10 +143454,10 @@ aaa aaa aaa aaa -aaa -aaa -abj -abj +adb +cTg +iJz +cTg adb aeL afd @@ -143661,10 +143711,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -abj +adN +cTg +kBz +cTg adb aeM afe @@ -143919,9 +143969,9 @@ aaa aaa aaa aaa -aaa -aaa -abj +cTg +lWt +cTg adb aeN aff @@ -144177,8 +144227,8 @@ aaa aaa aaa aaa -abi -abj +vXX +aaa aeB aeB afg From c6efa1b9a14523979c48a401429d24c2185d8fc6 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Fri, 24 Sep 2021 20:22:02 -0700 Subject: [PATCH 3/9] Update delta.dmm --- _maps/map_files/Delta/delta.dmm | 721 +++++++++++++++++++------------- 1 file changed, 426 insertions(+), 295 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 68fb67f6c9f..ee1bcb94683 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -211,12 +211,13 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "adg" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) -"adh" = ( -/obj/effect/spawner/window/shuttle, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/shuttle/pod_2) +/area/hallway/secondary/entry) +"adh" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -257,18 +258,11 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "adz" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adK" = ( /obj/machinery/light/small{ dir = 4 @@ -300,20 +294,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"adP" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) -"adQ" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) "adT" = ( /obj/docking_port/stationary{ dir = 2; @@ -378,16 +358,8 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aeg" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "aey" = ( /obj/machinery/light/small{ dir = 8 @@ -428,10 +400,11 @@ }, /area/hallway/secondary/entry) "aeK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "aeL" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -62146,26 +62119,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "sw_maint_airlock"; - pixel_y = 25; - tag_airpump = "sw_maint_pump"; - tag_chamber_sensor = "sw_maint_sensor"; - tag_exterior_door = "sw_maint_outer"; - tag_interior_door = "sw_maint_inner" - }, -/obj/machinery/airlock_sensor{ - id_tag = "sw_maint_sensor"; - pixel_y = 33 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1379; - id_tag = "sw_maint_pump" - }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -62174,19 +62129,17 @@ }, /area/maintenance/port) "cFP" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "interior access button"; - pixel_x = -24; - pixel_y = 24 +/obj/docking_port/mobile/pod{ + dir = 4; + id = "pod4"; + name = "escape pod 4" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" }, -/turf/simulated/floor/plating, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cFR" = ( /obj/structure/grille{ density = 0; @@ -62687,14 +62640,14 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_outer"; - locked = 1; - name = "West Maintenance External Access" +/obj/item/radio/intercom{ + pixel_y = 25 }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -63096,15 +63049,16 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -63605,18 +63559,10 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIu" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_inner"; - locked = 1; - name = "West Maintenance External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/maintenance/port) +/area/hallway/secondary/entry) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -64091,10 +64037,9 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/warning_stripes/northeast, +/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/hallway/secondary/entry) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -64114,6 +64059,7 @@ /area/maintenance/port) "cJP" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cJR" = ( @@ -64835,8 +64781,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/wrench, /obj/item/crowbar/red, -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/maintenance/port) "cLD" = ( @@ -66762,16 +66707,10 @@ /turf/space, /area/space/nearstation) "cPY" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "exterior access button"; - pixel_x = 24; - pixel_y = 24 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" }, -/obj/structure/lattice/catwalk, -/turf/space, /area/space/nearstation) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -66949,13 +66888,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/fitness) "cQs" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/sign/pods{ + pixel_x = -32 }, -/obj/effect/decal/warning_stripes/northwest, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/hallway/secondary/entry) "cQu" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -66964,10 +66902,8 @@ }, /area/maintenance/port) "cQv" = ( -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -67529,10 +67465,9 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cRD" = ( -/obj/structure/rack, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_2) "cRE" = ( /obj/machinery/light/small{ dir = 8 @@ -68240,9 +68175,18 @@ }, /area/crew_quarters/fitness) "cTg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/turf/simulated/wall/rust, -/area/maintenance/port) +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -68251,10 +68195,15 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cTi" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 28 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -69166,14 +69115,8 @@ icon_state = "escape" }, /area/crew_quarters/fitness) -"cUP" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/turf/simulated/floor/plating, -/area/maintenance/port) "cUQ" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/plating, +/turf/space, /area/maintenance/port) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -69738,18 +69681,21 @@ }, /area/medical/medbay3) "cWk" = ( -/obj/structure/table, -/obj/item/bikehorn/rubberducky, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/obj/structure/lattice, +/turf/simulated/wall/r_wall, /area/maintenance/port) "cWl" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWn" = ( @@ -70496,9 +70442,25 @@ }, /area/crew_quarters/fitness) "cXR" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "sw_maint_airlock"; + pixel_y = 25; + tag_airpump = "sw_maint_pump"; + tag_chamber_sensor = "sw_maint_sensor"; + tag_exterior_door = "sw_maint_outer"; + tag_interior_door = "sw_maint_inner" + }, +/obj/machinery/airlock_sensor{ + id_tag = "sw_maint_sensor"; + pixel_y = 33 + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + id_tag = "sw_maint_pump" + }, +/turf/simulated/floor/plasteel, /area/maintenance/port) "cXS" = ( /obj/structure/cable{ @@ -70516,6 +70478,9 @@ /area/maintenance/port) "cXT" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cXU" = ( @@ -95006,6 +94971,13 @@ icon_state = "red" }, /area/security/brig) +"eMO" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "eNm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -95721,6 +95693,20 @@ icon_state = "red" }, /area/security/brig) +"gPt" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "interior access button"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "gSt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -95885,6 +95871,10 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) +"hkL" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "hly" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -96168,6 +96158,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) +"ilq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/maintenance/port) +"ins" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/port) "ipD" = ( /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plating, @@ -96318,6 +96318,11 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/security/permabrig) +"iMz" = ( +/obj/effect/spawner/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "iMM" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -96389,6 +96394,19 @@ icon_state = "redfull" }, /area/security/warden) +"iYR" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_inner"; + locked = 1; + name = "West Maintenance External Access"; + req_access_txt = "10;13" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "jav" = ( /obj/machinery/door/airlock{ name = "Magistrate's Office"; @@ -96494,6 +96512,17 @@ icon_state = "redcorner" }, /area/security/brig) +"jvt" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) +"jwv" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/port) "jAm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -96516,6 +96545,10 @@ icon_state = "dark" }, /area/security/processing) +"jAZ" = ( +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/plating, +/area/maintenance/port) "jBy" = ( /obj/structure/window/reinforced{ dir = 1; @@ -96939,6 +96972,10 @@ }, /turf/simulated/floor/plating, /area/security/brig) +"lkM" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/port) "llI" = ( /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; @@ -96961,6 +96998,18 @@ icon_state = "red" }, /area/security/seceqstorage) +"lql" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "exterior access button"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "lso" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -97580,6 +97629,12 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) +"mWL" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/space, +/area/maintenance/port) "mYH" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -97995,11 +98050,20 @@ /obj/structure/filingcabinet, /turf/simulated/floor/plating, /area/security/detectives_office) +"oov" = ( +/turf/simulated/wall, +/area/space) "ops" = ( /obj/structure/window/reinforced, /obj/structure/lattice, /turf/space, /area/space/nearstation) +"ora" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "orz" = ( /obj/structure/window/reinforced{ dir = 1; @@ -98031,6 +98095,14 @@ icon_state = "neutral" }, /area/maintenance/fore2) +"oxc" = ( +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plating, +/area/maintenance/port) +"oxy" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/space) "oBE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/item/vending_refill/coffee, @@ -98253,6 +98325,14 @@ /obj/structure/window/reinforced, /turf/space, /area/space) +"poU" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "ppj" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -99066,6 +99146,17 @@ }, /turf/simulated/floor/engine, /area/engine/supermatter) +"seY" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "shi" = ( /obj/structure/cable{ d2 = 2; @@ -99274,6 +99365,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) +"sSk" = ( +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "sTz" = ( /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -99343,6 +99445,15 @@ icon_state = "red" }, /area/security/warden) +"tcs" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_outer"; + locked = 1; + name = "West Maintenance External Access" + }, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "tdA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -99853,6 +99964,15 @@ /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) +"uHw" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "uJk" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle, @@ -100304,6 +100424,13 @@ icon_state = "red" }, /area/security/processing) +"vRw" = ( +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "vSW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -100776,6 +100903,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"xRR" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "xUI" = ( /obj/structure/table/reinforced, /obj/item/storage/box/teargas, @@ -119036,6 +119167,13 @@ aaa aaa aaa aaa +dmq +dmq +dmq +dmq +cJK +cJK +cHA aaa aaa aaa @@ -119044,15 +119182,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acF +abj aaa aaa aaa @@ -119291,11 +119422,23 @@ aaa aaa aaa aaa +cQv +cQv +cQv +xRR +lkM +cHA +cXX +cXX +cHA aaa aaa aaa aaa aaa +aaa +aaa +abj acF aaa aaa @@ -119319,18 +119462,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -119547,6 +119678,18 @@ aaa aaa aaa aaa +vXX +cRD +cTg +cTi +sSk +lkM +mWL +drn +drn +cHA +abj +aaa aaa aaa aaa @@ -119576,18 +119719,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -119805,25 +119936,25 @@ aaa aaa aaa aaa +cQv +cQv +cQv +xRR +lkM +cHA +uHw +cXU +cHA +oov +oxy +oxy +cHA +cHA aaa aaa -aaa -aaa -aaa +abj acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa aaa aaa @@ -120064,23 +120195,23 @@ abj abj abj abj +cWk +dmq +cHA +cHA +drn +ilq +drn +eMO +dpX +cLA +dtU +cHA +cHA +aaa abj -aaa -aaa acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa aaa aaa @@ -120323,22 +120454,22 @@ cie cie cie bXU -aaa -acF +ins +cPY +drn +dhG +drn +drn +drn +dhG +drn +cCy +cHA aaa abj -aaa -abj -abj -abj -aaa -abj -abj -abj -aaa -abj -abj -abj +lql +bPS +vXX aaa aaa aaa @@ -120580,22 +120711,22 @@ bXU bXU bXU bXU -abj +seY cPY +drn cHA cHA +cHA +cHA +cHA +drn +jAZ cJK +cUQ cHA +tcs cHA -cHA -cJK -cHA -cHA -cCx -cJK -cCx -cCx -abj +vXX aaa aaa aaa @@ -120837,21 +120968,21 @@ cie cie cie bXU -dmq -cGw +poU +drn +dhG cHA -cjV cJP cLC +vRw +cHA +drn +dsr +cJK +cUQ cHA -cQs -cRD -cTi -cTg -cUP -cWk cXR -cCx +cHA aaa aaa aaa @@ -121095,21 +121226,21 @@ abj cbb bXU dmq -cFN +drn +cXU cHA -cJL cWl -cYb +hkL +ora +cHA +oxc +jwv cHA -cQv -drn -drn -cTg cUQ -cWl -cYb -cCx -abj +cHA +iYR +cHA +vXX aaa aaa aaa @@ -121352,19 +121483,19 @@ cda cbb cDx bXU -cIu +drn +dhG cHA cHA -cjX -cLz +jvt cHA cHA -cjX +dtU +drn +cJK cHA cHA -cHA -cjX -cHA +gPt cHA abj aaa @@ -121609,8 +121740,8 @@ cCg cbb cDx bXU -cFP -cHe +dhG +drn cIv dhG cLA @@ -121622,7 +121753,7 @@ cLA drn cWm cXT -cHA +iMz abj aaa aaa @@ -142311,10 +142442,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +acC +acC +acC adb adb adb @@ -142568,13 +142699,13 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aey acC -afc +adg +aeg +aeg +acC +cJL +cQs adZ adZ agm @@ -142825,14 +142956,14 @@ aaa aaa aaa aaa -adh +acC adz -adP aeg -aez -aeK +aeg +cIu afh aea +aea afM ajZ ahg @@ -143082,14 +143213,14 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aeA +acC +adh +adh +adh acC afj aeb +aeb afN agn agH @@ -143339,10 +143470,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +aeK +cFP +aeK adb adb adb @@ -143596,10 +143727,10 @@ aaa aaa aaa aaa -aaa -aaa -abj -abj +adb +cFN +cGw +cFN adb aeL afd @@ -143853,10 +143984,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -abj +adN +cFN +cHe +cFN adb aeM afe From 278a70733d2047f1086b5107f8fc172975374f70 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Fri, 24 Sep 2021 20:33:17 -0700 Subject: [PATCH 4/9] Minor area issues --- _maps/map_files/Delta/delta.dmm | 395 ++++++++++++++++---------------- 1 file changed, 196 insertions(+), 199 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index ee1bcb94683..693dfdf9e66 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -69115,9 +69115,14 @@ icon_state = "escape" }, /area/crew_quarters/fitness) -"cUQ" = ( -/turf/space, +"cUP" = ( +/obj/structure/lattice, +/turf/simulated/wall/r_wall, /area/maintenance/port) +"cUQ" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, @@ -69681,9 +69686,16 @@ }, /area/medical/medbay3) "cWk" = ( -/obj/structure/lattice, -/turf/simulated/wall/r_wall, -/area/maintenance/port) +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cWl" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/shieldgen, @@ -94971,13 +94983,6 @@ icon_state = "red" }, /area/security/brig) -"eMO" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "eNm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -95693,20 +95698,6 @@ icon_state = "red" }, /area/security/brig) -"gPt" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "interior access button"; - pixel_x = -24; - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "gSt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -95846,6 +95837,10 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"heu" = ( +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plating, +/area/maintenance/port) "hfN" = ( /obj/structure/cable{ d1 = 4; @@ -95871,10 +95866,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) -"hkL" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/maintenance/port) "hly" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -96158,16 +96149,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) -"ilq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/remains/robot, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/plating, -/area/maintenance/port) -"ins" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/maintenance/port) "ipD" = ( /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plating, @@ -96318,11 +96299,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/security/permabrig) -"iMz" = ( -/obj/effect/spawner/window/reinforced, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "iMM" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -96394,19 +96370,6 @@ icon_state = "redfull" }, /area/security/warden) -"iYR" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_inner"; - locked = 1; - name = "West Maintenance External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "jav" = ( /obj/machinery/door/airlock{ name = "Magistrate's Office"; @@ -96429,6 +96392,10 @@ }, /turf/simulated/floor/engine, /area/toxins/misc_lab) +"jfO" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "jgO" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "Brig"; @@ -96512,17 +96479,11 @@ icon_state = "redcorner" }, /area/security/brig) -"jvt" = ( +"jwe" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/port) -"jwv" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/port) "jAm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -96545,10 +96506,6 @@ icon_state = "dark" }, /area/security/processing) -"jAZ" = ( -/obj/structure/closet/wardrobe/grey, -/turf/simulated/floor/plating, -/area/maintenance/port) "jBy" = ( /obj/structure/window/reinforced{ dir = 1; @@ -96579,6 +96536,17 @@ icon_state = "cult" }, /area/magistrateoffice) +"jEk" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "jFV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -96649,9 +96617,28 @@ }, /turf/simulated/floor/plating, /area/toxins/misc_lab) +"jNN" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "jQY" = ( /turf/simulated/wall/r_wall, /area/security/seceqstorage) +"jTi" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_inner"; + locked = 1; + name = "West Maintenance External Access"; + req_access_txt = "10;13" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "jUC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -96838,6 +96825,11 @@ icon_state = "vault" }, /area/security/prisonershuttle) +"kzt" = ( +/obj/effect/spawner/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "kCi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -96972,10 +96964,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"lkM" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/port) "llI" = ( /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; @@ -96998,18 +96986,6 @@ icon_state = "red" }, /area/security/seceqstorage) -"lql" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "exterior access button"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "lso" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -97061,6 +97037,18 @@ icon_state = "grimy" }, /area/security/detectives_office) +"lzI" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "exterior access button"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "lzY" = ( /obj/structure/table/wood, /obj/machinery/alarm{ @@ -97476,6 +97464,15 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/detectives_office) +"mDx" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_outer"; + locked = 1; + name = "West Maintenance External Access" + }, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "mEk" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -97537,6 +97534,9 @@ icon_state = "neutralfull" }, /area/security/brig) +"mLP" = ( +/turf/simulated/wall, +/area/space) "mLW" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, @@ -97629,12 +97629,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) -"mWL" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Pod" - }, -/turf/space, -/area/maintenance/port) "mYH" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -97748,6 +97742,12 @@ icon_state = "barber" }, /area/security/permabrig) +"nkS" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/port) "nli" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/cleanliness{ @@ -98050,20 +98050,11 @@ /obj/structure/filingcabinet, /turf/simulated/floor/plating, /area/security/detectives_office) -"oov" = ( -/turf/simulated/wall, -/area/space) "ops" = ( /obj/structure/window/reinforced, /obj/structure/lattice, /turf/space, /area/space/nearstation) -"ora" = ( -/obj/effect/decal/warning_stripes/southeast, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/rack, -/turf/simulated/floor/plating, -/area/maintenance/port) "orz" = ( /obj/structure/window/reinforced{ dir = 1; @@ -98095,14 +98086,6 @@ icon_state = "neutral" }, /area/maintenance/fore2) -"oxc" = ( -/mob/living/simple_animal/mouse, -/turf/simulated/floor/plating, -/area/maintenance/port) -"oxy" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/space) "oBE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/item/vending_refill/coffee, @@ -98325,14 +98308,6 @@ /obj/structure/window/reinforced, /turf/space, /area/space) -"poU" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "ppj" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -98351,6 +98326,10 @@ icon_state = "redfull" }, /area/security/seceqstorage) +"pwS" = ( +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/plating, +/area/maintenance/port) "pBz" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/suit/browntrenchcoat, @@ -98507,6 +98486,20 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"pYw" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "interior access button"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "pZf" = ( /obj/machinery/door/poddoor{ density = 0; @@ -98753,6 +98746,15 @@ icon_state = "vault" }, /area/security/securearmoury) +"qZr" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "qZt" = ( /obj/structure/cable{ d1 = 4; @@ -99146,17 +99148,6 @@ }, /turf/simulated/floor/engine, /area/engine/supermatter) -"seY" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "shi" = ( /obj/structure/cable{ d2 = 2; @@ -99195,6 +99186,10 @@ icon_state = "whitepurple" }, /area/medical/research) +"snp" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/port) "soN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -99334,6 +99329,13 @@ icon_state = "neutralfull" }, /area/security/brig) +"sFX" = ( +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "sMj" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -99365,17 +99367,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) -"sSk" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) "sTz" = ( /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -99445,15 +99436,6 @@ icon_state = "red" }, /area/security/warden) -"tcs" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_outer"; - locked = 1; - name = "West Maintenance External Access" - }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) "tdA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -99732,6 +99714,13 @@ icon_state = "redcorner" }, /area/security/brig) +"tQH" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "tRM" = ( /obj/structure/cable{ d1 = 2; @@ -99964,15 +99953,6 @@ /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"uHw" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/vacuum{ - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "uJk" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle, @@ -99999,6 +99979,10 @@ icon_state = "white" }, /area/security/medbay) +"uLx" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/space) "uQK" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -100339,6 +100323,10 @@ /obj/machinery/chem_master, /turf/simulated/floor/engine, /area/toxins/misc_lab) +"vFz" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/port) "vGw" = ( /obj/structure/cable{ d1 = 1; @@ -100424,13 +100412,6 @@ icon_state = "red" }, /area/security/processing) -"vRw" = ( -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/southwest, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/rack, -/turf/simulated/floor/plating, -/area/maintenance/port) "vSW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -100440,6 +100421,12 @@ icon_state = "red" }, /area/hallway/secondary/exit) +"vTb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/maintenance/port) "vVf" = ( /obj/machinery/chem_dispenser, /obj/item/reagent_containers/glass/beaker/large, @@ -100664,6 +100651,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/warden) +"wXy" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "wXI" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, @@ -100903,10 +100898,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"xRR" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) "xUI" = ( /obj/structure/table/reinforced, /obj/item/storage/box/teargas, @@ -100950,6 +100941,12 @@ icon_state = "dark" }, /area/security/interrogation) +"ycQ" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/space, +/area/maintenance/port) "ydp" = ( /obj/structure/cable{ d1 = 1; @@ -119425,8 +119422,8 @@ aaa cQv cQv cQv -xRR -lkM +cUQ +vFz cHA cXX cXX @@ -119682,9 +119679,9 @@ vXX cRD cTg cTi -sSk -lkM -mWL +cWk +vFz +ycQ drn drn cHA @@ -119939,15 +119936,15 @@ aaa cQv cQv cQv -xRR -lkM +cUQ +vFz cHA -uHw +qZr cXU cHA -oov -oxy -oxy +mLP +uLx +uLx cHA cHA aaa @@ -120195,14 +120192,14 @@ abj abj abj abj -cWk +cUP dmq cHA cHA drn -ilq +vTb drn -eMO +tQH dpX cLA dtU @@ -120454,7 +120451,7 @@ cie cie cie bXU -ins +snp cPY drn dhG @@ -120467,7 +120464,7 @@ cCy cHA aaa abj -lql +lzI bPS vXX aaa @@ -120711,7 +120708,7 @@ bXU bXU bXU bXU -seY +jEk cPY drn cHA @@ -120720,11 +120717,11 @@ cHA cHA cHA drn -jAZ +pwS cJK -cUQ +aaa cHA -tcs +mDx cHA vXX aaa @@ -120968,18 +120965,18 @@ cie cie cie bXU -poU +wXy drn dhG cHA cJP cLC -vRw +sFX cHA drn dsr cJK -cUQ +aaa cHA cXR cHA @@ -121230,15 +121227,15 @@ drn cXU cHA cWl -hkL -ora +jfO +jNN cHA -oxc -jwv +heu +nkS cHA -cUQ +aaa cHA -iYR +jTi cHA vXX aaa @@ -121487,7 +121484,7 @@ drn dhG cHA cHA -jvt +jwe cHA cHA dtU @@ -121495,7 +121492,7 @@ drn cJK cHA cHA -gPt +pYw cHA abj aaa @@ -121753,7 +121750,7 @@ cLA drn cWm cXT -iMz +kzt abj aaa aaa From 3ad506fb46b6aa1fdcff8600f5ccdc6f3370e2af Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Sat, 25 Sep 2021 01:11:24 -0700 Subject: [PATCH 5/9] I try to avoid conflicts --- _maps/map_files/Delta/delta.dmm | 736 +++++++++++++++++++------------- 1 file changed, 434 insertions(+), 302 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 679619b4055..b883a9e7db0 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -211,12 +211,13 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "adg" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) -"adh" = ( -/obj/effect/spawner/window/shuttle, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/shuttle/pod_2) +/area/hallway/secondary/entry) +"adh" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -257,18 +258,11 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "adz" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adK" = ( /obj/machinery/light/small{ dir = 4 @@ -300,20 +294,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"adP" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) -"adQ" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) "adT" = ( /obj/docking_port/stationary{ dir = 2; @@ -378,16 +358,8 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aeg" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "aey" = ( /obj/machinery/light/small{ dir = 8 @@ -428,10 +400,11 @@ }, /area/hallway/secondary/entry) "aeK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "aeL" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -6085,6 +6058,20 @@ icon_state = "neutral" }, /area/maintenance/fore) +"auV" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "interior access button"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "auW" = ( /obj/structure/cable{ d1 = 4; @@ -62144,26 +62131,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "sw_maint_airlock"; - pixel_y = 25; - tag_airpump = "sw_maint_pump"; - tag_chamber_sensor = "sw_maint_sensor"; - tag_exterior_door = "sw_maint_outer"; - tag_interior_door = "sw_maint_inner" - }, -/obj/machinery/airlock_sensor{ - id_tag = "sw_maint_sensor"; - pixel_y = 33 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1379; - id_tag = "sw_maint_pump" - }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -62172,19 +62141,17 @@ }, /area/maintenance/port) "cFP" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "interior access button"; - pixel_x = -24; - pixel_y = 24 +/obj/docking_port/mobile/pod{ + dir = 4; + id = "pod4"; + name = "escape pod 4" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" }, -/turf/simulated/floor/plating, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cFR" = ( /obj/structure/grille{ density = 0; @@ -62685,14 +62652,14 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_outer"; - locked = 1; - name = "West Maintenance External Access" +/obj/item/radio/intercom{ + pixel_y = 25 }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -63094,15 +63061,16 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -63603,18 +63571,9 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIu" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_inner"; - locked = 1; - name = "West Maintenance External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, -/area/maintenance/port) +/area/shuttle/pod_4) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -64089,10 +64048,10 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -64112,6 +64071,7 @@ /area/maintenance/port) "cJP" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cJR" = ( @@ -64833,8 +64793,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/wrench, /obj/item/crowbar/red, -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/maintenance/port) "cLD" = ( @@ -66760,16 +66719,10 @@ /turf/space, /area/space/nearstation) "cPY" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "exterior access button"; - pixel_x = 24; - pixel_y = 24 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" }, -/obj/structure/lattice/catwalk, -/turf/space, /area/space/nearstation) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -66947,13 +66900,9 @@ /turf/simulated/floor/plating, /area/crew_quarters/fitness) "cQs" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 1 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/hallway/secondary/entry) "cQu" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -66962,10 +66911,12 @@ }, /area/maintenance/port) "cQv" = ( -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/northeast, +/obj/structure/sign/pods{ + pixel_x = -32 + }, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/hallway/secondary/entry) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -67527,10 +67478,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cRD" = ( -/obj/structure/rack, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "cRE" = ( /obj/machinery/light/small{ dir = 8 @@ -68238,9 +68187,9 @@ }, /area/crew_quarters/fitness) "cTg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/turf/simulated/wall/rust, -/area/maintenance/port) +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_2) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -68249,10 +68198,18 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cTi" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -69165,13 +69122,18 @@ }, /area/crew_quarters/fitness) "cUP" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/turf/simulated/floor/plating, -/area/maintenance/port) +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 28 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cUQ" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/plating, +/obj/structure/lattice, +/turf/simulated/wall/r_wall, /area/maintenance/port) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -69736,18 +69698,21 @@ }, /area/medical/medbay3) "cWk" = ( -/obj/structure/table, -/obj/item/bikehorn/rubberducky, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "cWl" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWn" = ( @@ -70494,9 +70459,25 @@ }, /area/crew_quarters/fitness) "cXR" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "sw_maint_airlock"; + pixel_y = 25; + tag_airpump = "sw_maint_pump"; + tag_chamber_sensor = "sw_maint_sensor"; + tag_exterior_door = "sw_maint_outer"; + tag_interior_door = "sw_maint_inner" + }, +/obj/machinery/airlock_sensor{ + id_tag = "sw_maint_sensor"; + pixel_y = 33 + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + id_tag = "sw_maint_pump" + }, +/turf/simulated/floor/plasteel, /area/maintenance/port) "cXS" = ( /obj/structure/cable{ @@ -70514,6 +70495,9 @@ /area/maintenance/port) "cXT" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cXU" = ( @@ -95001,6 +94985,9 @@ }, /turf/simulated/floor/grass, /area/hallway/secondary/exit) +"eLy" = ( +/turf/simulated/wall, +/area/space) "eLI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -96004,6 +95991,11 @@ icon_state = "red" }, /area/security/brig) +"hHS" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "hLZ" = ( /obj/structure/table/glass, /obj/item/hemostat{ @@ -96059,6 +96051,11 @@ }, /turf/simulated/floor/engine, /area/engine/supermatter) +"hQw" = ( +/obj/effect/spawner/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "hTk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, @@ -96329,6 +96326,13 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/maintenance/starboard) +"iRL" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "iTV" = ( /obj/structure/cable{ d1 = 4; @@ -96427,6 +96431,12 @@ icon_state = "whitebluecorner" }, /area/medical/medbay) +"jes" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/maintenance/port) "jgO" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "Brig"; @@ -96757,6 +96767,10 @@ icon_state = "red" }, /area/security/prisonershuttle) +"klv" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "knI" = ( /obj/structure/cable{ d1 = 4; @@ -97193,6 +97207,15 @@ icon_state = "neutralfull" }, /area/hallway/primary/starboard) +"meO" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_outer"; + locked = 1; + name = "West Maintenance External Access" + }, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "meU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/chair/office/dark{ @@ -98324,6 +98347,12 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) +"pNE" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "pOq" = ( /obj/structure/cable{ d1 = 1; @@ -98511,6 +98540,13 @@ }, /turf/simulated/floor/plating, /area/security/permabrig) +"qmG" = ( +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "qmW" = ( /obj/structure/chair{ dir = 4 @@ -98797,6 +98833,10 @@ icon_state = "neutralfull" }, /area/crew_quarters/sleep) +"rkN" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/port) "rmq" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -98841,6 +98881,10 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) +"rBh" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/space) "rBP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98955,6 +98999,17 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prisonershuttle) +"rPs" = ( +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "rSe" = ( /obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel{ @@ -99157,6 +99212,10 @@ icon_state = "vault" }, /area/atmos) +"sqv" = ( +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plating, +/area/maintenance/port) "sso" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -99259,6 +99318,19 @@ icon_state = "neutralfull" }, /area/security/brig) +"sLt" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_inner"; + locked = 1; + name = "West Maintenance External Access"; + req_access_txt = "10;13" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "sMj" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -99342,6 +99414,10 @@ icon_state = "grimy" }, /area/security/detectives_office) +"sYW" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/port) "sZT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100144,6 +100220,18 @@ icon_state = "red" }, /area/security/brig) +"vxK" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "exterior access button"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "vzs" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -100398,6 +100486,10 @@ icon_state = "vault" }, /area/security/securearmoury) +"wny" = ( +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/plating, +/area/maintenance/port) "wpr" = ( /obj/structure/table, /obj/item/storage/box/evidence, @@ -100618,6 +100710,12 @@ icon_state = "whitepurple" }, /area/medical/research) +"xmg" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/space, +/area/maintenance/port) "xom" = ( /mob/living/simple_animal/bot/secbot/armsky{ auto_patrol = 1 @@ -100653,6 +100751,15 @@ icon_state = "white" }, /area/medical/research) +"xpH" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "xqH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -100727,6 +100834,14 @@ icon_state = "showroomfloor" }, /area/medical/surgery1) +"xHZ" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "xIo" = ( /obj/structure/bed, /obj/item/radio/intercom{ @@ -100791,6 +100906,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"xRT" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/port) "xUI" = ( /obj/structure/table/reinforced, /obj/item/storage/box/teargas, @@ -100834,6 +100955,17 @@ icon_state = "dark" }, /area/security/interrogation) +"xXD" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "ydp" = ( /obj/structure/cable{ d1 = 1; @@ -119051,6 +119183,13 @@ aaa aaa aaa aaa +dmq +dmq +dmq +dmq +cJK +cJK +cHA aaa aaa aaa @@ -119059,15 +119198,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acF +abj aaa aaa aaa @@ -119306,11 +119438,23 @@ aaa aaa aaa aaa +cRD +cRD +cRD +cWk +sYW +cHA +cXX +cXX +cHA aaa aaa aaa aaa aaa +aaa +aaa +abj acF aaa aaa @@ -119334,18 +119478,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -119562,6 +119694,18 @@ aaa aaa aaa aaa +vXX +cTg +cTi +cUP +rPs +sYW +xmg +drn +drn +cHA +abj +aaa aaa aaa aaa @@ -119591,18 +119735,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -119820,25 +119952,25 @@ aaa aaa aaa aaa +cRD +cRD +cRD +cWk +sYW +cHA +xpH +cXU +cHA +eLy +rBh +rBh +cHA +cHA aaa aaa -aaa -aaa -aaa +abj acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa aaa aaa @@ -120079,23 +120211,23 @@ abj abj abj abj +cUQ +dmq +cHA +cHA +drn +jes +drn +iRL +dpX +cLA +dtU +cHA +cHA +aaa abj -aaa -aaa acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa aaa aaa @@ -120338,22 +120470,22 @@ cie cie cie bXU -aaa -acF +rkN +cPY +drn +dhG +drn +drn +drn +dhG +drn +cCy +cHA aaa abj -aaa -abj -abj -abj -aaa -abj -abj -abj -aaa -abj -abj -abj +vxK +bPS +vXX aaa aaa aaa @@ -120595,22 +120727,22 @@ bXU bXU bXU bXU -abj +xXD cPY +drn cHA cHA +cHA +cHA +cHA +drn +wny cJK +aaa cHA +meO cHA -cHA -cJK -cHA -cHA -cCx -cJK -cCx -cCx -abj +vXX aaa aaa aaa @@ -120852,21 +120984,21 @@ cie cie cie bXU -dmq -cGw +xHZ +drn +dhG cHA -cjV cJP cLC +qmG +cHA +drn +dsr +cJK +aaa cHA -cQs -cRD -cTi -cTg -cUP -cWk cXR -cCx +cHA aaa aaa aaa @@ -121110,21 +121242,21 @@ abj cbb bXU dmq -cFN -cHA -cJL -cWl -cYb -cHA -cQv drn -drn -cTg -cUQ +cXU +cHA cWl -cYb -cCx -abj +klv +pNE +cHA +sqv +xRT +cHA +aaa +cHA +sLt +cHA +vXX aaa aaa aaa @@ -121367,19 +121499,19 @@ cda cbb cDx bXU -cIu +drn +dhG cHA cHA -cjX -cLz +hHS cHA cHA -cjX +dtU +drn +cJK cHA cHA -cHA -cjX -cHA +auV cHA abj aaa @@ -121624,8 +121756,8 @@ cCg cbb cDx bXU -cFP -cHe +dhG +drn cIv dhG cLA @@ -121637,7 +121769,7 @@ cLA drn cWm cXT -cHA +hQw abj aaa aaa @@ -142326,10 +142458,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +acC +acC +acC adb adb adb @@ -142583,13 +142715,13 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aey acC -afc +adg +aeg +aeg +acC +cQs +cQv adZ adZ agm @@ -142840,14 +142972,14 @@ aaa aaa aaa aaa -adh +acC adz -adP aeg -aez -aeK +aeg +cJL afh aea +aea afM ajZ ahg @@ -143097,14 +143229,14 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aeA +acC +adh +adh +adh acC afj aeb +aeb afN agn agH @@ -143354,10 +143486,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +aeK +cFP +aeK adb adb adb @@ -143611,10 +143743,10 @@ aaa aaa aaa aaa -aaa -aaa -abj -abj +adb +cFN +cGw +cFN adb aeL afd @@ -143868,10 +144000,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -abj +adN +cFN +cHe +cFN adb aeM afe @@ -144126,9 +144258,9 @@ aaa aaa aaa aaa -aaa -aaa -abj +cFN +cIu +cFN adb aeN aff @@ -144384,8 +144516,8 @@ aaa aaa aaa aaa -abi -abj +vXX +aaa aeB aeB afg From bfaaf7996cad8266fcf400717f43eed2da2f1383 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Sat, 25 Sep 2021 11:25:20 -0700 Subject: [PATCH 6/9] Adds Rubber Ducky and Friends --- _maps/map_files/Delta/delta.dmm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index b883a9e7db0..eec488025c3 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -96847,6 +96847,14 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"kEm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/glass/bucket, +/obj/item/bikehorn/rubberducky, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/port) "kGF" = ( /obj/structure/table/reinforced, /obj/item/folder/red, @@ -100487,7 +100495,8 @@ }, /area/security/securearmoury) "wny" = ( -/obj/structure/closet/wardrobe/grey, +/obj/structure/mopbucket, +/obj/item/mop, /turf/simulated/floor/plating, /area/maintenance/port) "wpr" = ( @@ -120993,7 +121002,7 @@ cLC qmG cHA drn -dsr +kEm cJK aaa cHA From 2420f5b4136cf4006a2c0561229097d00700660c Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Sat, 25 Sep 2021 20:45:28 -0700 Subject: [PATCH 7/9] Lover, Not a Fighter --- _maps/map_files/Delta/delta.dmm | 736 +++++++++++++++++++------------- 1 file changed, 434 insertions(+), 302 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index a6462ea8f84..a1be30f3aa9 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -211,12 +211,13 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "adg" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) -"adh" = ( -/obj/effect/spawner/window/shuttle, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/shuttle/pod_2) +/area/hallway/secondary/entry) +"adh" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -257,18 +258,11 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "adz" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "adK" = ( /obj/machinery/light/small{ dir = 4 @@ -300,20 +294,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"adP" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) -"adQ" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) "adT" = ( /obj/docking_port/stationary{ dir = 2; @@ -378,16 +358,8 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aeg" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "aey" = ( /obj/machinery/light/small{ dir = 8 @@ -428,10 +400,11 @@ }, /area/hallway/secondary/entry) "aeK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "aeL" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -39911,6 +39884,10 @@ icon_state = "yellow" }, /area/engine/break_room) +"bKo" = ( +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/plating, +/area/maintenance/port) "bKp" = ( /obj/structure/cable{ d1 = 4; @@ -62147,26 +62124,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "sw_maint_airlock"; - pixel_y = 25; - tag_airpump = "sw_maint_pump"; - tag_chamber_sensor = "sw_maint_sensor"; - tag_exterior_door = "sw_maint_outer"; - tag_interior_door = "sw_maint_inner" - }, -/obj/machinery/airlock_sensor{ - id_tag = "sw_maint_sensor"; - pixel_y = 33 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1379; - id_tag = "sw_maint_pump" - }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -62175,19 +62134,17 @@ }, /area/maintenance/port) "cFP" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "interior access button"; - pixel_x = -24; - pixel_y = 24 +/obj/docking_port/mobile/pod{ + dir = 4; + id = "pod4"; + name = "escape pod 4" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" }, -/turf/simulated/floor/plating, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cFR" = ( /obj/structure/grille{ density = 0; @@ -62688,14 +62645,14 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_outer"; - locked = 1; - name = "West Maintenance External Access" +/obj/item/radio/intercom{ + pixel_y = 25 }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -63097,15 +63054,16 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/area/maintenance/port) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -63606,18 +63564,9 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIu" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_inner"; - locked = 1; - name = "West Maintenance External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, -/area/maintenance/port) +/area/shuttle/pod_4) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -64092,10 +64041,10 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -64115,6 +64064,7 @@ /area/maintenance/port) "cJP" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cJR" = ( @@ -64846,8 +64796,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/wrench, /obj/item/crowbar/red, -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/maintenance/port) "cLD" = ( @@ -66805,16 +66754,10 @@ /turf/space, /area/space/nearstation) "cPY" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "exterior access button"; - pixel_x = 24; - pixel_y = 24 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" }, -/obj/structure/lattice/catwalk, -/turf/space, /area/space/nearstation) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -66992,13 +66935,9 @@ /turf/simulated/floor/plating, /area/crew_quarters/fitness) "cQs" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 1 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/hallway/secondary/entry) "cQu" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -67007,10 +66946,12 @@ }, /area/maintenance/port) "cQv" = ( -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/northeast, +/obj/structure/sign/pods{ + pixel_x = -32 + }, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/hallway/secondary/entry) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -67572,10 +67513,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cRD" = ( -/obj/structure/rack, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "cRE" = ( /obj/machinery/light/small{ dir = 8 @@ -68284,9 +68223,9 @@ }, /area/crew_quarters/fitness) "cTg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/turf/simulated/wall/rust, -/area/maintenance/port) +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_2) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -68295,10 +68234,18 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cTi" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -69211,13 +69158,18 @@ }, /area/crew_quarters/fitness) "cUP" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/turf/simulated/floor/plating, -/area/maintenance/port) +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 28 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cUQ" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/plating, +/obj/structure/lattice, +/turf/simulated/wall/r_wall, /area/maintenance/port) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -69782,18 +69734,21 @@ }, /area/medical/medbay3) "cWk" = ( -/obj/structure/table, -/obj/item/bikehorn/rubberducky, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/maintenance/port) +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "cWl" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/shieldgen, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cWn" = ( @@ -70537,9 +70492,25 @@ }, /area/crew_quarters/fitness) "cXR" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "sw_maint_airlock"; + pixel_y = 25; + tag_airpump = "sw_maint_pump"; + tag_chamber_sensor = "sw_maint_sensor"; + tag_exterior_door = "sw_maint_outer"; + tag_interior_door = "sw_maint_inner" + }, +/obj/machinery/airlock_sensor{ + id_tag = "sw_maint_sensor"; + pixel_y = 33 + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + id_tag = "sw_maint_pump" + }, +/turf/simulated/floor/plasteel, /area/maintenance/port) "cXS" = ( /obj/structure/cable{ @@ -70557,6 +70528,9 @@ /area/maintenance/port) "cXT" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cXU" = ( @@ -95286,6 +95260,13 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"fjL" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "fou" = ( /obj/structure/cable{ d1 = 1; @@ -95447,6 +95428,10 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/starboardsolar) +"fGU" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/space) "fHe" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -95477,6 +95462,14 @@ icon_state = "grimy" }, /area/security/detectives_office) +"fJP" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "fMg" = ( /obj/structure/chair/office/light{ dir = 4 @@ -95602,6 +95595,15 @@ icon_state = "red" }, /area/security/processing) +"gnM" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_outer"; + locked = 1; + name = "West Maintenance External Access" + }, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "goP" = ( /turf/simulated/wall, /area/security/processing) @@ -96272,6 +96274,19 @@ /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plating, /area/security/permabrig) +"isr" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_inner"; + locked = 1; + name = "West Maintenance External Access"; + req_access_txt = "10;13" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "isz" = ( /obj/structure/cable{ d1 = 1; @@ -96725,6 +96740,9 @@ }, /turf/simulated/floor/plating, /area/toxins/misc_lab) +"jQJ" = ( +/turf/simulated/wall, +/area/space) "jQY" = ( /turf/simulated/wall/r_wall, /area/security/seceqstorage) @@ -96791,6 +96809,10 @@ icon_state = "white" }, /area/medical/medbay) +"kcZ" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/port) "khY" = ( /obj/structure/cable{ d1 = 1; @@ -97067,6 +97089,12 @@ icon_state = "white" }, /area/medical/medbay) +"lfc" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/port) "ljZ" = ( /obj/machinery/door/poddoor{ density = 0; @@ -97658,6 +97686,18 @@ icon_state = "neutralfull" }, /area/engine/engineering) +"mOo" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "exterior access button"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "mOF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98433,6 +98473,11 @@ icon_state = "red" }, /area/security/seceqstorage) +"piT" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "pjY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -98714,6 +98759,17 @@ icon_state = "whiteblue" }, /area/medical/surgery1) +"qhf" = ( +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "qli" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -98775,6 +98831,11 @@ icon_state = "neutral" }, /area/maintenance/apmaint) +"qyc" = ( +/obj/effect/spawner/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "qzr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98790,6 +98851,12 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/south) +"qDF" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "qHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; @@ -99338,6 +99405,20 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) +"shv" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "interior access button"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "shS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -99502,6 +99583,13 @@ icon_state = "neutralfull" }, /area/security/brig) +"sIb" = ( +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "sMj" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -99552,6 +99640,10 @@ icon_state = "dark" }, /area/security/evidence) +"sWO" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "sYo" = ( /obj/machinery/camera{ c_tag = "Brig Cell 4" @@ -99689,6 +99781,12 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"tqi" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/space, +/area/maintenance/port) "tsN" = ( /obj/structure/closet/secure_closet/scientist, /turf/simulated/floor/plasteel{ @@ -99715,6 +99813,17 @@ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) +"twh" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "txW" = ( /obj/structure/cable{ d1 = 4; @@ -100107,6 +100216,10 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/security/permasolitary) +"uDU" = ( +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plating, +/area/maintenance/port) "uFa" = ( /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, @@ -100137,6 +100250,15 @@ icon_state = "white" }, /area/security/medbay) +"uPh" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "uQK" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -100336,6 +100458,12 @@ /obj/item/clothing/under/color/orange/prison, /turf/simulated/floor/plating, /area/maintenance/starboard) +"vqy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/maintenance/port) "vrp" = ( /obj/structure/chair/office/light{ dir = 8 @@ -100778,6 +100906,10 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) +"wUA" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/port) "wVr" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -119350,6 +119482,13 @@ aaa aaa aaa aaa +dmq +dmq +dmq +dmq +cJK +cJK +cHA aaa aaa aaa @@ -119358,15 +119497,8 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acF +abj aaa aaa aaa @@ -119605,11 +119737,23 @@ aaa aaa aaa aaa +cRD +cRD +cRD +cWk +wUA +cHA +cXX +cXX +cHA aaa aaa aaa aaa aaa +aaa +aaa +abj acF aaa aaa @@ -119633,18 +119777,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -119861,6 +119993,18 @@ aaa aaa aaa aaa +vXX +cTg +cTi +cUP +qhf +wUA +tqi +drn +drn +cHA +abj +aaa aaa aaa aaa @@ -119890,18 +120034,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -120119,25 +120251,25 @@ aaa aaa aaa aaa +cRD +cRD +cRD +cWk +wUA +cHA +uPh +cXU +cHA +jQJ +fGU +fGU +cHA +cHA aaa aaa -aaa -aaa -aaa +abj acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa aaa aaa @@ -120378,23 +120510,23 @@ abj abj abj abj +cUQ +dmq +cHA +cHA +drn +vqy +drn +fjL +dpX +cLA +dtU +cHA +cHA +aaa abj -aaa -aaa acF -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa aaa aaa @@ -120637,22 +120769,22 @@ cie cie cie bXU -aaa -acF +kcZ +cPY +drn +dhG +drn +drn +drn +dhG +drn +cCy +cHA aaa abj -aaa -abj -abj -abj -aaa -abj -abj -abj -aaa -abj -abj -abj +mOo +bPS +vXX aaa aaa aaa @@ -120894,22 +121026,22 @@ bXU bXU bXU bXU -abj +twh cPY +drn cHA cHA +cHA +cHA +cHA +drn +bKo cJK +aaa cHA +gnM cHA -cHA -cJK -cHA -cHA -cCx -cJK -cCx -cCx -abj +vXX aaa aaa aaa @@ -121151,21 +121283,21 @@ cie cie cie bXU -dmq -cGw +fJP +drn +dhG cHA -cjV cJP cLC +sIb +cHA +drn +dsr +cJK +aaa cHA -cQs -cRD -cTi -cTg -cUP -cWk cXR -cCx +cHA aaa aaa aaa @@ -121409,21 +121541,21 @@ abj cbb bXU dmq -cFN -cHA -cJL -cWl -cYb -cHA -cQv drn -drn -cTg -cUQ +cXU +cHA cWl -cYb -cCx -abj +sWO +qDF +cHA +uDU +lfc +cHA +aaa +cHA +isr +cHA +vXX aaa aaa aaa @@ -121666,19 +121798,19 @@ cda cbb cDx bXU -cIu +drn +dhG cHA cHA -cjX -cLz +piT cHA cHA -cjX +dtU +drn +cJK cHA cHA -cHA -cjX -cHA +shv cHA abj aaa @@ -121923,8 +122055,8 @@ cCg cbb cDx bXU -cFP -cHe +dhG +drn cIv dhG cLA @@ -121936,7 +122068,7 @@ cLA drn cWm cXT -cHA +qyc abj aaa aaa @@ -142625,10 +142757,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +acC +acC +acC adb adb adb @@ -142882,13 +143014,13 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aey acC -afc +adg +aeg +aeg +acC +cQs +cQv adZ adZ agm @@ -143139,14 +143271,14 @@ aaa aaa aaa aaa -adh +acC adz -adP aeg -aez -aeK +aeg +cJL afh aea +aea afM ajZ ahg @@ -143396,14 +143528,14 @@ aaa aaa aaa aaa -adg -adg -adg -adQ -aeA +acC +adh +adh +adh acC afj aeb +aeb afN agn agH @@ -143653,10 +143785,10 @@ aaa aaa aaa aaa -aaa -aaa -adN adb +aeK +cFP +aeK adb adb adb @@ -143910,10 +144042,10 @@ aaa aaa aaa aaa -aaa -aaa -abj -abj +adb +cFN +cGw +cFN adb aeL afd @@ -144167,10 +144299,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -abj +adN +cFN +cHe +cFN adb aeM afe @@ -144425,9 +144557,9 @@ aaa aaa aaa aaa -aaa -aaa -abj +cFN +cIu +cFN adb aeN aff @@ -144683,8 +144815,8 @@ aaa aaa aaa aaa -abi -abj +vXX +aaa aeB aeB afg From 41259684323e00c3c02095058bf64489135a76eb Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Sat, 25 Sep 2021 20:47:22 -0700 Subject: [PATCH 8/9] But I forgot about the Return of the King Re-adds ducky, since I forgot to add that to my original file --- _maps/map_files/Delta/delta.dmm | 429 ++++++++++++++++---------------- 1 file changed, 219 insertions(+), 210 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index a1be30f3aa9..2f663569e8a 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -33334,6 +33334,9 @@ }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) +"bya" = ( +/turf/simulated/wall, +/area/space) "byb" = ( /obj/structure/cable{ d1 = 4; @@ -39884,10 +39887,6 @@ icon_state = "yellow" }, /area/engine/break_room) -"bKo" = ( -/obj/structure/closet/wardrobe/grey, -/turf/simulated/floor/plating, -/area/maintenance/port) "bKp" = ( /obj/structure/cable{ d1 = 4; @@ -68234,18 +68233,13 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cTi" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/glass/bucket, +/obj/item/bikehorn/rubberducky, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) +/area/maintenance/port) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -69158,6 +69152,19 @@ }, /area/crew_quarters/fitness) "cUP" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) +"cUQ" = ( /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -69167,10 +69174,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"cUQ" = ( -/obj/structure/lattice, -/turf/simulated/wall/r_wall, -/area/maintenance/port) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, @@ -69734,9 +69737,9 @@ }, /area/medical/medbay3) "cWk" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) +/obj/structure/lattice, +/turf/simulated/wall/r_wall, +/area/maintenance/port) "cWl" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/shieldgen, @@ -94864,6 +94867,12 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"elb" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/space, +/area/maintenance/port) "emr" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -95260,13 +95269,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/security/securearmoury) -"fjL" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "fou" = ( /obj/structure/cable{ d1 = 1; @@ -95335,6 +95337,19 @@ }, /turf/simulated/floor/plasteel, /area/security/seceqstorage) +"fxr" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_inner"; + locked = 1; + name = "West Maintenance External Access"; + req_access_txt = "10;13" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "fzQ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -95428,10 +95443,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/starboardsolar) -"fGU" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/space) "fHe" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -95462,14 +95473,6 @@ icon_state = "grimy" }, /area/security/detectives_office) -"fJP" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "fMg" = ( /obj/structure/chair/office/light{ dir = 4 @@ -95595,15 +95598,6 @@ icon_state = "red" }, /area/security/processing) -"gnM" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_outer"; - locked = 1; - name = "West Maintenance External Access" - }, -/turf/simulated/floor/plasteel, -/area/maintenance/port) "goP" = ( /turf/simulated/wall, /area/security/processing) @@ -96274,19 +96268,6 @@ /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plating, /area/security/permabrig) -"isr" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "sw_maint_inner"; - locked = 1; - name = "West Maintenance External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "isz" = ( /obj/structure/cable{ d1 = 1; @@ -96437,6 +96418,17 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/maintenance/starboard) +"iPQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "iTV" = ( /obj/structure/cable{ d1 = 4; @@ -96740,9 +96732,6 @@ }, /turf/simulated/floor/plating, /area/toxins/misc_lab) -"jQJ" = ( -/turf/simulated/wall, -/area/space) "jQY" = ( /turf/simulated/wall/r_wall, /area/security/seceqstorage) @@ -96809,9 +96798,14 @@ icon_state = "white" }, /area/medical/medbay) -"kcZ" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, +"kdR" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "sw_maint_outer"; + locked = 1; + name = "West Maintenance External Access" + }, +/turf/simulated/floor/plasteel, /area/maintenance/port) "khY" = ( /obj/structure/cable{ @@ -96949,6 +96943,11 @@ icon_state = "vault" }, /area/security/prisonershuttle) +"kyU" = ( +/obj/effect/spawner/window/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "kCi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -97089,12 +97088,6 @@ icon_state = "white" }, /area/medical/medbay) -"lfc" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/port) "ljZ" = ( /obj/machinery/door/poddoor{ density = 0; @@ -97183,6 +97176,12 @@ icon_state = "grimy" }, /area/security/detectives_office) +"lxh" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "lzY" = ( /obj/structure/table/wood, /obj/machinery/alarm{ @@ -97331,6 +97330,11 @@ icon_state = "redcorner" }, /area/security/permasolitary) +"maf" = ( +/obj/structure/mopbucket, +/obj/item/mop, +/turf/simulated/floor/plating, +/area/maintenance/port) "meB" = ( /obj/structure/cable{ d1 = 1; @@ -97686,18 +97690,6 @@ icon_state = "neutralfull" }, /area/engine/engineering) -"mOo" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "exterior access button"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "mOF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98426,6 +98418,10 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"pfE" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/space) "pgF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -98473,11 +98469,6 @@ icon_state = "red" }, /area/security/seceqstorage) -"piT" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "pjY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -98520,6 +98511,13 @@ icon_state = "redfull" }, /area/security/seceqstorage) +"pAC" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "pBz" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/suit/browntrenchcoat, @@ -98704,6 +98702,11 @@ }, /turf/simulated/floor/plating, /area/security/permabrig) +"pWT" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "pXX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera{ @@ -98759,17 +98762,6 @@ icon_state = "whiteblue" }, /area/medical/surgery1) -"qhf" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) "qli" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -98831,11 +98823,6 @@ icon_state = "neutral" }, /area/maintenance/apmaint) -"qyc" = ( -/obj/effect/spawner/window/reinforced, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "qzr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98851,12 +98838,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/south) -"qDF" = ( -/obj/effect/decal/warning_stripes/southeast, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/rack, -/turf/simulated/floor/plating, -/area/maintenance/port) "qHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; @@ -99082,6 +99063,14 @@ }, /turf/space, /area/space) +"rkv" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "rkB" = ( /obj/structure/cable{ d1 = 2; @@ -99104,6 +99093,13 @@ icon_state = "neutralfull" }, /area/crew_quarters/sleep) +"rkV" = ( +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/rack, +/turf/simulated/floor/plating, +/area/maintenance/port) "rmq" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -99389,6 +99385,18 @@ }, /turf/simulated/floor/engine, /area/engine/supermatter) +"seE" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "exterior access button"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "shi" = ( /obj/structure/cable{ d2 = 2; @@ -99405,20 +99413,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) -"shv" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sw_maint_airlock"; - name = "interior access button"; - pixel_x = -24; - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "shS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -99444,6 +99438,12 @@ icon_state = "whitepurple" }, /area/medical/research) +"slE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plating, +/area/maintenance/port) "soN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -99583,13 +99583,6 @@ icon_state = "neutralfull" }, /area/security/brig) -"sIb" = ( -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/southwest, -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/rack, -/turf/simulated/floor/plating, -/area/maintenance/port) "sMj" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -99607,6 +99600,15 @@ icon_state = "freezerfloor" }, /area/crew_quarters/sleep) +"sPz" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "sPS" = ( /obj/structure/cable, /obj/machinery/alarm{ @@ -99621,6 +99623,24 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) +"sQr" = ( +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plating, +/area/maintenance/port) +"sQZ" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sw_maint_airlock"; + name = "interior access button"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "sTz" = ( /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -99640,10 +99660,6 @@ icon_state = "dark" }, /area/security/evidence) -"sWO" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/maintenance/port) "sYo" = ( /obj/machinery/camera{ c_tag = "Brig Cell 4" @@ -99677,6 +99693,12 @@ icon_state = "grimy" }, /area/security/detectives_office) +"sZp" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/port) "sZT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99781,12 +99803,6 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) -"tqi" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Pod" - }, -/turf/space, -/area/maintenance/port) "tsN" = ( /obj/structure/closet/secure_closet/scientist, /turf/simulated/floor/plasteel{ @@ -99813,17 +99829,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) -"twh" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "txW" = ( /obj/structure/cable{ d1 = 4; @@ -100151,6 +100156,10 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) +"unt" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/maintenance/port) "uod" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -100216,10 +100225,6 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/security/permasolitary) -"uDU" = ( -/mob/living/simple_animal/mouse, -/turf/simulated/floor/plating, -/area/maintenance/port) "uFa" = ( /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, @@ -100250,15 +100255,6 @@ icon_state = "white" }, /area/security/medbay) -"uPh" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/vacuum{ - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "uQK" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -100458,12 +100454,6 @@ /obj/item/clothing/under/color/orange/prison, /turf/simulated/floor/plating, /area/maintenance/starboard) -"vqy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/remains/robot, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/plating, -/area/maintenance/port) "vrp" = ( /obj/structure/chair/office/light{ dir = 8 @@ -100665,6 +100655,10 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"vKt" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "vKB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100719,6 +100713,17 @@ icon_state = "red" }, /area/hallway/secondary/exit) +"vUu" = ( +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "vVf" = ( /obj/machinery/chem_dispenser, /obj/item/reagent_containers/glass/beaker/large, @@ -100906,10 +100911,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) -"wUA" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/port) "wVr" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -101069,6 +101070,10 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"xtS" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/port) "xuC" = ( /obj/structure/cable{ d1 = 1; @@ -101125,6 +101130,10 @@ }, /turf/simulated/floor/grass, /area/medical/research) +"xCC" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/port) "xDn" = ( /obj/structure/sign/electricshock{ pixel_y = 32 @@ -119740,8 +119749,8 @@ aaa cRD cRD cRD -cWk -wUA +vKt +xCC cHA cXX cXX @@ -119995,11 +120004,11 @@ aaa aaa vXX cTg -cTi cUP -qhf -wUA -tqi +cUQ +vUu +xCC +elb drn drn cHA @@ -120254,15 +120263,15 @@ aaa cRD cRD cRD -cWk -wUA +vKt +xCC cHA -uPh +sPz cXU cHA -jQJ -fGU -fGU +bya +pfE +pfE cHA cHA aaa @@ -120510,14 +120519,14 @@ abj abj abj abj -cUQ +cWk dmq cHA cHA drn -vqy +slE drn -fjL +pAC dpX cLA dtU @@ -120769,7 +120778,7 @@ cie cie cie bXU -kcZ +xtS cPY drn dhG @@ -120782,7 +120791,7 @@ cCy cHA aaa abj -mOo +seE bPS vXX aaa @@ -121026,7 +121035,7 @@ bXU bXU bXU bXU -twh +iPQ cPY drn cHA @@ -121035,11 +121044,11 @@ cHA cHA cHA drn -bKo +maf cJK aaa cHA -gnM +kdR cHA vXX aaa @@ -121283,16 +121292,16 @@ cie cie cie bXU -fJP +rkv drn dhG cHA cJP cLC -sIb +rkV cHA drn -dsr +cTi cJK aaa cHA @@ -121545,15 +121554,15 @@ drn cXU cHA cWl -sWO -qDF +unt +lxh cHA -uDU -lfc +sQr +sZp cHA aaa cHA -isr +fxr cHA vXX aaa @@ -121802,7 +121811,7 @@ drn dhG cHA cHA -piT +pWT cHA cHA dtU @@ -121810,7 +121819,7 @@ drn cJK cHA cHA -shv +sQZ cHA abj aaa @@ -122068,7 +122077,7 @@ cLA drn cWm cXT -qyc +kyU abj aaa aaa From e15dc45cda587db34c14795860be780aa2d5e198 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Sun, 26 Sep 2021 10:41:10 -0700 Subject: [PATCH 9/9] Area Schmarea --- _maps/map_files/Delta/delta.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 2f663569e8a..8e1481707a9 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -120002,7 +120002,7 @@ aaa aaa aaa aaa -vXX +aaa cTg cUP cUQ @@ -144824,7 +144824,7 @@ aaa aaa aaa aaa -vXX +aaa aaa aeB aeB