Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Break Up Secure Storage LV-624 #4767

Closed
wants to merge 3 commits into from
Closed

Break Up Secure Storage LV-624 #4767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae2115
InhitalCommit
Oct 22, 2023
89cfc5c
Merge branch 'master' into SurvMain
Drulikar Oct 22, 2023
e0951ca
FixUp
Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 73 additions & 68 deletions maps/map_files/LV624/LV624.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11151,32 +11151,11 @@
/obj/item/ore/silver,
/turf/open/floor/greengrid,
/area/lv624/lazarus/secure_storage)
"aWb" = (
/obj/structure/machinery/door_control{
id = "secure_inner_blast";
name = "Secure Inner Doors";
pixel_x = 25;
pixel_y = 5
},
/obj/structure/machinery/door_control{
id = "secure_outer_blast";
name = "Secure Outer Doors";
pixel_x = 25;
pixel_y = -5
},
/turf/open/floor/greengrid,
/area/lv624/lazarus/secure_storage)
"aWc" = (
/obj/structure/computerframe{
anchored = 1
},
/obj/structure/machinery/door_control{
id = "secure_outer_blast";
name = "Secure Outer Doors";
pixel_x = 25;
pixel_y = -5
},
/turf/open/floor/greengrid,
/turf/open/floor/plating,
/area/lv624/lazarus/secure_storage)
"aWd" = (
/obj/structure/machinery/cm_vending/sorted/tech/comp_storage,
Expand Down Expand Up @@ -11294,24 +11273,7 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
"aWu" = (
/obj/structure/machinery/door/poddoor/almayer{
dir = 4;
id = "secure_inner_blast";
layer = 3.3;
name = "\improper Secure Armory Blast Door";
unacidable = 1
},
/turf/open/floor/greengrid,
/area/lv624/lazarus/secure_storage)
"aWv" = (
/obj/structure/machinery/door/poddoor/almayer{
dir = 4;
id = "secure_outer_blast";
layer = 3.3;
name = "\improper Secure Armory Blast Door";
unacidable = 1
},
/turf/open/floor/plating{
icon_state = "platebotc"
},
Expand Down Expand Up @@ -12925,6 +12887,11 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
"cnf" = (
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
/area/lv624/lazarus/secure_storage)
"cng" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
Expand Down Expand Up @@ -13395,6 +13362,10 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
"dwb" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/south_central_jungle)
"dws" = (
/obj/structure/stairs/perspective{
color = "#b29082";
Expand Down Expand Up @@ -13831,6 +13802,9 @@
icon_state = "cult"
},
/area/lv624/ground/caves/south_west_caves)
"eub" = (
/turf/open/floor/plating,
/area/lv624/lazarus/secure_storage)
"euh" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/gm/dirt,
Expand Down Expand Up @@ -14046,6 +14020,10 @@
icon_state = "cult"
},
/area/lv624/ground/caves/south_west_caves)
"eWy" = (
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/south_central_jungle)
"eYh" = (
/obj/structure/surface/rack,
/obj/effect/landmark/objective_landmark/close,
Expand Down Expand Up @@ -15980,6 +15958,10 @@
icon_state = "wall3"
},
/area/lv624/lazarus/crashed_ship_containers)
"jWW" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/south_central_jungle)
"jXT" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/north_east_jungle)
Expand Down Expand Up @@ -16221,6 +16203,10 @@
"kHU" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/caves/sand_temple)
"kJd" = (
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/south_west_jungle)
"kJm" = (
/turf/open/gm/coast/beachcorner2/north_east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
Expand Down Expand Up @@ -16383,6 +16369,9 @@
"ldZ" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_jungle)
"leP" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/south_central_jungle)
"lfy" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/west,
Expand Down Expand Up @@ -16960,6 +16949,10 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
"mzr" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/south_central_jungle)
"mBL" = (
/turf/open/floor{
dir = 1;
Expand Down Expand Up @@ -19381,6 +19374,10 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/colony/north_tcomms_road)
"rVh" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/south_west_jungle)
"rVH" = (
/obj/structure/transmitter/colony_net{
phone_category = "Lazarus Landing";
Expand Down Expand Up @@ -20584,6 +20581,11 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
"uLi" = (
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/lv624/lazarus/secure_storage)
"uLW" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 3
Expand Down Expand Up @@ -21349,6 +21351,9 @@
icon_state = "wood-broken3"
},
/area/lv624/ground/caves/north_central_caves)
"wGX" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/south_central_jungle)
"wHp" = (
/turf/open/floor/plating{
dir = 1;
Expand Down Expand Up @@ -31122,10 +31127,10 @@ aTf
aTf
aTf
aUQ
aWb
aUQ
aUQ
aUQ
uLi
aUQ
aUQ
aTf
Expand Down Expand Up @@ -31351,11 +31356,11 @@ aTf
aTf
aTf
aTf
aWu
aWu
aWu
aTf
aTf
eub
cnf
eub
cnf
uLi
aTf
aTf
aXh
Expand Down Expand Up @@ -31579,13 +31584,13 @@ efp
aTf
aTf
aWc
aUQ
aUQ
aUQ
aTf
aTf
aTf
cWm
eub
eub
uLi
eub
eub
cnf
kJd
aXh
aXh
aKb
Expand Down Expand Up @@ -31807,13 +31812,13 @@ efp
efp
aTf
aTf
cnf
aWv
aWv
aWv
aTf
aXh
aXh
aXh
cnf
xTT
xTT
rVh
qGH
aLj
aXk
Expand Down Expand Up @@ -32038,10 +32043,10 @@ uSq
qIO
qIO
qIO
ntL
mnK
kxI
wkP
qIO
eWy
qtj
mzr
knp
iIU
kZw
Expand Down Expand Up @@ -32266,10 +32271,10 @@ uSq
njC
qIO
qIO
ntL
kxI
tsa
kxI
qIO
qtj
qtj
dwb
rox
wqz
kZw
Expand Down Expand Up @@ -32495,9 +32500,9 @@ hDX
qIO
qIO
aXH
kxI
gGd
kxI
wGX
jWW
leP
kxI
wbK
rHp
Expand Down