From 48a218da1be3f856f6d06f16a9299b2afdfedba6 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 5 Jul 2021 23:50:16 -0400 Subject: [PATCH 1/8] More maptweaks Fixxes an issue and tweaks a few things! --- maps/tether/submaps/tether_misc.dmm | 61 +++++++++++++++++++++++++---- maps/tether/tether-01-surface1.dmm | 2 +- maps/tether/tether-03-surface3.dmm | 11 ++++++ maps/tether/tether-05-station1.dmm | 17 ++++---- 4 files changed, 73 insertions(+), 18 deletions(-) diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index d4aa7c7af73..c5a31f2f13d 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -2514,6 +2514,12 @@ }, /turf/unsimulated/wall, /area/centcom/simulated/terminal) +"tr" = ( +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) "tu" = ( /obj/structure/sign/warning{ name = "\improper STAND AWAY FROM TRACK EDGE" @@ -2690,6 +2696,12 @@ /obj/structure/grille, /turf/simulated/floor/plating/eris/under, /area/shuttle/escape) +"xu" = ( +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) "xB" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -2717,6 +2729,9 @@ "xY" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/bar_soft/full, +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, /turf/simulated/floor/wood, /area/centcom/simulated/bar) "ya" = ( @@ -2777,6 +2792,12 @@ }, /turf/space/transit/east, /area/space) +"zd" = ( +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/turf/simulated/floor/wood, +/area/centcom/simulated/restaurant) "zp" = ( /obj/machinery/chem_master, /turf/simulated/floor/tiled/white, @@ -3028,6 +3049,21 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/escape) +"Eu" = ( +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"Ex" = ( +/obj/structure/bed/chair/wood/wings{ + dir = 8 + }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, +/turf/simulated/floor/wood, +/area/centcom/simulated/restaurant) "ET" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) @@ -3127,6 +3163,15 @@ /obj/random/forgotten_tram, /turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) +"GU" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "GW" = ( /obj/item/toy/chess/king_white, /turf/simulated/floor/holofloor/bmarble, @@ -19045,7 +19090,7 @@ Nq Nq Nq Nq -Nq +Eu dZ ae ae @@ -19184,7 +19229,7 @@ WE TI QY SH -SH +GU XH Pf QY @@ -19744,7 +19789,7 @@ Vj Vj VU Vu -Ru +xu Ru Ru Ru @@ -20180,7 +20225,7 @@ VQ XB Xa VQ -VQ +zd WW Xe FC @@ -21590,7 +21635,7 @@ Vi Vi VX Vu -Ru +xu Ru Ru Ru @@ -21742,7 +21787,7 @@ Xk XX VQ VQ -ZC +Ex ZC XX VQ @@ -23152,7 +23197,7 @@ Ut VD VU Vu -Ru +xu Ru Ru Ru @@ -23866,7 +23911,7 @@ Ru Ru Ru Ru -Ru +tr Vd XR Yj diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index efa122025b6..3cba38797f9 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -17764,7 +17764,7 @@ "aDa" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ - dir = 10; + dir = 5; id = "gloriouscargopipeline" }, /turf/simulated/floor/tiled/steel_dirty, diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 494bdcbdca2..7158df41d6b 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -14646,6 +14646,13 @@ /obj/item/weapon/pen/invisible, /obj/item/weapon/pen/invisible, /obj/item/weapon/pen/invisible, +/obj/item/canvas, +/obj/item/canvas/nineteen_nineteen, +/obj/item/canvas/twentyfour_twentyfour, +/obj/item/canvas/twentythree_nineteen, +/obj/item/canvas/twentythree_twentythree, +/obj/item/paint_brush, +/obj/item/paint_palette, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) "axW" = ( @@ -34119,6 +34126,10 @@ dir = 10 }, /obj/item/weapon/book/manual/cook_guide, +/obj/machinery/light/floortube{ + dir = 1; + pixel_y = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgq" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index e0a02d2b4dd..ea7c7916e30 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -12713,7 +12713,7 @@ /area/maintenance/station/eng_lower) "aMy" = ( /obj/machinery/conveyor{ - dir = 10; + dir = 5; id = "QMLoad" }, /turf/simulated/floor, @@ -19586,11 +19586,11 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "fWn" = ( +/obj/machinery/light, /obj/machinery/conveyor{ dir = 1; id = "QMLoad" }, -/obj/machinery/light, /turf/simulated/floor, /area/quartermaster/storage) "fWt" = ( @@ -28627,11 +28627,6 @@ /area/tether/exploration/hallway) "oEH" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access = list(26) - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -28640,6 +28635,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access = list(26) + }, /turf/simulated/floor/tiled, /area/janitor) "oFh" = ( @@ -29615,7 +29614,7 @@ /area/shuttle/securiship/engines) "qby" = ( /obj/machinery/conveyor{ - dir = 9; + dir = 6; id = "miningops" }, /turf/simulated/floor/plating, @@ -32004,7 +32003,7 @@ /area/hallway/station/atrium) "sKB" = ( /obj/machinery/conveyor{ - dir = 5; + dir = 10; id = "miningops" }, /obj/machinery/mineral/input, From 0407148e710a8416437a8bd8afbb802ad8fa7131 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 6 Jul 2021 00:32:22 -0400 Subject: [PATCH 2/8] Add art to the HoS office too --- maps/tether/tether-03-surface3.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7158df41d6b..50bc96c76ab 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -41250,6 +41250,9 @@ d2 = 4; icon_state = "0-4" }, +/obj/structure/sign/painting/library_secure{ + pixel_y = -30 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "oMK" = ( From f09d1104e7101e183ae63b054a134e64de95ee56 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 6 Jul 2021 00:51:06 -0400 Subject: [PATCH 3/8] Adjust a mirror --- maps/tether/tether-02-surface2.dmm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index dd1d76119ff..c3deed8b9dd 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1604,17 +1604,19 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "acq" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - dir = 4; - pixel_x = 25 - }, /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/mirror{ + dir = 8; + pixel_x = 26; + pixel_y = 5 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11; + pixel_y = -4 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "acr" = ( From f54c4658a1c68e7634de63564e66d90fbe4da3f7 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 6 Jul 2021 13:46:29 -0400 Subject: [PATCH 4/8] MOAR ART and tweaks --- maps/offmap_vr/talon/talon_v2.dmm | 28 ++++++++- maps/tether/tether-01-surface1.dmm | 92 +++++++++++++++--------------- maps/tether/tether-02-surface2.dmm | 29 ++++++---- maps/tether/tether-03-surface3.dmm | 24 +++++++- maps/tether/tether-04-transit.dmm | 3 + maps/tether/tether-05-station1.dmm | 26 ++++++++- maps/tether/tether-07-solars.dmm | 3 + 7 files changed, 142 insertions(+), 63 deletions(-) diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 5a95a818193..2f506b92b20 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -253,6 +253,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) "az" = ( @@ -2090,6 +2093,9 @@ /area/talon_v2/crew_quarters/cap_room) "fC" = ( /obj/structure/reagent_dispensers/water_cooler/full, +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) "fF" = ( @@ -2186,6 +2192,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/carpet/blucarpet, /area/talon_v2/crew_quarters/cap_room) "gc" = ( @@ -4731,6 +4740,9 @@ /area/talon_v2/central_hallway) "po" = ( /obj/machinery/fitness/punching_bag, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/workroom) "pp" = ( @@ -8568,6 +8580,9 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering) +"Ct" = ( +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/bar) "Cw" = ( /obj/structure/bed/chair/bay/chair{ dir = 1 @@ -8925,6 +8940,9 @@ /area/talon_v2/maintenance/wing_starboard) "DK" = ( /obj/machinery/vending/nifsoft_shop, +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) "DM" = ( @@ -9454,6 +9472,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) +"FH" = ( +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) "FJ" = ( /obj/machinery/light/small{ dir = 1 @@ -25183,7 +25207,7 @@ LB tb QC nB -tb +FH tb nW tc @@ -26173,7 +26197,7 @@ TT JO qc qI -oh +Ct DU Hl Hl diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 3cba38797f9..4646b19f475 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -950,11 +950,23 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence) "abD" = ( -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/light, /turf/simulated/floor/tiled, -/area/rnd/hardstorage) +/area/hallway/lower/first_west) "abE" = ( /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence) @@ -6011,6 +6023,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "akh" = ( @@ -16477,6 +16493,9 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/structure/closet/firecloset, +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aAO" = ( @@ -17356,10 +17375,6 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, @@ -17367,6 +17382,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/vending/cola, /turf/simulated/floor/tiled, /area/rnd/hallway) "aCo" = ( @@ -17383,6 +17399,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/rnd/hallway) "aCp" = ( @@ -17592,6 +17609,9 @@ dir = 8 }, /obj/machinery/vending/cola, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/lower/first_west) "aCI" = ( @@ -18110,26 +18130,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/hallway) -"aDK" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/vending/cola{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled/monotile, -/area/rnd/hallway) "aDL" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18445,20 +18445,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/vending/coffee{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/rnd/hallway) "aEo" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -31940,6 +31927,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"cMk" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/hardstorage) "cNL" = ( /obj/machinery/light/small{ dir = 8 @@ -35019,6 +35012,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) +"lWU" = ( +/obj/structure/closet/crate/plastic, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/hardstorage) "lXE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -44854,9 +44854,9 @@ xoT sBl aun atG -ahK +ahL laI -ajt +abD ahl apj apj @@ -46009,7 +46009,7 @@ apj auK avh abm -abv +cMk abv abv acD @@ -46293,7 +46293,7 @@ apj auK avh abm -abD +abv abv abv adz @@ -46302,7 +46302,7 @@ agn agE ajJ aDe -aDK +aEn aEn aDe aDe @@ -46719,7 +46719,7 @@ apj auK avh abm -abI +lWU abv abv adM diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index c3deed8b9dd..e706cffd52e 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -221,6 +221,7 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/centralhall) "aat" = ( @@ -386,13 +387,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/centralhall) -"aaH" = ( -/obj/machinery/vending/coffee{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood, -/area/tether/surfacebase/medical/centralhall) "aaI" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -1678,15 +1672,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "acx" = ( -/obj/machinery/vending/medical{ - dir = 8 - }, /obj/machinery/camera/network/medbay{ dir = 9 }, /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/vending/medical, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/centralhall) "acy" = ( @@ -22124,6 +22116,9 @@ "aNc" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/closet/firecloset, +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aNd" = ( @@ -31020,6 +31015,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "biK" = ( @@ -31148,6 +31146,9 @@ "bje" = ( /obj/structure/table/glass, /obj/item/device/flashlight/lamp/green, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "bjg" = ( @@ -31804,6 +31805,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bll" = ( @@ -34018,6 +34022,9 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/sign/painting/library_secure{ + pixel_x = -30 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) "qzJ" = ( @@ -47744,7 +47751,7 @@ aar abv abC acx -aaH +aaG aaO afa ahG diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 50bc96c76ab..e27b8c1c23c 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -13816,6 +13816,9 @@ dir = 8 }, /obj/structure/closet/firecloset, +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "awG" = ( @@ -39879,8 +39882,8 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/structure/sign/poster{ - dir = 4 +/obj/structure/sign/painting/library_secure{ + pixel_x = 30 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) @@ -39961,6 +39964,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"kar" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/obj/structure/sign/painting/public{ + pixel_y = -30 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "kcC" = ( /obj/structure/cable{ icon_state = "1-8" @@ -40679,6 +40691,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "mDf" = ( @@ -42044,6 +42059,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "rEZ" = ( @@ -49809,7 +49827,7 @@ aDJ aqp aDO aDS -ufJ +kar arW arN air diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index 59259d0fac2..fa271cb5deb 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -44,6 +44,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "dc" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index ea7c7916e30..3adbe9bf98c 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -6394,6 +6394,9 @@ /area/storage/tech) "aod" = ( /obj/structure/filingcabinet, +/obj/structure/sign/painting/library_secure{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "aof" = ( @@ -14857,6 +14860,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "byp" = ( @@ -31169,6 +31175,24 @@ "rMb" = ( /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) +"rOV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "rPU" = ( /obj/machinery/light{ dir = 8 @@ -39972,7 +39996,7 @@ mra xkZ mra mra -mra +rOV fDN mra mra diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm index d71af22ca9d..45d61b7c0d5 100644 --- a/maps/tether/tether-07-solars.dmm +++ b/maps/tether/tether-07-solars.dmm @@ -297,6 +297,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) "aE" = ( From e8693ccbb277d41a9902da554c04fe7bde934ac8 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 6 Jul 2021 20:52:22 -0400 Subject: [PATCH 5/8] rotates some stools too --- maps/offmap_vr/talon/talon_v2.dmm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 2f506b92b20..22dcd205d13 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -10406,11 +10406,13 @@ /turf/simulated/floor/plating, /area/talon_v2/maintenance/fore_port) "Ip" = ( -/obj/item/weapon/stool/baystool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/effect/floor_decal/corner/black/diagonal, +/obj/item/weapon/stool/baystool/padded{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) "Iq" = ( @@ -12093,12 +12095,14 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "Oq" = ( -/obj/item/weapon/stool/baystool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/black/diagonal, +/obj/item/weapon/stool/baystool/padded{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) "Ot" = ( @@ -14177,9 +14181,11 @@ /turf/simulated/floor/tiled/white, /area/talon_v2/medical) "VF" = ( -/obj/item/weapon/stool/baystool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/black/diagonal, +/obj/item/weapon/stool/baystool/padded{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) "VH" = ( From d0a0c15886c7a9219f2e8cec3b818820fea14793 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 6 Jul 2021 23:17:05 -0400 Subject: [PATCH 6/8] adjust a sink --- maps/tether/tether-01-surface1.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 4646b19f475..cbe4be6725c 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -18284,7 +18284,7 @@ req_one_access = list(25) }, /obj/structure/sink{ - pixel_y = 28 + pixel_y = 22 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) From f6e27b4adc01807a7798e0e7e29e0c34c75b0974 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Wed, 7 Jul 2021 00:47:28 -0400 Subject: [PATCH 7/8] Does some more things --- maps/offmap_vr/om_ships/itglight.dmm | 88 ++++++++++++---------------- maps/tether/tether-02-surface2.dmm | 9 ++- maps/tether/tether-05-station1.dmm | 3 + 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index 45f4b3baeb2..83d9c965ee8 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -62,7 +62,6 @@ /area/itglight/readyroom) "af" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper/dockingcodes, /obj/item/weapon/card/id/event/accessset/itg/crew/captain, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -32 @@ -388,8 +387,7 @@ /area/itglight/captain) "bC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -774,12 +772,10 @@ /area/itglight/readyroom) "ei" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) @@ -1684,8 +1680,7 @@ "jB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - icon_state = "map-supply" + dir = 8 }, /obj/item/weapon/tank/jetpack/oxygen, /obj/item/weapon/tank/jetpack/oxygen, @@ -1853,8 +1848,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - icon_state = "map-supply" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -1972,9 +1966,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/pink{ d1 = 4; d2 = 8; @@ -2116,9 +2108,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/pink{ d1 = 4; d2 = 8; @@ -2416,8 +2406,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9; - icon_state = "intact-scrubbers" + dir = 9 }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) @@ -2580,8 +2569,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9; - icon_state = "intact-scrubbers" + dir = 9 }, /obj/structure/cable/pink{ d1 = 1; @@ -2630,8 +2618,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - icon_state = "map-supply" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2754,7 +2741,6 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "qU" = ( -/obj/item/weapon/stool/baystool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2766,6 +2752,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/weapon/stool/baystool/padded{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "qW" = ( @@ -3635,8 +3624,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9; - icon_state = "intact-scrubbers" + dir = 9 }, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) @@ -3778,8 +3766,7 @@ /area/itglight/portcargo) "ym" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - icon_state = "map-supply" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/pink{ @@ -3993,8 +3980,7 @@ }, /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor, /area/itglight/starboardengi) @@ -5015,8 +5001,7 @@ /area/itglight/starboarddocking) "EQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9; - icon_state = "intact-scrubbers" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -5169,10 +5154,12 @@ /turf/space, /area/space) "FB" = ( -/obj/item/weapon/stool/baystool/padded, /obj/structure/window/reinforced{ pixel_y = -3 }, +/obj/item/weapon/stool/baystool/padded{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "FH" = ( @@ -5372,9 +5359,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -6100,8 +6085,7 @@ /area/space) "KM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/catwalk, /turf/simulated/floor, @@ -6183,8 +6167,7 @@ /area/itglight/forehall) "LI" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, @@ -7307,8 +7290,7 @@ "Sz" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/itglight/passengersleeping) @@ -7731,9 +7713,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "Vs" = ( @@ -7742,6 +7722,12 @@ }, /turf/simulated/floor, /area/itglight/starboardengi) +"Vt" = ( +/obj/item/weapon/stool/baystool/padded{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/itglight/kitchen) "Vz" = ( /obj/machinery/newscaster{ pixel_x = -12; @@ -8328,8 +8314,7 @@ "YM" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /turf/simulated/floor/tiled{ icon_state = "techmaint" @@ -8456,8 +8441,7 @@ /area/itglight/starboardsolars) "Zi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/structure/cable/pink{ d1 = 4; @@ -8492,7 +8476,9 @@ /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "Zp" = ( -/obj/item/weapon/stool/baystool/padded, +/obj/item/weapon/stool/baystool/padded{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "Zq" = ( @@ -17236,7 +17222,7 @@ WN Np Ct cx -Zp +Vt fE Kx cA diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index e706cffd52e..55f46785287 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -33199,6 +33199,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"gOR" = ( +/obj/machinery/recharge_station, +/obj/machinery/computer/cryopod/gateway{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ai_cyborg_station) "gXE" = ( /obj/machinery/light{ dir = 8 @@ -47414,7 +47421,7 @@ mKS aKX pLN rqU -sSw +gOR aKX adt adt diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 3adbe9bf98c..281ae55ad9e 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -237,6 +237,9 @@ /obj/effect/landmark{ name = "JoinLateCyborg" }, +/obj/machinery/computer/cryopod/gateway{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/station/exploration) "aay" = ( From 52fee4f88b2a40adb2ea08759ea019166a2f8de4 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Wed, 7 Jul 2021 14:33:32 -0400 Subject: [PATCH 8/8] Fixes some power issues --- maps/tether/tether-05-station1.dmm | 39 ++++++++++++------------------ 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 281ae55ad9e..ec7c03bb3c3 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -1260,17 +1260,12 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "acr" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/catwalk, +/obj/random/trash_pile, /obj/structure/cable/green{ - icon_state = "2-4" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -6215,7 +6210,7 @@ }, /obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor, /area/maintenance/station/eng_lower) @@ -15172,7 +15167,7 @@ /area/ai_monitored/storage/eva) "bJG" = ( /obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Exploration"; + RCon_tag = "Substation - Asteroid civilian"; output_attempt = 0 }, /obj/structure/cable{ @@ -23446,7 +23441,7 @@ /area/quartermaster/warehouse) "jUt" = ( /obj/machinery/door/airlock/maintenance/engi{ - name = "Exploration Substation" + name = "Asteroid civilian Substation" }, /obj/structure/cable{ d1 = 1; @@ -24980,7 +24975,7 @@ /area/tether/station/dock_two) "lhm" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "Exploration Substation Bypass" + RCon_tag = "Asteroid civilian Substation Bypass" }, /turf/simulated/floor, /area/maintenance/substation/civilian) @@ -27232,12 +27227,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/effect/floor_decal/rust, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "nfp" = ( @@ -27536,7 +27529,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/engi{ - name = "Exploration Substation" + name = "Asteroid civilian Substation" }, /turf/simulated/floor, /area/maintenance/substation/civilian) @@ -29949,8 +29942,8 @@ /area/hallway/station/docks) "qri" = ( /obj/machinery/power/sensor{ - name = "Powernet Sensor - Exploration Subgrid"; - name_tag = "Exploration Subgrid" + name = "Powernet Sensor - Asteroid civilian Subgrid"; + name_tag = "Asteroid civilian Subgrid" }, /obj/structure/cable/green{ d2 = 2; @@ -45213,7 +45206,7 @@ atT dso dso acM -acr +dso neb ujK dso @@ -45356,7 +45349,7 @@ ahq aiX abC anE -aBH +acr aBH fFM aGP