Update from Master

This commit is contained in:
Enzo-Leon
2023-04-14 21:47:24 -07:00
46 changed files with 1136 additions and 458 deletions
+442 -356
View File
File diff suppressed because it is too large Load Diff
+16 -23
View File
@@ -906,13 +906,6 @@
outdoors = 0
},
/area/groundbase/level3/escapepad)
"oF" = (
/turf/unsimulated/wall/planetary/normal{
desc = "It's quite impassable";
icon_state = "rock-dark";
name = "impassable rock"
},
/area/groundbase/level3/sw)
"oI" = (
/obj/machinery/light{
dir = 1
@@ -3526,7 +3519,7 @@ Bg
Bg
Bg
Bg
oF
Bg
zh
hO
"}
@@ -14061,11 +14054,11 @@ IS
IS
IS
IS
IS
IS
IS
IS
IS
vs
vs
vs
sP
sP
oK
iT
iT
@@ -14203,11 +14196,11 @@ IS
IS
IS
IS
IS
IS
IS
IS
IS
vs
vs
vs
sP
sP
oK
iT
iT
@@ -14345,11 +14338,11 @@ IS
IS
IS
IS
IS
IS
IS
IS
IS
vs
vs
vs
sP
sP
oK
Px
xs
+3
View File
@@ -337,6 +337,9 @@
/area/groundbase/cargo/office
name = "Cargo Office"
lightswitch = 1
/area/groundbase/cargo/storage
name = "Cargo Storage"
lightswitch = 0
/area/groundbase/cargo/bay
name = "Cargo Bay"
lightswitch = 1