Merge pull request #15385 from Very-Soft/backtotether

Map tweaks!
This commit is contained in:
Casey
2023-09-11 21:12:29 -04:00
committed by GitHub
13 changed files with 2946 additions and 9769 deletions
-54
View File
@@ -10,8 +10,6 @@
dir = 5
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/green{
@@ -42,8 +40,6 @@
/area/tether_away/fueldepot)
"ae" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/aux{
@@ -82,8 +78,6 @@
/area/tether_away/fueldepot)
"ai" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -108,8 +102,6 @@
/area/tether_away/fueldepot)
"al" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -141,8 +133,6 @@
"ao" = (
/obj/machinery/atmospherics/pipe/simple/visible/fuel,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/catwalk,
@@ -165,8 +155,6 @@
/area/tether_away/fueldepot)
"ar" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
@@ -244,16 +232,12 @@
/area/space)
"aD" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/shuttle/plating/airless,
@@ -298,8 +282,6 @@
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/shuttle/plating/airless,
@@ -343,8 +325,6 @@
/area/tether_away/fueldepot)
"aP" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/tiled/techmaint/airless,
@@ -432,8 +412,6 @@
/area/tether_away/fueldepot)
"aX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
@@ -478,8 +456,6 @@
/area/tether_away/fueldepot)
"be" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/catwalk,
@@ -530,8 +506,6 @@
/area/tether_away/fueldepot)
"bk" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
@@ -553,8 +527,6 @@
/area/tether_away/fueldepot)
"bm" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/fuel,
@@ -682,8 +654,6 @@
/area/tether_away/fueldepot)
"bA" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/fuel{
@@ -698,13 +668,9 @@
/area/tether_away/fueldepot)
"bB" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
@@ -722,8 +688,6 @@
/area/tether_away/fueldepot)
"bD" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/aux,
@@ -836,8 +800,6 @@
/area/tether_away/fueldepot)
"bO" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/aux{
@@ -851,8 +813,6 @@
dir = 8
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
@@ -932,8 +892,6 @@
},
/obj/machinery/atmospherics/pipe/manifold/visible/aux,
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/effect/catwalk_plated/dark,
@@ -1086,8 +1044,6 @@
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/floor_decal/industrial/warning/dust{
@@ -1127,8 +1083,6 @@
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/shuttle/plating/airless,
@@ -1202,8 +1156,6 @@
/area/tether_away/fueldepot)
"cF" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/aux{
@@ -1230,8 +1182,6 @@
dir = 8
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/catwalk_plated/dark,
@@ -1242,8 +1192,6 @@
dir = 4
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/green{
@@ -1332,8 +1280,6 @@
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/catwalk,
+2 -2
View File
@@ -11,13 +11,13 @@
/area/groundbase/mining/unexplored)
"x" = (
/obj/effect/step_trigger/teleporter/from_mining,
/turf/simulated/mineral/floor/ignore_mapgen,
/turf/simulated/mineral/floor/ignore_mapgen/cave,
/area/groundbase/mining/unexplored)
"I" = (
/turf/simulated/mineral/cave,
/area/groundbase/mining/unexplored)
"Z" = (
/turf/simulated/mineral/floor/ignore_mapgen,
/turf/simulated/mineral/floor/ignore_mapgen/cave,
/area/groundbase/mining/unexplored)
(1,1,1) = {"
-3
View File
@@ -13319,8 +13319,6 @@
department = "Chief Engineer's Office"
},
/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable/orange{
@@ -16930,7 +16928,6 @@
dir = 8
},
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/flora/pottedplant/unusual,
File diff suppressed because it is too large Load Diff
+53 -29
View File
@@ -270,9 +270,7 @@
},
/area/redgate/wilds)
"de" = (
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/sign/poster,
/turf/simulated/floor/carpet/bcarpet,
/area/redgate/structure/powered)
"df" = (
@@ -296,7 +294,7 @@
/area/redgate/structure/powered)
"dh" = (
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/simulated/floor/plating,
/area/redgate/structure/powered)
@@ -322,7 +320,7 @@
/area/redgate/structure/powered)
"dn" = (
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/unsimulated/floor/steel{
icon = 'icons/turf/floors_vr.dmi';
@@ -389,7 +387,7 @@
dir = 5
},
/obj/structure/sign/poster{
pixel_y = 32
dir = 1
},
/turf/simulated/floor/tiled,
/area/redgate/structure/powered)
@@ -432,6 +430,7 @@
layer = 5
},
/obj/item/weapon/reagent_containers/dropper,
/obj/structure/sign/poster,
/turf/unsimulated/floor/steel{
icon_state = "white"
},
@@ -779,9 +778,7 @@
/turf/simulated/floor/plating,
/area/redgate/structure/powered)
"eR" = (
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/sign/poster,
/turf/unsimulated/floor/steel{
icon = 'icons/turf/floors_vr.dmi';
icon_state = "wood"
@@ -944,9 +941,6 @@
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{
pixel_x = -3
},
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
@@ -958,6 +952,16 @@
/obj/structure/bonfire/permanent,
/turf/simulated/floor/reinforced,
/area/redgate/structure/powered)
"pX" = (
/obj/structure/table/woodentable,
/obj/structure/sign/poster{
dir = 1
},
/turf/unsimulated/floor/steel{
icon = 'icons/turf/floors_vr.dmi';
icon_state = "wood"
},
/area/redgate/structure/powered)
"ub" = (
/turf/simulated/floor/water,
/area/redgate/wilds)
@@ -969,12 +973,32 @@
base_desc = "Soft, plush green grass. It feels nice under your feet~"
},
/area/redgate/structure/powered)
"Bs" = (
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/mineral/floor/ignore_cavegen/cave{
desc = "It's finely packed dirt. It is soft, and comfortable to walk on.";
name = "dirt"
},
/area/redgate/structure/powered)
"Ha" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/carpet/bcarpet,
/area/redgate/structure/powered)
"Ug" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 4
},
/obj/structure/sign/poster{
dir = 1
},
/turf/unsimulated/floor/steel{
icon_state = "white"
},
/area/redgate/structure/powered)
(1,1,1) = {"
kw
@@ -3287,7 +3311,7 @@ ct
ct
ct
cQ
cQ
aL
cQ
ct
ct
@@ -3428,9 +3452,9 @@ ct
ct
ct
cQ
cQ
cQ
cQ
aL
br
aL
cQ
ct
ct
@@ -3571,7 +3595,7 @@ ct
ct
ct
cQ
cQ
aL
cQ
ct
ct
@@ -3724,7 +3748,7 @@ ge
cQ
cQ
af
aj
pX
ap
ap
dA
@@ -5286,7 +5310,7 @@ df
ap
ap
af
dT
Ug
dT
dT
dT
@@ -7010,7 +7034,7 @@ ct
bG
dl
dl
bO
Bs
cq
le
cq
@@ -18193,9 +18217,9 @@ lb
lb
lb
lb
aL
aL
aL
cq
cq
cq
lb
lb
lb
@@ -18335,9 +18359,9 @@ lb
lb
lb
cq
aL
br
aL
cq
cq
cq
cq
lb
lb
@@ -18477,9 +18501,9 @@ lb
lb
lb
lb
aL
aL
aL
cq
cq
cq
lb
lb
lb
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
-23
View File
@@ -9,8 +9,6 @@
icon_state = "pipe-c"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -20,8 +18,6 @@
dir = 5
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
@@ -314,8 +310,6 @@
/area/tether/midpoint)
"tn" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -328,8 +322,6 @@
/area/tether/midpoint)
"tB" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/floor_decal/borderfloorblack{
@@ -415,8 +407,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -465,8 +455,6 @@
/area/tether/midpoint)
"EI" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -524,8 +512,6 @@
"HK" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -538,8 +524,6 @@
/area/tether/midpoint)
"It" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -635,8 +619,6 @@
/area/tether/midpoint)
"Oq" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/lattice,
@@ -676,8 +658,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -735,8 +715,6 @@
icon_state = "pipe-c"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -801,7 +779,6 @@
pixel_x = -28
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/tiled/dark,
File diff suppressed because it is too large Load Diff
-72
View File
@@ -339,7 +339,6 @@
pixel_y = 24
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/tiled,
@@ -383,8 +382,6 @@
/area/outpost/mining_main/maintenance)
"aW" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -457,24 +454,18 @@
/area/outpost/mining_main/maintenance)
"bd" = (
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/maintenance)
"be" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
@@ -503,8 +494,6 @@
dir = 1
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -549,8 +538,6 @@
/area/outpost/mining_main/maintenance)
"bl" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/universal{
@@ -585,8 +572,6 @@
/area/outpost/mining_main/maintenance)
"bq" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
@@ -599,8 +584,6 @@
/area/outpost/mining_main/maintenance)
"bs" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating,
@@ -625,13 +608,9 @@
/area/outpost/mining_main/break_room)
"bu" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating,
@@ -641,8 +620,6 @@
dir = 1
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -655,7 +632,6 @@
/area/outpost/mining_main/hangar)
"bw" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/terminal,
@@ -663,16 +639,12 @@
/area/outpost/mining_main/maintenance)
"bx" = (
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/maintenance)
"by" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -682,8 +654,6 @@
/area/outpost/mining_main/break_room)
"bz" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plating,
@@ -712,11 +682,9 @@
output_attempt = 0
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable/green{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plating,
@@ -1184,8 +1152,6 @@
/area/outpost/mining_main/drill_equipment)
"cA" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1253,12 +1219,9 @@
pixel_y = 24
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/floor_decal/borderfloor{
@@ -1283,8 +1246,6 @@
/area/outpost/mining_main/secondary_gear_storage)
"cF" = (
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -1294,8 +1255,6 @@
dir = 1
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel_grid,
@@ -1327,8 +1286,6 @@
dir = 1
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel_grid,
@@ -1353,8 +1310,6 @@
dir = 9
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled,
@@ -1367,8 +1322,6 @@
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating,
@@ -1379,15 +1332,12 @@
dir = 10
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/outpost/mining_main/drill_equipment)
"cO" = (
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc{
@@ -1545,8 +1495,6 @@
/area/outpost/mining_main/break_room)
"dd" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/green{
@@ -1575,8 +1523,6 @@
/area/outpost/mining_main/airlock)
"ef" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1626,8 +1572,6 @@
/area/outpost/mining_main/break_room)
"ty" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light{
@@ -1723,8 +1667,6 @@
/area/mine/explored)
"Cy" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1741,8 +1683,6 @@
/area/outpost/mining_main/maintenance)
"DX" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/floor_decal/borderfloorblack,
@@ -1790,13 +1730,9 @@
/area/outpost/mining_main/airlock)
"Fn" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -1858,8 +1794,6 @@
name = "Quarters"
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1886,8 +1820,6 @@
/area/mine/explored)
"QZ" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/effect/floor_decal/borderfloorblack,
@@ -1943,8 +1875,6 @@
/area/outpost/mining_main/break_room)
"VG" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/floor_decal/borderfloorblack/cee{
@@ -2018,8 +1948,6 @@
/area/outpost/mining_main/maintenance)
"ZV" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/floor_decal/borderfloor/corner{
File diff suppressed because it is too large Load Diff
+8
View File
@@ -180,6 +180,14 @@
name = "\improper Third Floor Hallway"
icon_state = "dk_yellow"
/area/tether/surfacebase/surface_three_hall/west
name = "\improper Third Floor Hallway - West"
icon_state = "dk_yellow"
/area/tether/surfacebase/surface_three_hall/nwest
name = "\improper Third Floor Hallway - Northwest"
icon_state = "dk_yellow"
/area/tether/surfacebase/north_stairs_one
name = "\improper North Stairwell First Floor"
icon_state = "dk_yellow"