From 2914e4086f7d8b47d13fa49e37ac99482ef05d85 Mon Sep 17 00:00:00 2001 From: Rykka Date: Thu, 17 Oct 2019 23:45:52 -0600 Subject: [PATCH 1/4] Gives Noodle his own pen next to Chaplain's Office! <3 With windows so you dorks can peek. <3 --- maps/tether/tether-02-surface2.dmm | 249 ++++++++++++++++------------- 1 file changed, 139 insertions(+), 110 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index f4b1b97d653..8715edb85c7 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -3706,24 +3706,22 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "ahV" = ( -/obj/effect/floor_decal/corner_techfloor_grid, /obj/machinery/alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/random/mob/mouse, +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "ahW" = ( -/obj/structure/ladder{ - layer = 3.3; - pixel_y = 16 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "ahX" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/simple_mob/animal/passive/mouse/white, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "ahY" = ( /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" @@ -3813,12 +3811,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aih" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/turf/simulated/floor/lino, +/area/chapel/office) "aii" = ( /turf/simulated/wall, /area/maintenance/lower/rnd) @@ -3963,13 +3957,28 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "aiu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/lino, +/area/chapel/office) "aiv" = ( -/obj/structure/closet, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/machinery/disposal, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "chapel_obs"; + layer = 3.3; + name = "Chapel Observation Shutters"; + pixel_x = 29; + pixel_y = 0; + req_access = list(27) + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/chapel/office) "aiw" = ( /obj/machinery/computer/aifixer, /obj/effect/floor_decal/borderfloor{ @@ -4076,13 +4085,13 @@ /turf/simulated/wall, /area/tether/surfacebase/atrium_two) "aiG" = ( -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/machinery/door/airlock{ + name = "Chapel Office"; + req_access = list(27) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/lino, +/area/chapel/office) "aiH" = ( /obj/structure/railing{ dir = 8 @@ -4136,15 +4145,16 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aiL" = ( -/obj/machinery/door/airlock/maintenance/common, +/obj/structure/grille, +/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/bar) +/turf/simulated/floor/tiled/dark, +/area/chapel/office) "aiM" = ( -/obj/effect/floor_decal/corner_techfloor_grid, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/flora/tree/palm, +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "aiN" = ( /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; @@ -4599,9 +4609,11 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) "ajJ" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, -/turf/simulated/floor/lino, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/grass/forest, /area/chapel/office) "ajK" = ( /obj/effect/floor_decal/borderfloor{ @@ -6333,6 +6345,33 @@ /obj/item/weapon/flame/candle/candelabra, /turf/simulated/floor/lino, /area/chapel/office) +"amN" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/snakesnackbox, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"amO" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"amP" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"amQ" = ( +/obj/random/mob/mouse, +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"amR" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"amS" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "amT" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -6433,6 +6472,23 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) +"ane" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/mob/living/simple_mob/animal/passive/snake/noodle, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"anf" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) +"ang" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "ank" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) @@ -7633,10 +7689,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) -"apQ" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/lino, -/area/chapel/office) "aqa" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -27092,13 +27144,6 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"aYf" = ( -/obj/machinery/door/airlock{ - name = "Chapel Morgue"; - req_one_access = list(6,27) - }, -/turf/simulated/floor/tiled/dark, -/area/chapel/chapel_morgue) "aYi" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -27234,18 +27279,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"aYC" = ( -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "chapel_obs"; - layer = 3.3; - name = "Chapel Observation Shutters"; - pixel_x = 29; - pixel_y = 0; - req_access = list(27) - }, -/turf/simulated/floor/lino, -/area/chapel/office) "aYD" = ( /obj/structure/morgue, /turf/simulated/floor/tiled/dark, @@ -27863,10 +27896,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) -"aZO" = ( -/obj/machinery/space_heater, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) "aZP" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -44117,7 +44146,7 @@ ahU aiJ air aiK -ahP +aio aoE aYm aYz @@ -44254,12 +44283,12 @@ aee aee aee adL -adu -adu -adu -adu +aoE +aiL +aoE +aiL +aiL aiL -adu aoE aYs aYB @@ -44396,15 +44425,15 @@ aef aef aef ahl -adu -ahV -ahP -aio -ahP -aZO aoE +ahV +ahW ajJ -apQ +amS +ahW +aiG +aih +aiu ajX aZc baG @@ -44538,15 +44567,15 @@ adu adu adu adu -adu -ahW -ahP -aiu -aiM -aZO aoE +ahW +ahX +amO +ane +ahW +aiL amM -aYC +aiv aYK amL aZm @@ -44680,12 +44709,12 @@ aac aac aac aac -adu -ahX -aih -ahP -ahP -ahP +aoE +ahW +aiM +amP +ahW +aiM aoE aoE aoE @@ -44822,12 +44851,12 @@ aac aac aac aac -adu -adu -adu -aiv -ahP -ahP +aoE +aoE +aoE +amQ +amR +ang ajT aYo aYD @@ -44966,11 +44995,11 @@ aab aac aac aac -adu -aiG -ahP -ahP -aYf +aoE +amR +anf +amN +ajT aYp aYp aYM @@ -45108,10 +45137,10 @@ aab aab aab aac -acD -acD -acD -acD +aoE +aoE +aoE +aoE ajT aYq aYE From 8567d9714a1af3c2e3292988acd4f970550660a6 Mon Sep 17 00:00:00 2001 From: Rykka Date: Fri, 18 Oct 2019 00:13:42 -0600 Subject: [PATCH 2/4] Remove Ladder on Surface 1 connecting to old ladder. --- maps/tether/tether-01-surface1.dmm | 71 ++++++++++-------------------- 1 file changed, 23 insertions(+), 48 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 961b7affc2a..df1d68573dd 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -9435,15 +9435,6 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/vacant_site) -"aqj" = ( -/obj/structure/catwalk, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) "aqk" = ( /obj/structure/catwalk, /obj/machinery/alarm{ @@ -9867,12 +9858,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) -"aqS" = ( -/obj/structure/ladder/up, -/obj/structure/catwalk, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) "aqT" = ( /turf/simulated/wall/r_wall, /area/storage/surface_eva/external) @@ -10046,16 +10031,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) -"arm" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) "arn" = ( /obj/structure/table/glass, /obj/item/weapon/storage/toolbox/emergency, @@ -47391,7 +47366,7 @@ aah aah aah apF -aql +aqk arl apF aah @@ -47531,10 +47506,10 @@ aah aah aah aah +aah +apF apF apF -aql -arm apF aah aah @@ -47673,11 +47648,11 @@ aah aah aah aah -apF -aqj -aql -aql -apF +aah +aah +aah +aah +aah aah aah aah @@ -47815,11 +47790,11 @@ aah aah aah aah -apF -aqk -aqS -aql -apF +aah +aah +aah +aah +aah aah aah aah @@ -47957,11 +47932,11 @@ aah aah aah aah -apF -aql -aql -aql -apF +aah +aah +aah +aah +aah aah aah aah @@ -48099,11 +48074,11 @@ aah aah aah aah -apF -apF -apF -apF -apF +aah +aah +aah +aah +aah aah aah aah From 812bc9d03d79b55d7d56acdebeb992191da81c42 Mon Sep 17 00:00:00 2001 From: Rykka Date: Fri, 18 Oct 2019 09:23:14 -0600 Subject: [PATCH 3/4] Add ladder and Medical access back to Morgue as per Soft's Suggestion --- maps/tether/tether-01-surface1.dmm | 48 ++-- maps/tether/tether-02-surface2.dmm | 340 +++++++++++------------------ 2 files changed, 152 insertions(+), 236 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index df1d68573dd..d13a3938459 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -9435,6 +9435,12 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/vacant_site) +"aqj" = ( +/obj/structure/ladder/up, +/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "aqk" = ( /obj/structure/catwalk, /obj/machinery/alarm{ @@ -47506,9 +47512,9 @@ aah aah aah aah -aah apF apF +aql apF apF aah @@ -47648,11 +47654,11 @@ aah aah aah aah -aah -aah -aah -aah -aah +apF +aql +aql +aql +apF aah aah aah @@ -47790,11 +47796,11 @@ aah aah aah aah -aah -aah -aah -aah -aah +apF +aql +aqj +aql +apF aah aah aah @@ -47932,11 +47938,11 @@ aah aah aah aah -aah -aah -aah -aah -aah +apF +aql +aql +aql +apF aah aah aah @@ -48074,11 +48080,11 @@ aah aah aah aah -aah -aah -aah -aah -aah +apF +apF +apF +apF +apF aah aah aah diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 8715edb85c7..b15374178ca 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -3697,31 +3697,31 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "ahU" = ( -/obj/effect/floor_decal/techfloor{ - dir = 5 +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 }, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "ahV" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/random/mob/mouse, -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "ahW" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/forest, /area/chapel/office) "ahX" = ( -/obj/structure/flora/ausbushes/fullgrass, -/mob/living/simple_mob/animal/passive/mouse/white, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "ahY" = ( /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" @@ -3763,17 +3763,17 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) "aic" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/effect/floor_decal/techfloor{ - icon_state = "techfloororange_edges"; - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "aid" = ( /obj/effect/floor_decal/techfloor/corner, @@ -3795,21 +3795,14 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "aig" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/door/airlock{ + name = "Chapel Morgue"; + req_access = list(27); + req_one_access = list(27,6) }, -/obj/effect/floor_decal/rust, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/techfloor{ - icon_state = "techfloororange_edges"; - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/chapel/chapel_morgue) "aih" = ( /turf/simulated/floor/lino, /area/chapel/office) @@ -3858,7 +3851,11 @@ /area/maintenance/lower/bar) "aio" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "aip" = ( /obj/effect/floor_decal/techfloor/corner{ @@ -3902,14 +3899,12 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "air" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "ais" = ( /obj/structure/cable/green{ d1 = 16; @@ -3940,22 +3935,13 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "ait" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/alarm{ + pixel_y = 22 }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "aiu" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -4093,21 +4079,16 @@ /turf/simulated/floor/lino, /area/chapel/office) "aiH" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/rust, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - icon_state = "techfloororange_edges"; - dir = 8 +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "aiI" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -4124,26 +4105,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/bar) "aiJ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, +/obj/structure/ladder, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aiK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "aiL" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -4151,10 +4120,12 @@ /turf/simulated/floor/tiled/dark, /area/chapel/office) "aiM" = ( -/obj/structure/flora/tree/palm, -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aiN" = ( /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; @@ -4266,28 +4237,14 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/bar) "aiY" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) -"aiZ" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/techfloor{ - icon_state = "techfloororange_edges"; - dir = 8 - }, +/obj/structure/closet, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) +"aiZ" = ( +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/simple_mob/animal/passive/mouse/white, +/turf/simulated/floor/outdoors/grass/forest, +/area/chapel/office) "aja" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4481,7 +4438,6 @@ /turf/simulated/floor/plating, /area/chapel/main) "ajs" = ( -/obj/machinery/door/airlock/multi_tile/glass, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4491,14 +4447,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/dark, /area/chapel/main) "ajt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aju" = ( /turf/simulated/floor/tiled/dark, @@ -4593,13 +4547,6 @@ /obj/random/action_figure, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) -"ajH" = ( -/obj/effect/floor_decal/techfloor{ - icon_state = "techfloororange_edges"; - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) "ajI" = ( /obj/structure/cable/green{ d1 = 1; @@ -4608,13 +4555,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/atrium_two) -"ajJ" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) "ajK" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -6350,28 +6290,10 @@ /obj/item/weapon/storage/box/snakesnackbox, /turf/simulated/floor/outdoors/grass/forest, /area/chapel/office) -"amO" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) -"amP" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) -"amQ" = ( -/obj/random/mob/mouse, -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) "amR" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/forest, /area/chapel/office) -"amS" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) "amT" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -6477,18 +6399,6 @@ /mob/living/simple_mob/animal/passive/snake/noodle, /turf/simulated/floor/outdoors/grass/forest, /area/chapel/office) -"anf" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) -"ang" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/outdoors/grass/forest, -/area/chapel/office) "ank" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) @@ -43717,9 +43627,9 @@ alL ahj ahA ahS -ahS +aic aif -ait +aiH aiX ajs aYl @@ -43859,11 +43769,11 @@ amc ahk ahB ahT +ahU ahT ahT -aiY -ajt -aro +aio +aYd aro aro aro @@ -44000,11 +43910,11 @@ agI aee adL adu -aic -aig -aiH -aiZ -ajH +ahX +aoE +aiL +aiL +aoE aoE api api @@ -44142,11 +44052,11 @@ agJ aee adL adu -ahU -aiJ +ahP +aiL air aiK -aio +aiZ aoE aYm aYz @@ -44283,13 +44193,13 @@ aee aee aee adL +adu +ahV aoE -aiL -aoE -aiL -aiL -aiL -aoE +ait +ane +ahW +aiG aYs aYB aYI @@ -44425,13 +44335,13 @@ aef aef aef ahl -aoE -ahV +adu +ahX +aiL ahW -ajJ -amS -ahW -aiG +amR +amN +aiL aih aiu ajX @@ -44567,13 +44477,13 @@ adu adu adu adu +adu +aiJ aoE -ahW -ahX -amO -ane -ahW aiL +aiL +aiL +aoE amM aiv aYK @@ -44709,12 +44619,12 @@ aac aac aac aac -aoE -ahW -aiM -amP -ahW +adu +ahP aiM +ahP +ajt +ajt aoE aoE aoE @@ -44851,12 +44761,12 @@ aac aac aac aac -aoE -aoE -aoE -amQ -amR -ang +adu +adu +adu +ahP +ahP +ahP ajT aYo aYD @@ -44995,11 +44905,11 @@ aab aac aac aac -aoE -amR -anf -amN -ajT +adu +aiY +aiY +ahP +aig aYp aYp aYM @@ -45137,10 +45047,10 @@ aab aab aab aac -aoE -aoE -aoE -aoE +adu +adu +adu +adu ajT aYq aYE From a5869732a5679e5a189c528c1307e5d6a951c717 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 18 Oct 2019 11:56:26 -0400 Subject: [PATCH 4/4] Reverts Z1 --- maps/tether/tether-01-surface1.dmm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index d13a3938459..0f50b69daf5 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -31687,6 +31687,25 @@ /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/vacant_site) +"lry" = ( +/obj/structure/catwalk, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/random/drinkbottle, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) +"nlo" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "obY" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -47372,7 +47391,7 @@ aah aah aah apF -aqk +aql arl apF aah @@ -47515,7 +47534,7 @@ aah apF apF aql -apF +nlo apF aah aah @@ -47655,7 +47674,7 @@ aah aah aah apF -aql +lry aql aql apF @@ -47797,7 +47816,7 @@ aah aah aah apF -aql +aqk aqj aql apF