From c0b4b2b7d5cbc268bcc5382904e55ee7813464a7 Mon Sep 17 00:00:00 2001 From: ResidentCody Date: Tue, 27 Apr 2021 18:13:53 -0600 Subject: [PATCH 01/47] Update tether-03-surface3.dmm --- maps/tether/tether-03-surface3.dmm | 1117 +++++++++++++++------------- 1 file changed, 597 insertions(+), 520 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 40b1869e5c4..2637bfe9473 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5691,9 +5691,16 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "aiq" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/grass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "air" = ( /obj/effect/floor_decal/borderfloor{ @@ -5844,12 +5851,13 @@ /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aiF" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "aiG" = ( /obj/machinery/light, @@ -17900,42 +17908,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aCY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) "aCZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) -"aDa" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"aDa" = ( +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether/surfacebase/public_garden_three) "aDb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/structure/flora/tree/jungle_small, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDc" = ( /obj/structure/grille, @@ -17947,14 +17931,15 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/table/bench/wooden, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDe" = ( /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDf" = ( -/obj/structure/table/bench/wooden, +/obj/machinery/light/flamp/noshade{ + pixel_y = 5 + }, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDg" = ( @@ -17977,6 +17962,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 }, +/obj/machinery/camera/network/civilian{ + dir = 1; + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDj" = ( @@ -17996,6 +17985,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, +/obj/machinery/light{ + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDl" = ( @@ -18048,13 +18040,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aDq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, +/obj/structure/table/bench/wooden, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDr" = ( /obj/effect/floor_decal/borderfloor{ @@ -18099,21 +18086,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDw" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, +/obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDx" = ( @@ -18129,11 +18108,8 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 5 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/camera/network/tether, +/obj/machinery/seed_storage/garden, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDy" = ( @@ -18154,21 +18130,13 @@ /obj/effect/floor_decal/techfloor/hole/right{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_three) "aDz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/bed/chair/wood{ + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDA" = ( /obj/effect/floor_decal/borderfloor{ @@ -18248,13 +18216,12 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_three) "aDG" = ( @@ -18279,7 +18246,15 @@ }, /obj/structure/cable/green{ d1 = 32; - icon_state = "32-1" + d2 = 2; + icon_state = "32-2" + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 }, /turf/simulated/open, /area/tether/surfacebase/public_garden_three) @@ -18312,8 +18287,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDL" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/machinery/light, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDM" = ( @@ -18332,35 +18306,33 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDO" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25 +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) +"aDP" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 }, /obj/effect/floor_decal/corner/lime/border{ dir = 6 }, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"aDP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) "aDQ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) @@ -18374,18 +18346,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, +/obj/structure/bed/chair/wood, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDT" = ( /obj/machinery/light, -/obj/structure/table/bench/wooden, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDU" = ( @@ -27314,9 +27279,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aUC" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lime/bordercorner, -/turf/simulated/floor/tiled, +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aUD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27337,13 +27301,7 @@ /turf/simulated/floor/tiled/eris/dark/golden, /area/shuttle/tourbus/general) "aUF" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/seed_storage/garden{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aUG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -27400,13 +27358,10 @@ /area/tether/surfacebase/medical/chemistry) "aUM" = ( /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, -/obj/machinery/vending/hydronutrients{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) @@ -27430,6 +27385,12 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, +/obj/structure/cable/green, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_three) "aUP" = ( @@ -27790,19 +27751,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lime/bordercorner2{ - dir = 9 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/bench/wooden, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aVs" = ( /obj/structure/lattice, @@ -27869,11 +27819,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "aVx" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aVy" = ( /obj/structure/disposalpipe/segment{ @@ -37653,6 +37609,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"bSU" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "bTC" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills{ @@ -37825,6 +37787,15 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"cup" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) "cwI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -37937,6 +37908,10 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"cTD" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "cVg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -38116,6 +38091,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"don" = ( +/obj/structure/flora/tree/jungle, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "drR" = ( /obj/machinery/door/firedoor/glass/hidden{ dir = 2 @@ -38352,20 +38331,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "erS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lime/bordercorner2, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "exM" = ( @@ -38546,6 +38523,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"fiZ" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "fkn" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -38745,6 +38726,12 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"gyl" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "gym" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38845,6 +38832,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"gUj" = ( +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/outside/outside3) "gUL" = ( /obj/structure/bed/chair/bay/chair{ dir = 8 @@ -39201,6 +39194,12 @@ }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) +"ivV" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "ixw" = ( /obj/structure/table/standard, /obj/item/weapon/book/codex, @@ -39950,6 +39949,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"lbW" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "lcS" = ( /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -40012,6 +40015,12 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"lms" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "lpg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41201,6 +41210,18 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"pQu" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "pSu" = ( /obj/machinery/door/airlock/glass{ name = "Cafeteria" @@ -41423,6 +41444,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"qVo" = ( +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "qXD" = ( /obj/structure/bed/chair/comfy/black, /obj/machinery/button/windowtint{ @@ -41677,6 +41702,17 @@ }, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) +"saW" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = -10 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +"seT" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) "shx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -41925,6 +41961,10 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"sWC" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "sWR" = ( /obj/structure/bed/chair{ dir = 8 @@ -41932,10 +41972,7 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "sXa" = ( -/obj/machinery/holoposter{ - pixel_x = -30; - pixel_y = 30 - }, +/obj/structure/flora/bboulder2, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "sXR" = ( @@ -41987,6 +42024,10 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"tjW" = ( +/obj/structure/flora/rocks2, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "tki" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -42363,6 +42404,15 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/tether) +"uWn" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) "uWw" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -42760,6 +42810,16 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"wkN" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) "wlf" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -42831,6 +42891,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"wpe" = ( +/obj/structure/flora/rocks1, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "wrA" = ( /obj/structure/cable/green{ d1 = 1; @@ -42913,6 +42977,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"wLd" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 5; + pixel_y = -7 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "wPB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -43384,6 +43455,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) +"ykH" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) (1,1,1) = {" aaa @@ -46674,8 +46751,8 @@ aab aab aab aab -aab -aab +aMG +aMG aac aac aac @@ -46814,10 +46891,10 @@ aab aab aab aab -aab -aab -aab -aab +aMG +aNU +adG +adG aac aac aac @@ -46955,9 +47032,9 @@ aab aab aab aab -aab -aab -aab +aNU +adG +adG aac aac aac @@ -47096,9 +47173,8 @@ aab aab aab aab -aab -aab -aac +aNU +adG aac aac aac @@ -47113,6 +47189,7 @@ aac aac aac aac +gUj aac aac aac @@ -47237,25 +47314,25 @@ aab aab aab aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aNU +adG aac +aiq +cup +arW +cup +cup +cup +cup +cup +arW +cup +cup +cup +cup +cup +arW +wkN aac aac aac @@ -47378,27 +47455,27 @@ aab aab aab aab -aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aNU +adG aac +aiq +aDc +bSU +arW +aDe +aDe +aDe +aDe +bSU +arW +aDe +aDe +aDe +aDe +bSU +arW +aDc +wkN aac aac aac @@ -47519,29 +47596,29 @@ aab aab aab aab -aab -aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aNU +adG aac +aiq +aDc +aDe +lbW +gyl +aDe +cTD +cTD +cTD +aDe +gyl +aDe +cTD +cTD +cTD +aDe +gyl +lbW +aDc +wkN aac aac aac @@ -47660,31 +47737,31 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aOm +adG aac +aiq +aDc +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDe +cTD +cTD +cTD +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDc +wkN aac aac aac @@ -47802,31 +47879,31 @@ aab aab aab aab -aab -aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aOm +adG aac arW -aDq -aDq -aDq -aDq arW -aac -aac -aac +aUC +aDe +aDe +aDe +aDe +sWC +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDq +aDq +aDe +aDe +aDe +aDe +aDQ aac aac aac @@ -47944,28 +48021,30 @@ aab aab aab aab -aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aCZ -arW -aDa -aDa -aDa -aDL -arW +aiF +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDq +aDe +aDe +aDe +aDe +aDe +aDe +don +aDe +aDe +aDe +aDe aDQ aac aac @@ -48018,8 +48097,6 @@ aac aac aac aac -aac -aac aab aab aab @@ -48086,29 +48163,30 @@ aab aab aab aab -aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aac -aCZ -aDc -aiq -sXa -aDe -aDe -aDe aiF -aDc +aCZ +aUF +sXa +aVr +aDe +aDe +aDe +aDe +aDq +aDe +aDe +aDe +aDe +aDe +aDe +lbW +aDe +aDe +aDe +aDe aDQ aac aac @@ -48161,7 +48239,6 @@ aac aac aac aac -aac aab aab aab @@ -48228,30 +48305,30 @@ aab aab aab aab -aab -aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac +aOm +adG aac +aiF +aDd +aVr +seT +aVr +aDe +aDe +aDb +aDe +aDq +aDe aCZ -aDc -aDf +aDe aDe aDj aDr aDr aDA aDe -aDf -aDc +aDe +aDe aDQ aac aac @@ -48370,21 +48447,21 @@ aab aab aab aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -arW -arW -aDd +aiF +aDe +aVr +seT +aVr +qVo +aDe +wpe +qVo +aDe +aUC +aDe aDf aDj ajt @@ -48392,7 +48469,7 @@ aDu aDu aDR aDA -aDf +aDe aDT arW arW @@ -48512,21 +48589,21 @@ aab aab aab aab -aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aCY -aDa +aiF aDe +aVr +seT +aVr +aDa +aDa +aDa +aDa +aDa +aDa +aDa aDj ajt aDg @@ -48534,8 +48611,8 @@ aDB aDG aDg aDR -aVr -aDe +aDr +aDr aVx aDc aip @@ -48654,21 +48731,21 @@ aab aab aab aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aCY -aDe -aDe +aiF +aDL +aVr +aUF +aUF +aDa +aDa +aDa +aDa +aDa +aDa +aDa aDn aju aDi @@ -48796,21 +48873,21 @@ aab aab aab aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aCY -aDa +aiF aDe +aVr +seT +aVr +aDa +aDa +aDa +aDa +aDa +aDa +aDa aDh akm aDk @@ -48819,8 +48896,8 @@ aDs aUz hxc erS -aDe -aDe +pQu +pQu aDc aVA sDG @@ -48938,21 +49015,21 @@ aab aab aab aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -arW -arW -aDd +aiF +aDe +aVr +seT +aVr +qVo +aCZ +aDe +qVo +aDe +tjW +aDe aDf aDm aDl @@ -48960,10 +49037,10 @@ aDt rEZ dgA cwI -aDf +wLd +ivV aDT arW -arW aVE aWF akn @@ -49080,30 +49157,30 @@ aab aab aab aab -aab -aab -aab -aab -aab -aac -aac -aac -aac -aac -aac -aac +aOm +adG aac +aiF +aDd +aVr +seT +aVr +aDe +aDe +aDq +aDe +aDe aDb -aDc -aDf +aDe +aDe aDn aDg aDu aDD aDg aDN -aDf -aDc +aDS +fiZ aDz agw air @@ -49222,31 +49299,31 @@ aab aab aab aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aDb -aDc +aiF +aDe +aUF +aDe +aVr +aDe +aDe +aDq +aDe +aDe +aDe +aDe +aDe acm aDv aDg aDJ -aUC -aDO -aDc +aDg +aDN aDS -aac +fiZ +aDz agw air aWF @@ -49364,31 +49441,31 @@ aab aab aab aab -aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aDb +aiF +aDe +aDe +aDe +don +aDe +aDe +aDq +lbW +aDe +aDe +sWC +aDe arW aDw aDg aDJ -aUF -arW +aDg +aDN aDS -aac -aac +fiZ +aDz agw air aWF @@ -49506,31 +49583,31 @@ aab aab aab aab -aab -aab -aab +aOm +adG aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aCY +arW +arW +aDe +aCZ +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDe +aDe +arW aDx aDE aDK aUM aDP -aac -aac -aac +saW +ykH +aDe agw aVG aWF @@ -49648,29 +49725,29 @@ aab aab aab aab -aab -aab -aab +aOm +adG aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aCY +aDO +aDc +lms +aDe +cTD +cTD +aDe +lms +aDe +cTD +cTD +aDe +arW aDy aDF aDH aUO -aDP -aac +arW +uWn agw agw agw @@ -49790,27 +49867,27 @@ aab aab aab aab -aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aOm +adG aac aac aac +aDO +arW +aDL +aDe +aDe +aUC +arW +aDL +aDe +aDe +aDe +arW +arW +arW +arW arW -aDz -aDz -aDz -aDz arW aac agw @@ -49933,22 +50010,22 @@ aab aab aab aab -aab -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aNM aac aac aac aac +arW +uWn +uWn +uWn +uWn +arW +uWn +uWn +uWn +uWn +arW aac aac aac From 145ce48d005d91c1fea02fac3aee72456d9915ad Mon Sep 17 00:00:00 2001 From: ResidentCody Date: Tue, 27 Apr 2021 18:32:16 -0600 Subject: [PATCH 02/47] Update tether-03-surface3.dmm --- maps/tether/tether-03-surface3.dmm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 2637bfe9473..ae4c201489f 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -18327,6 +18327,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDQ" = ( @@ -38464,6 +38469,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"eQX" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether/surfacebase/public_garden_three) "faL" = ( /obj/structure/lattice, /obj/structure/cable/orange{ @@ -40711,6 +40722,10 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"oqB" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "orc" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) @@ -48609,7 +48624,7 @@ ajt aDg aDB aDG -aDg +oqB aDR aDr aDr @@ -48742,7 +48757,7 @@ aUF aDa aDa aDa -aDa +eQX aDa aDa aDa From 24c834f4bfc156813fb5348a2dc20fea2a76ef89 Mon Sep 17 00:00:00 2001 From: ResidentCody Date: Fri, 30 Apr 2021 15:24:43 -0600 Subject: [PATCH 03/47] Update tether-03-surface3.dmm --- maps/tether/tether-03-surface3.dmm | 320 +++++++++++++++++++++-------- 1 file changed, 232 insertions(+), 88 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index ae4c201489f..6282ce2b6e1 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -6386,10 +6386,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aju" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "ajv" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -6891,16 +6890,9 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "akm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "akn" = ( /obj/effect/floor_decal/borderfloor, @@ -17991,19 +17983,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aDm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDn" = ( @@ -18058,7 +18056,6 @@ "aDt" = ( /obj/structure/table/woodentable, /obj/item/weapon/material/minihoe, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/device/analyzer/plant_analyzer, /obj/item/device/analyzer/plant_analyzer, /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -18070,10 +18067,16 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDu" = ( /obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDv" = ( @@ -18157,6 +18160,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/table/woodentable, /obj/random/maintenance/clean, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDC" = ( @@ -18193,12 +18199,10 @@ /area/tether/surfacebase/botanystorage) "aDD" = ( /obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDE" = ( @@ -18233,6 +18237,9 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDH" = ( @@ -18348,6 +18355,8 @@ /obj/effect/floor_decal/corner/lime/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDS" = ( @@ -27553,8 +27562,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "aVb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) @@ -37802,13 +37814,13 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "cwI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) @@ -38059,11 +38071,14 @@ /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/cockpit) "dgA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/bench/wooden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "dlX" = ( /obj/structure/table/glass, @@ -38131,6 +38146,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"dwt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "dyV" = ( /obj/machinery/light{ dir = 1 @@ -38336,19 +38356,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "erS" = ( +/obj/structure/table/bench/wooden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "exM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -38547,6 +38562,23 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"flE" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) +"fse" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "fxh" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -38777,6 +38809,21 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"gFe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "gHh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 @@ -38940,6 +38987,21 @@ }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) +"hms" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "hmT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -38973,14 +39035,14 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "hxc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lime/bordercorner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "hxR" = ( @@ -39142,12 +39204,12 @@ /area/tether/surfacebase/shuttle_pad) "iiv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "ikh" = ( /obj/machinery/vending/sovietsoda{ @@ -39705,6 +39767,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"kfZ" = ( +/obj/machinery/light/flamp/noshade{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "kiw" = ( /obj/structure/cable{ d1 = 1; @@ -40155,6 +40227,14 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"lGO" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "lIe" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -40471,6 +40551,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"ndU" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "nfl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40902,6 +40990,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"oQT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "oSv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41429,6 +41524,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"qNg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "qQZ" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/firealarm{ @@ -41507,6 +41609,14 @@ }, /turf/simulated/floor/tiled/eris/dark/golden, /area/shuttle/tourbus/general) +"rjV" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "rnn" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -41601,9 +41711,6 @@ "rEZ" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, @@ -41613,8 +41720,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) @@ -42041,6 +42148,10 @@ /area/teleporter/departing) "tjW" = ( /obj/structure/flora/rocks2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "tki" = ( @@ -42154,6 +42265,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"tEC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "tLk" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -42451,6 +42573,13 @@ }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/shuttle_pad) +"vfG" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) "viF" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -42924,6 +43053,21 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"wrO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "wtd" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -48326,8 +48470,8 @@ aac aiF aDd aVr -seT -aVr +aju +aDl aDe aDe aDb @@ -48468,8 +48612,8 @@ aac aiF aDe aVr -seT -aVr +akm +dgA qVo aDe wpe @@ -48481,9 +48625,9 @@ aDf aDj ajt aDu -aDu +lGO aDR -aDA +hms aDe aDT arW @@ -48611,7 +48755,7 @@ aiF aDe aVr seT -aVr +erS aDa aDa aDa @@ -48625,7 +48769,7 @@ aDg aDB aDG oqB -aDR +wrO aDr aDr aVx @@ -48753,7 +48897,7 @@ aiF aDL aVr aUF -aUF +iiv aDa aDa aDa @@ -48762,13 +48906,13 @@ aDa aDa aDa aDn -aju +aDg aDi aDs aDs aUw aVb -iiv +tqY tqY tqY haS @@ -48895,7 +49039,7 @@ aiF aDe aVr seT -aVr +erS aDa aDa aDa @@ -48904,13 +49048,13 @@ aDa aDa aDa aDh -akm +aDv aDk aDs aDs aUz hxc -erS +pQu pQu pQu aDc @@ -49036,21 +49180,21 @@ aac aiF aDe aVr -seT -aVr -qVo -aCZ -aDe -qVo -aDe +aju +flE +kfZ +ndU +qNg +kfZ +qNg tjW -aDe -aDf +fse +kfZ aDm -aDl +aDg aDt rEZ -dgA +aDg cwI wLd ivV @@ -49178,8 +49322,8 @@ aac aiF aDd aVr -seT -aVr +akm +vfG aDe aDe aDq @@ -49188,12 +49332,12 @@ aDe aDb aDe aDe -aDn -aDg -aDu +gFe +dwt +rjV aDD -aDg -aDN +oQT +tEC aDS fiZ aDz From cad0d4767f312b2bf76207a6106a33dfc2a7980e Mon Sep 17 00:00:00 2001 From: ResidentCody Date: Sat, 8 May 2021 00:21:12 -0600 Subject: [PATCH 04/47] Update tether-03-surface3.dmm --- maps/tether/tether-03-surface3.dmm | 581 ++++++++++++++--------------- 1 file changed, 278 insertions(+), 303 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 6282ce2b6e1..4fe7fa9e8c5 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5851,13 +5851,8 @@ /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aiF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aiG" = ( /obj/machinery/light, @@ -6386,9 +6381,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aju" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/wood, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "ajv" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -6890,9 +6886,8 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "akm" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/wood, +/obj/structure/flora/bboulder2, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "akn" = ( /obj/effect/floor_decal/borderfloor, @@ -17901,18 +17896,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCZ" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aDa" = ( /turf/simulated/mineral/floor/cave{ name = "dirt" }, /area/tether/surfacebase/public_garden_three) -"aDb" = ( -/obj/structure/flora/tree/jungle_small, -/turf/simulated/floor/grass, -/area/tether/surfacebase/public_garden_three) "aDc" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -17920,10 +17912,9 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "aDd" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/grass, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aDe" = ( /turf/simulated/floor/grass, @@ -17938,13 +17929,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDh" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aDi" = ( /obj/structure/window/reinforced, @@ -18005,13 +17991,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDn" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aDo" = ( /obj/machinery/shower{ @@ -18313,16 +18300,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aDP" = ( /obj/effect/floor_decal/borderfloor{ @@ -27293,8 +27278,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aUC" = ( -/obj/structure/flora/ausbushes/fernybush, -/turf/simulated/floor/grass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "aUD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27315,6 +27308,12 @@ /turf/simulated/floor/tiled/eris/dark/golden, /area/shuttle/tourbus/general) "aUF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aUG" = ( @@ -27769,6 +27768,12 @@ /area/tether/surfacebase/surface_three_hall) "aVr" = ( /obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "aVs" = ( @@ -38072,11 +38077,8 @@ /area/shuttle/tourbus/cockpit) "dgA" = ( /obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 9 }, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) @@ -38356,14 +38358,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "erS" = ( -/obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "exM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -38485,10 +38481,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "eQX" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "faL" = ( /obj/structure/lattice, @@ -38563,14 +38556,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "flE" = ( -/obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "fse" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -39203,13 +39190,10 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "iiv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/machinery/hologram/holopad, +/turf/simulated/mineral/floor/cave{ + name = "dirt" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "ikh" = ( /obj/machinery/vending/sovietsoda{ @@ -39921,6 +39905,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"kCx" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/machinery/light, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "kCW" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/spline/plain{ @@ -40552,10 +40541,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ndU" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/structure/flora/ausbushes/ppflowers{ + pixel_y = -12 }, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) @@ -41524,13 +41511,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) -"qNg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/tether/surfacebase/public_garden_three) "qQZ" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/firealarm{ @@ -41562,8 +41542,13 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "qVo" = ( -/obj/machinery/light/flamp/noshade, -/turf/simulated/floor/grass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "qXD" = ( /obj/structure/bed/chair/comfy/black, @@ -41832,8 +41817,8 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "seT" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, +/obj/structure/flora/rocks1, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "shx" = ( /obj/structure/grille, @@ -42084,7 +42069,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "sWC" = ( -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "sWR" = ( @@ -42094,8 +42079,13 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "sXa" = ( -/obj/structure/flora/bboulder2, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "sXR" = ( /obj/item/device/radio/intercom/department/security{ @@ -42146,14 +42136,6 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) -"tjW" = ( -/obj/structure/flora/rocks2, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/tether/surfacebase/public_garden_three) "tki" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -42573,13 +42555,6 @@ }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/shuttle_pad) -"vfG" = ( -/obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/public_garden_three) "viF" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -43036,8 +43011,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wpe" = ( -/obj/structure/flora/rocks1, -/turf/simulated/floor/grass, +/obj/structure/table/bench/wooden, +/turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "wrA" = ( /obj/structure/cable/green{ @@ -46769,7 +46744,7 @@ aab aab aab aab -aab +aMG aac aac aac @@ -46910,8 +46885,8 @@ aab aab aab aab -aMG -aMG +aNU +adG aac aac aac @@ -47476,6 +47451,11 @@ aab aNU adG aac +aac +aac +aac +aac +aac aiq cup arW @@ -47484,11 +47464,6 @@ cup cup cup cup -arW -cup -cup -cup -cup cup arW wkN @@ -47617,6 +47592,11 @@ aab aNU adG aac +aac +aac +aac +aac +aac aiq aDc bSU @@ -47625,11 +47605,6 @@ aDe aDe aDe aDe -bSU -arW -aDe -aDe -aDe aDe bSU arW @@ -47755,24 +47730,24 @@ aab aab aab aab -aNU +aOm adG aac +aac +aac +aac +aac +aac aiq aDc aDe lbW gyl aDe -cTD -cTD -cTD aDe -gyl aDe -cTD -cTD -cTD +aDe +aDe aDe gyl lbW @@ -47896,8 +47871,13 @@ aab aab aab aab -aOm -adG +aab +aab +aac +aac +aac +aac +aac aac aiq aDc @@ -47905,16 +47885,11 @@ aDe aDe aDe aDe +aiF aDe aDe aDe aDe -cTD -cTD -cTD -aDe -aDe -aDe aDe aDe aDe @@ -48038,22 +48013,22 @@ aab aab aab aab -aOm -adG +aab +aab +aac +aac +aac +aac +aac aac arW arW -aUC -aDe -aDe -aDe -aDe sWC aDe aDe +erS aDe -aDe -aDe +erS aDe aDe aDq @@ -48180,21 +48155,21 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo aDe aDe aDe aDe aDe -aDe -aDe -aDe -aDq -aDe -aDe +lbW aDe aDe aDe @@ -48322,19 +48297,19 @@ aab aab aab aab -aOm -adG +aab +aab aac +aac +aac +aac +aac +aac +qVo aiF -aCZ -aUF -sXa -aVr -aDe -aDe -aDe -aDe -aDq +eQX +akm +wpe aDe aDe aDe @@ -48464,22 +48439,22 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF -aDd -aVr +aac +aac +aac +aac +aac +qVo aju +wpe +aCZ aDl aDe aDe -aDb -aDe -aDq -aDe -aCZ -aDe +seT aDe aDj aDr @@ -48606,20 +48581,20 @@ aab aab aab aab -aOm -adG +aab +aab +aac +aac +aac +aac +aac aac -aiF -aDe -aVr -akm -dgA qVo aDe wpe -qVo -aDe -aUC +aDd +aDn +flE aDe aDf aDj @@ -48748,23 +48723,23 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo aDe -aVr -seT -erS +wpe +aDh +aDO aDa aDa aDa -aDa -aDa -aDa -aDa -aDj -ajt +sXa aDg aDB aDG @@ -48890,23 +48865,23 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo aDL -aVr +wpe +eQX aUF +aDa iiv aDa -aDa -aDa -eQX -aDa -aDa -aDa -aDn -aDg +sXa aDi aDs aDs @@ -49032,23 +49007,23 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo aDe -aVr -seT -erS -aDa -aDa -aDa -aDa -aDa -aDa -aDa +wpe aDh -aDv +aDO +aDa +aDa +aDa +sXa aDk aDs aDs @@ -49174,20 +49149,20 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo aDe +wpe +aCZ aVr -aju -flE kfZ -ndU -qNg -kfZ -qNg -tjW fse kfZ aDm @@ -49316,20 +49291,20 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo +aju +wpe aDd -aVr -akm -vfG -aDe -aDe -aDq -aDe -aDe -aDb +dgA +sWC aDe aDe gFe @@ -49458,19 +49433,19 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF -aDe -aUF -aDe -aVr -aDe -aDe -aDq +aac +aac +aac +aac +aac +qVo aDe +eQX aDe +wpe aDe aDe aDe @@ -49600,22 +49575,22 @@ aab aab aab aab -aOm -adG +aab +aab aac -aiF +aac +aac +aac +aac +aac +qVo aDe aDe aDe don -aDe -aDe -aDq -lbW -aDe -aDe -sWC -aDe +cTD +ndU +kCx arW aDw aDg @@ -49742,22 +49717,22 @@ aab aab aab aab -aOm -adG +aab +aab +aac +aac +aac +aac +aac aac arW arW aDe -aCZ -aDe -aDe -aDe -aDe -aDe -aDe -aDe +aiF aDe +cTD aDe +cTD arW aDx aDE @@ -49884,22 +49859,22 @@ aab aab aab aab -aOm -adG +aab +aab aac aac -aDO +aac +aac +aac +aac +aac +aUC aDc lms aDe cTD -cTD -aDe -lms aDe cTD -cTD -aDe arW aDy aDF @@ -50026,22 +50001,22 @@ aab aab aab aab -aOm -adG +aab +aab +aac +aac +aac +aac +aac aac aac aac -aDO -arW -aDL -aDe -aDe aUC arW aDL +cTD aDe -aDe -aDe +cTD arW arW arW @@ -50169,16 +50144,16 @@ aab aab aab aab -aNM +aab +aac +aac +aac +aac +aac aac aac aac aac -arW -uWn -uWn -uWn -uWn arW uWn uWn From d7cf603d26a0e302c741b8d67e30c185b9438f49 Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 25 May 2021 17:38:34 +1000 Subject: [PATCH 05/47] Adds gender TF mechanics + Spontaneous TF pref. --- code/game/objects/structures/trash_pile_vr.dm | 1 + .../reagents/reactions/instant/instant_vr.dm | 53 ++++++++++++- .../reagents/reagent_containers/glass_vr.dm | 4 + code/modules/reagents/reagents/other_vr.dm | 15 ++++ code/modules/reagents/reagents/vore_vr.dm | 78 ++++++++++++++++--- code/modules/vore/eating/living_vr.dm | 4 + code/modules/vore/eating/vore_vr.dm | 5 ++ code/modules/vore/eating/vorepanel_vr.dm | 7 ++ tgui/packages/tgui/interfaces/VorePanel.js | 20 ++++- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 10 files changed, 174 insertions(+), 15 deletions(-) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 297e514e0d4..97883c6cb92 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -242,6 +242,7 @@ prob(2);/obj/item/weapon/storage/box/syndie_kit/spy, prob(2);/obj/item/weapon/grenade/anti_photon, prob(2);/obj/item/clothing/under/hyperfiber/bluespace, + prob(2);/obj/item/weapon/reagent_containers/glass/beaker/vial/amorphorovir, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/device/nif/bad, prob(1);/obj/item/device/radio_jammer, diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index b2fef2977c7..d3cd646b0ff 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -47,6 +47,57 @@ s.start() holder.clear_reagents() +/////////////////////////////////////////////////////////////////////////////////// +/// TF chemicals +/decl/chemical_reaction/instant/amorphorovir + name = "Amorphorovir" + id = "amorphorovir" + result = "amorphorovir" + required_reagents = list("clonexadone" = 30, "biomass" = 30, "sizeoxadone" = 5, "phoron" = 5) + result_amount = 1 + +/decl/chemical_reaction/instant/androrovir + name = "Androrovir" + id = "androrovir" + result = "androrovir" + required_reagents = list("amorphorovir" = 1, "bicaridine" = 20, "iron" = 20, "ethanol" = 20) + result_amount = 1 + +/decl/chemical_reaction/instant/gynorovir + name = "Gynorovir" + id = "gynorovir" + result = "gynorovir" + required_reagents = list("amorphorovir" = 1, "inaprovaline" = 20, "silicon" = 20, "sugar" = 20) + result_amount = 1 + +/decl/chemical_reaction/instant/androgynorovir + name = "Androgynorovir" + id = "androgynorovir" + result = "androgynorovir" + required_reagents = list("amorphorovir" = 1, "anti_toxin" = 20, "fluorine" = 20, "tungsten" = 20) + result_amount = 1 + +/decl/chemical_reaction/instant/androrovir_bootleg + name = "Bootleg Androrovir" + id = "androrovir_bootleg" + result = "androrovir" + required_reagents = list("amorphorovir" = 1, "protein" = 10, "capsaicin" = 10) + result_amount = 1 + +/decl/chemical_reaction/instant/gynorovir_bootleg + name = "Bootleg Gynorovir" + id = "gynorovir_bootleg" + result = "gynorovir" + required_reagents = list("amorphorovir" = 1, "soymilk" = 10, "sugar" = 10) + result_amount = 1 + +/decl/chemical_reaction/instant/androgynorovir_bootleg + name = "Bootleg Androgynorovir" + id = "androgynorovir_bootleg" + result = "androgynorovir" + required_reagents = list("amorphorovir" = 1, "cola" = 10, "berryjuice" = 10) + result_amount = 1 + /////////////////////////////////////////////////////////////////////////////////// /// Miscellaneous Reactions @@ -85,7 +136,7 @@ required_reagents = list("water" = 1) catalysts = list("fluorine" = 10) result_amount = 1 - + /decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously. name = "Firefighting Foam EZ" id = "firefighting foam ez" diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 79c19b82880..86601ea777a 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -49,6 +49,10 @@ name = "vial (hyronalin)" prefill = list("hyronalin" = 30) +/obj/item/weapon/reagent_containers/glass/beaker/vial/amorphorovir + name = "vial (amorphorovir)" + prefill = list("amorphorovir" = 1) + /obj/item/weapon/reagent_containers/glass/beaker/measuring_cup name = "measuring cup" desc = "A measuring cup." diff --git a/code/modules/reagents/reagents/other_vr.dm b/code/modules/reagents/reagents/other_vr.dm index b1146960ed9..f0286667df1 100644 --- a/code/modules/reagents/reagents/other_vr.dm +++ b/code/modules/reagents/reagents/other_vr.dm @@ -6,6 +6,8 @@ color = "#13BC5E" /datum/reagent/advmutationtoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(!(M.allow_spontaneous_tf)) + return if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.species.name != "Promethean") @@ -119,3 +121,16 @@ if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING nif.durability = min(nif.durability + removed*0.1, initial(nif.durability)) + +//Special toxins for solargrubs +/datum/reagent/grubshock + name = "200 V" //in other words a painful shock + id = "shockchem" + description = "A liquid that quickly dissapates to deliver a painful shock." + reagent_state = LIQUID + color = "#E4EC2F" + metabolism = 2.50 + var/power = 9 + +/datum/reagent/grubshock/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + M.take_organ_damage(0, removed * power * 0.2) diff --git a/code/modules/reagents/reagents/vore_vr.dm b/code/modules/reagents/reagents/vore_vr.dm index 20af3a57e3f..a86c755c3de 100644 --- a/code/modules/reagents/reagents/vore_vr.dm +++ b/code/modules/reagents/reagents/vore_vr.dm @@ -117,16 +117,74 @@ P.absorbed = 0 M.visible_message("Something spills into [M]'s [lowertext(B.name)]!") -//Special toxins for solargrubs +////////////////////////// TF Drugs ////////////////////////// -/datum/reagent/grubshock - name = "200 V" //in other words a painful shock - id = "shockchem" - description = "A liquid that quickly dissapates to deliver a painful shock." +/datum/reagent/amorphorovir + name = "Amorphorovir" + id = "amorphorovir" + description = "A base medical concoction, capable of rapidly altering genetic and physical structure of the body. Requires extra processing to allow for a targeted transformation." reagent_state = LIQUID - color = "#E4EC2F" - metabolism = 2.50 - var/power = 9 + color = "#AAAAAA" -/datum/reagent/grubshock/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - M.take_organ_damage(0, removed * power * 0.2) +/datum/reagent/androrovir + name = "Androrovir" + id = "androrovir" + description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be male." + reagent_state = LIQUID + color = "#00BBFF" + +/datum/reagent/androrovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(!(M.allow_spontaneous_tf)) + return + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androgynorovir")) + H.Confuse(1) + else + if(!(H.gender == MALE)) + H.set_gender(MALE) + H.change_gender_identity(MALE) + H.visible_message("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now male.", + "Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became male.") + +/datum/reagent/gynorovir + name = "Gynorovir" + id = "gynorovir" + description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be female." + reagent_state = LIQUID + color = "#FF00AA" + +/datum/reagent/gynorovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(!(M.allow_spontaneous_tf)) + return + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(M.reagents.has_reagent("androrovir") || M.reagents.has_reagent("androgynorovir")) + H.Confuse(1) + else + if(!(H.gender == FEMALE)) + H.set_gender(FEMALE) + H.change_gender_identity(FEMALE) + H.visible_message("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now female.", + "Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became female.") + +/datum/reagent/androgynorovir + name = "Androgynorovir" + id = "androgynorovir" + description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be mixed." + reagent_state = LIQUID + color = "#6600FF" + +/datum/reagent/androgynorovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(!(M.allow_spontaneous_tf)) + return + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androrovir")) + H.Confuse(1) + else + if(!(H.gender == PLURAL)) + H.set_gender(PLURAL) + H.change_gender_identity(PLURAL) + H.visible_message("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now of mixed gender.", + "Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became of mixed gender.") \ No newline at end of file diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 37c3f277829..f2eb242256b 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -28,6 +28,7 @@ var/permit_healbelly = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = TRUE // Mobs are pred by default. + var/allow_spontaneous_tf = FALSE // Obviously. var/next_preyloop // For Fancy sound internal loop var/adminbus_trash = FALSE // For abusing trash eater for event shenanigans. var/adminbus_eat_minerals = FALSE // This creature subsists on a diet of pure adminium. @@ -236,6 +237,7 @@ P.show_vore_fx = src.show_vore_fx P.can_be_drop_prey = src.can_be_drop_prey P.can_be_drop_pred = src.can_be_drop_pred + P.allow_spontaneous_tf = src.allow_spontaneous_tf P.step_mechanics_pref = src.step_mechanics_pref P.pickup_pref = src.pickup_pref @@ -271,6 +273,7 @@ show_vore_fx = P.show_vore_fx can_be_drop_prey = P.can_be_drop_prey can_be_drop_pred = P.can_be_drop_pred + allow_spontaneous_tf = P.allow_spontaneous_tf step_mechanics_pref = P.step_mechanics_pref pickup_pref = P.pickup_pref @@ -857,6 +860,7 @@ dispvoreprefs += "Healbelly permission: [permit_healbelly ? "Allowed" : "Disallowed"]
" dispvoreprefs += "Spontaneous vore prey: [can_be_drop_prey ? "Enabled" : "Disabled"]
" dispvoreprefs += "Spontaneous vore pred: [can_be_drop_pred ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Spontaneous transformation: [allow_spontaneous_tf ? "Enabled" : "Disabled"]
" dispvoreprefs += "Can be stepped on/over: [step_mechanics_pref ? "Allowed" : "Disallowed"]
" dispvoreprefs += "Can be picked up: [pickup_pref ? "Allowed" : "Disallowed"]
" user << browse("Vore prefs: [src]
[dispvoreprefs]
", "window=[name]mvp;size=200x300;can_resize=0;can_minimize=0") diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 82df33ccf2a..e3e7b9befa1 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -49,6 +49,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/feeding = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = FALSE + var/allow_spontaneous_tf = FALSE var/digest_leave_remains = FALSE var/allowmobvore = TRUE var/permit_healbelly = TRUE @@ -136,6 +137,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE show_vore_fx = json_from_file["show_vore_fx"] can_be_drop_prey = json_from_file["can_be_drop_prey"] can_be_drop_pred = json_from_file["can_be_drop_pred"] + allow_spontaneous_tf = json_from_file["allow_spontaneous_tf"] step_mechanics_pref = json_from_file["step_mechanics_pref"] pickup_pref = json_from_file["pickup_pref"] belly_prefs = json_from_file["belly_prefs"] @@ -163,6 +165,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE can_be_drop_prey = FALSE if(isnull(can_be_drop_pred)) can_be_drop_pred = FALSE + if(isnull(allow_spontaneous_tf)) + allow_spontaneous_tf = FALSE if(isnull(step_mechanics_pref)) step_mechanics_pref = TRUE if(isnull(pickup_pref)) @@ -192,6 +196,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "show_vore_fx" = show_vore_fx, "can_be_drop_prey" = can_be_drop_prey, "can_be_drop_pred" = can_be_drop_pred, + "allow_spontaneous_tf" = allow_spontaneous_tf, "step_mechanics_pref" = step_mechanics_pref, "pickup_pref" = pickup_pref, "belly_prefs" = belly_prefs, diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 5a47029b139..8a49f880303 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -218,6 +218,7 @@ "show_vore_fx" = host.show_vore_fx, "can_be_drop_prey" = host.can_be_drop_prey, "can_be_drop_pred" = host.can_be_drop_pred, + "allow_spontaneous_tf" = host.allow_spontaneous_tf, "step_mechanics_active" = host.step_mechanics_pref, "pickup_mechanics_active" = host.pickup_pref, "noisy" = host.noisy, @@ -348,6 +349,12 @@ host.client.prefs_vr.can_be_drop_prey = host.can_be_drop_prey unsaved_changes = TRUE return TRUE + if("toggle_allow_spontaneous_tf") + host.allow_spontaneous_tf = !host.allow_spontaneous_tf + if(host.client.prefs_vr) + host.client.prefs_vr.allow_spontaneous_tf = host.allow_spontaneous_tf + unsaved_changes = TRUE + return TRUE if("toggle_digest") host.digestable = !host.digestable if(host.client.prefs_vr) diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 34722433ff1..bc91fb376ce 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -607,6 +607,7 @@ const VoreUserPreferences = (props, context) => { show_vore_fx, can_be_drop_prey, can_be_drop_pred, + allow_spontaneous_tf, step_mechanics_active, pickup_mechanics_active, noisy, @@ -767,7 +768,7 @@ const VoreUserPreferences = (props, context) => { + " Click this to enable showing FX.")} content={show_vore_fx ? "Show Vore FX" : "Do Not Show Vore FX"} /> - +