mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 13:39:16 +01:00
Merge pull request #9711 from foopwo/powerrework
Significant surface power grid changes and other map tweaks
This commit is contained in:
Verkister
+1176
-800
File diff suppressed because it is too large
Load Diff
@@ -29297,11 +29297,6 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
@@ -29319,11 +29314,6 @@
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/readingrooms)
|
||||
@@ -29604,11 +29594,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/readingrooms)
|
||||
@@ -29750,11 +29735,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/readingrooms)
|
||||
@@ -31061,11 +31041,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
@@ -31372,10 +31347,8 @@
|
||||
dir = 1;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
/obj/structure/closet/hydrant{
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
@@ -31393,11 +31366,6 @@
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
d2 = 8;
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"bhF" = (
|
||||
@@ -31720,11 +31688,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"bij" = (
|
||||
@@ -32038,11 +32001,6 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"biL" = (
|
||||
@@ -32234,21 +32192,6 @@
|
||||
/obj/item/device/flashlight/lamp/green,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"bjf" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"bjg" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -32601,10 +32544,10 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
@@ -32614,7 +32557,7 @@
|
||||
name = "east bump";
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/structure/cable{
|
||||
/obj/structure/cable/orange{
|
||||
d2 = 8;
|
||||
icon_state = "0-8"
|
||||
},
|
||||
@@ -32841,12 +32784,6 @@
|
||||
temperature = 80
|
||||
},
|
||||
/area/tcommsat/chamber)
|
||||
"bko" = (
|
||||
/obj/structure/closet/hydrant{
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"bkp" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 8
|
||||
@@ -33031,9 +32968,10 @@
|
||||
"bkF" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
@@ -34388,6 +34326,14 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/breakroom)
|
||||
"dAB" = (
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"dSO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 1
|
||||
@@ -34416,6 +34362,22 @@
|
||||
/obj/machinery/vending/snack,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/breakroom)
|
||||
"ekH" = (
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 2;
|
||||
d2 = 4;
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"etU" = (
|
||||
/obj/machinery/door/airlock/maintenance_hatch{
|
||||
req_one_access = list(746)
|
||||
@@ -34425,6 +34387,19 @@
|
||||
"eKn" = (
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/funny/hideyhole)
|
||||
"eOL" = (
|
||||
/obj/machinery/door/airlock/maintenance/common,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"frf" = (
|
||||
/obj/item/weapon/paper{
|
||||
info = "I finally got them. The last pair of Shitty Tim's Shitty Timbs. I waited in line at the cargo shop for what seemed like hours. It probably was hours quite frankly. Well after I got my box, someone ran by and jacked my heels! Well I needed shoes so I snuck inside and stole what they had left. Just a pair of NT worshoes. But atleast I'm not walking away barefooted. If only I wasn't caught by a security. I feel like I've been in this hole for days. Good thing I managed to pilfer some provisions on the way here.";
|
||||
@@ -34443,6 +34418,16 @@
|
||||
/obj/structure/table/glass,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/tether/surfacebase/medical/breakroom)
|
||||
"glx" = (
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 16;
|
||||
d2 = 0;
|
||||
icon_state = "16-0"
|
||||
},
|
||||
/obj/structure/cable/orange,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"gwn" = (
|
||||
/obj/item/trash/snack_bowl,
|
||||
/obj/item/trash/sosjerky,
|
||||
@@ -34460,6 +34445,24 @@
|
||||
can_open = 1
|
||||
},
|
||||
/area/tether/surfacebase/public_garden_two)
|
||||
"jNC" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"kPb" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
@@ -34535,6 +34538,28 @@
|
||||
/obj/machinery/floodlight,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/funny/hideyhole)
|
||||
"mDn" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/structure/cable/orange{
|
||||
d1 = 32;
|
||||
d2 = 2;
|
||||
icon_state = "32-2"
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/tether/surfacebase/reading_room)
|
||||
"mNZ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/readingrooms)
|
||||
"mUP" = (
|
||||
/obj/structure/bed/padded,
|
||||
/obj/effect/floor_decal/techfloor,
|
||||
@@ -50385,10 +50410,10 @@ adt
|
||||
adt
|
||||
adt
|
||||
adt
|
||||
adt
|
||||
adt
|
||||
adt
|
||||
adt
|
||||
bgU
|
||||
mDn
|
||||
ekH
|
||||
glx
|
||||
blh
|
||||
blF
|
||||
blF
|
||||
@@ -50513,7 +50538,7 @@ baO
|
||||
bax
|
||||
bax
|
||||
bax
|
||||
bdg
|
||||
mNZ
|
||||
baO
|
||||
baO
|
||||
baO
|
||||
@@ -50529,7 +50554,7 @@ bgU
|
||||
bgU
|
||||
bgU
|
||||
bgU
|
||||
bgU
|
||||
eOL
|
||||
bgU
|
||||
blh
|
||||
blG
|
||||
@@ -50670,8 +50695,8 @@ biJ
|
||||
bje
|
||||
bjE
|
||||
bjE
|
||||
bko
|
||||
bkE
|
||||
dAB
|
||||
bgU
|
||||
bli
|
||||
blG
|
||||
@@ -50809,10 +50834,10 @@ bgU
|
||||
bhE
|
||||
bii
|
||||
biK
|
||||
bjf
|
||||
bkp
|
||||
bii
|
||||
bjS
|
||||
bkp
|
||||
jNC
|
||||
bkF
|
||||
bkO
|
||||
blj
|
||||
|
||||
+442
-275
File diff suppressed because it is too large
Load Diff
@@ -350,8 +350,8 @@
|
||||
/area/maintenance/substation/SurfMedsubstation
|
||||
name = "\improper SurfMed Substation"
|
||||
icon_state = "green"
|
||||
/area/maintenance/substation/cargostoresubstation
|
||||
name = "\improper Cargo Store Substation"
|
||||
/area/maintenance/substation/surfaceservicesubstation
|
||||
name = "\improper Surface Services Substation"
|
||||
icon_state = "green"
|
||||
|
||||
/area/tether/surfacebase/lowernorthhall
|
||||
|
||||
Reference in New Issue
Block a user