From 814a76bfcec061cb122e957e7dc5d79a19b8a4bc Mon Sep 17 00:00:00 2001 From: H0lySquirr3l <34927367+H0lySquirr3l@users.noreply.github.com> Date: Tue, 12 May 2020 19:29:00 -0500 Subject: [PATCH] Add files via upload --- maps/tether/tether-01-surface1.dmm | 54 ++++++++-- maps/tether/tether-02-surface2.dmm | 17 ++- maps/tether/tether-03-surface3.dmm | 81 +++++++++------ maps/tether/tether-05-station1.dmm | 81 ++++++++++++--- maps/tether/tether-07-station3.dmm | 160 ++++++++++++++++------------- 5 files changed, 267 insertions(+), 126 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index caa717d6b71..c7212fcb833 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2870,6 +2870,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) +"aex" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "aey" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3008,6 +3020,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) +"aeI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like its set to the kek-centeral. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aeJ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3039,6 +3062,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) +"aeL" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's on MTV. Now you can't blame that demi-cowgirl for working her money maker. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/visitor_dining) +"aeM" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's on the fishing channel. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "aeN" = ( /obj/machinery/conveyor{ dir = 8; @@ -29467,11 +29508,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating, /area/vacant/vacant_bar) -"aZg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aZh" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -43609,7 +43645,7 @@ aXH aYc aYq aYL -aZg +aeI aZy aZy baa @@ -44995,7 +45031,7 @@ aCK aCK aCK agM -ayG +aeM aJd ayG aKA @@ -47408,7 +47444,7 @@ aFD aFD aFD aCO -aDu +aeL aIw aDu aCQ @@ -47676,7 +47712,7 @@ afG auB auB auB -awi +aex atx axy ayo diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 39011de5ddf..9a83b80e742 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -12475,6 +12475,15 @@ "axB" = ( /turf/simulated/wall, /area/janitor) +"axC" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/rnd/breakroom) "axD" = ( /obj/structure/railing{ dir = 8 @@ -15333,6 +15342,12 @@ /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 32; + pixel_y = 0 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "aBS" = ( @@ -38570,7 +38585,7 @@ anZ arF asx atb -atJ +axC aut aut aut diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 42a5f8c33ef..45cb69b7820 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -6186,15 +6186,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ake" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Is that, The worlds slowest spaceship chase?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 }, -/obj/structure/table/standard, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/security/lobby) "akf" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) @@ -8600,6 +8610,12 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = -32; + pixel_y = 0 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "aor" = ( @@ -12472,13 +12488,21 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/bar) "auS" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/structure/table/standard, /obj/machinery/computer/security/telescreen/entertainment{ + desc = "Look's like it's set to the info station... I wonder what else is on?"; icon_state = "frame"; pixel_x = 0; pixel_y = 32 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "auT" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, @@ -28399,19 +28423,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "aVC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) "aVD" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -30104,10 +30119,14 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aXU" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) "aXV" = ( /obj/machinery/atmospherics/unary/engine{ dir = 1 @@ -43951,7 +43970,7 @@ ahX aiS ahx ahx -aVC +ake aVU ajT aWw @@ -46508,7 +46527,7 @@ aUS aJl aVj aSP -ake +auS aVu aix ajX @@ -46564,7 +46583,7 @@ aNk uSA aNJ aNP -aXU +aVC aKU abg aOk @@ -46706,7 +46725,7 @@ aNl aNl aNK aNP -aXU +aVC aKU abg aOk @@ -46848,7 +46867,7 @@ aNm aNl aNK aNP -aXU +aVC aKU abg aOk @@ -48095,7 +48114,7 @@ atk arO atR aru -auS +aXU avr avO aww diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 8d3a0bf1f03..41dc5b0cf49 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -4777,20 +4777,35 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "ahP" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - icon_state = "frame"; - pixel_x = 0; - pixel_y = 32 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = -32 + }, /turf/simulated/floor/tiled, -/area/tether/station/visitorhallway/office) +/area/hallway/station/atrium) "ahQ" = ( /obj/machinery/light{ dir = 4 @@ -7340,10 +7355,13 @@ /turf/simulated/floor/water/pool, /area/hallway/station/atrium) "ams" = ( -/obj/machinery/newscaster{ +/obj/structure/bed/chair, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to the science channel, the show is talking about modern aliens. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; pixel_y = 32 }, -/obj/structure/bed/chair, /turf/simulated/floor/carpet, /area/engineering/foyer) "amt" = ( @@ -18065,6 +18083,34 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"aEP" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/visitorhallway/office) +"aEQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to GNN, I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "aER" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -18088,6 +18134,15 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/engi_wash) +"aES" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like its Fawkes News, I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/station/visitorhallway/lounge) "aET" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -30319,7 +30374,7 @@ bYj aeF aAV aDf -aBZ +aEQ awu aaa aaa @@ -33741,7 +33796,7 @@ ayS azp azv azG -azP +aES aAb aAl aAY @@ -34144,7 +34199,7 @@ agw air aAw afI -ahP +aEP aie asC aiA @@ -35545,7 +35600,7 @@ jXR lfK plz afC -aak +ahP acp amJ amC diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 38789840455..8b0d06f119d 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -8767,6 +8767,12 @@ icon_state = "corner_white"; dir = 9 }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "It looks to be a patriotic NT security stream. Officers from all over the universe proudly voicing their love for NT! I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 32; + pixel_y = 0 + }, /turf/simulated/floor/tiled, /area/security/briefing_room) "anx" = ( @@ -13693,23 +13699,26 @@ /turf/simulated/floor, /area/security/hallway) "auV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/effect/floor_decal/corner/red/border{ + dir = 1 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/security/hallway) +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/security/lobby) "auW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14169,21 +14178,24 @@ /turf/simulated/floor/tiled, /area/security/lobby) "avJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 1 +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like its set to the cooking channel. Wait did I just see one of those hot dogs moving? I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 }, -/obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled, -/area/security/lobby) +/area/hallway/station/upper) "avK" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -14623,18 +14635,29 @@ /turf/simulated/open, /area/tether/exploration) "awF" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/structure/table/bench/standard, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Damn, looks like it's on the clown world channel. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "awG" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -16785,6 +16808,12 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Oh, hey look it's a shopping channel! Are... Are they selling acid resistant underwear? I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "azQ" = ( @@ -17329,24 +17358,19 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "aAB" = ( -/obj/structure/flora/pottedplant/stoutbush, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ +/obj/structure/bed/chair{ dir = 1 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's on the fishing channel. I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 0; + pixel_y = 32 }, /turf/simulated/floor/tiled/white, -/area/medical/reception) +/area/medical/sleeper) "aAC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25406,13 +25430,13 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "aNf" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/turf/simulated/floor/tiled/white, -/area/medical/sleeper) +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "aNg" = ( /obj/structure/bed/chair{ dir = 1 @@ -31194,8 +31218,7 @@ /area/quartermaster/belterdock/gear) "aYo" = ( /obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" + dir = 8 }, /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, @@ -31273,7 +31296,8 @@ /area/crew_quarters/heads/hos) "aYy" = ( /obj/structure/shuttle/engine/propulsion{ - dir = 8 + dir = 8; + icon_state = "propulsion_r" }, /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, @@ -31736,14 +31760,6 @@ }, /turf/simulated/floor/airless, /area/shuttle/medivac/cockpit) -"aZw" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" - }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) "aZx" = ( /obj/machinery/light/small{ dir = 8 @@ -41085,8 +41101,8 @@ alw aoA apE aqR +amH auV -avJ awp awU axL @@ -41380,7 +41396,7 @@ ajf anc aqQ ayK -aAB +awF aCl aCl aEl @@ -42226,7 +42242,7 @@ atn atn atn asp -awF +avJ azw aAr aAx @@ -42392,7 +42408,7 @@ aKp aLK aMX aLh -aNf +aAB aIy aab aab @@ -47648,11 +47664,11 @@ avt avt aVc aZS +aNf +aYo +aYo aYo aYy -aYy -aYy -aZw baB aVc avt