Skip to content

Commit

Permalink
updating.
Browse files Browse the repository at this point in the history
  • Loading branch information
Venuska1117 committed Jul 29, 2024
1 parent bf4f773 commit c4bf3d6
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 43 deletions.
3 changes: 3 additions & 0 deletions code/game/area/strata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,11 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed

/area/strata/ag/exterior/marsh/island_marshes
name = "Cryo-Thermal Island Marshes"
is_landing_zone = TRUE

/area/strata/ag/exterior/marsh/relay_marshes
name = "Cryo-Thermal Relay Marshes"
is_landing_zone = TRUE

/area/strata/ag/exterior/marsh/center
name = "Cryo-Thermal Springs"
Expand Down Expand Up @@ -356,6 +358,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed

/area/strata/ag/interior/outside/checkpoints/south
name = "Landing Zone South Security Checkpoint"
is_landing_zone = TRUE

/area/strata/ag/interior/outside/checkpoints/outpost
name = "Outpost Deck Security Checkpoint"
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/colonialmarines/colonialmarines.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define HIJACK_EXPLOSION_COUNT 5
#define MARINE_MAJOR_ROUND_END_DELAY (3 MINUTES)
#define LZ_HAZARD_START (3 MINUTES)
#define LZ_HAZARD_START (2 SECONDS)

/datum/game_mode/colonialmarines
name = "Distress Signal"
Expand Down
110 changes: 68 additions & 42 deletions maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11013,7 +11013,7 @@
/obj/structure/pipes/standard/manifold/hidden/cyan,
/obj/structure/machinery/light,
/turf/open/floor/strata/floor3,
/area/strata/ag/interior/landing_zones/near_lz1)
/area/strata/ag/interior/mining_outpost/south_dormitories)
"aRF" = (
/obj/structure/pipes/standard/manifold/hidden/cyan,
/turf/open/floor/strata,
Expand Down Expand Up @@ -11285,11 +11285,11 @@
pixel_y = -8
},
/turf/closed/wall/strata_outpost/reinforced,
/area/strata/ag/interior/landing_zones/near_lz1)
/area/strata/ag/interior/mining_outpost/south_dormitories)
"aSS" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic,
/turf/open/floor/strata/multi_tiles/southeast,
/area/strata/ag/interior/landing_zones/near_lz1)
/area/strata/ag/interior/mining_outpost/south_dormitories)
"aST" = (
/turf/open/floor/strata/multi_tiles/southeast,
/area/strata/ag/interior/landing_zones/near_lz1)
Expand Down Expand Up @@ -25427,7 +25427,7 @@
"gpr" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/asphalt/cement,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"gpO" = (
/obj/structure/bed/chair/office/light{
dir = 1
Expand Down Expand Up @@ -26664,6 +26664,12 @@
"iEU" = (
/turf/closed/wall/strata_outpost,
/area/strata/ug/interior/outpost/underground_dorms/med1)
"iGm" = (
/obj/structure/machinery/light{
dir = 1
},
/turf/open/floor/strata/floor3,
/area/strata/ag/interior/mining_outpost/south_dormitories)
"iGp" = (
/obj/structure/machinery/power/reactor/colony,
/obj/structure/machinery/camera/autoname,
Expand Down Expand Up @@ -28102,6 +28108,10 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/auto_turf/strata_grass/layer0,
/area/strata/ug/interior/jungle/platform/east)
"lmF" = (
/obj/structure/pipes/vents/pump/on,
/turf/open/floor/strata/floor3,
/area/strata/ag/interior/mining_outpost/south_dormitories)
"lno" = (
/turf/closed/wall/strata_outpost,
/area/strata/ug/interior/jungle/structures/monitoring/south)
Expand Down Expand Up @@ -28157,7 +28167,7 @@
dir = 1
},
/turf/open/asphalt/cement,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"lrO" = (
/obj/structure/cargo_container/wy/mid,
/turf/open/auto_turf/ice/layer0,
Expand Down Expand Up @@ -28680,6 +28690,9 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
/turf/open/auto_turf/strata_grass/layer1,
/area/strata/ug/interior/jungle/tearlake)
"miI" = (
/turf/open/floor/strata/multi_tiles/southeast,
/area/strata/ag/interior/mining_outpost/south_dormitories)
"miL" = (
/obj/structure/stairs/perspective{
color = "#6e6e6e";
Expand Down Expand Up @@ -29527,7 +29540,7 @@
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/machinery/recharge_station,
/turf/open/floor/strata/floor3/east,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"nQE" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/auto_turf/strata_grass/layer1,
Expand Down Expand Up @@ -30385,7 +30398,7 @@
dir = 1
},
/turf/open/floor/strata/floor3/east,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"psQ" = (
/obj/structure/machinery/power/apc/directional/no_power/south,
/turf/open/floor/strata/floor3/east,
Expand Down Expand Up @@ -30773,6 +30786,13 @@
/obj/effect/blocker/sorokyne_cold_water,
/turf/open/gm/river,
/area/strata/ag/exterior/marsh/water)
"pWz" = (
/obj/structure/pipes/standard/simple/hidden/cyan{
dir = 4
},
/obj/structure/machinery/light,
/turf/open/floor/strata/floor3,
/area/strata/ag/interior/mining_outpost/south_dormitories)
"pWP" = (
/obj/structure/pipes/standard/simple/hidden/cyan,
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
Expand All @@ -30784,7 +30804,7 @@
/obj/effect/decal/cleanable/blood/oil,
/obj/effect/decal/cleanable/blood/gibs/core,
/turf/open/floor/strata/floor3/east,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"pYI" = (
/turf/open/floor/strata/floor3/east,
/area/strata/ug/interior/outpost/underground_dorms/admin1)
Expand Down Expand Up @@ -31102,7 +31122,7 @@
"qDI" = (
/obj/structure/machinery/power/reactor/colony,
/turf/open/floor/strata/floor3/east,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"qFH" = (
/obj/structure/filingcabinet,
/turf/open/floor/strata/floor2,
Expand Down Expand Up @@ -32090,6 +32110,9 @@
/obj/structure/fence,
/turf/open/asphalt/cement/cement9,
/area/strata/ag/interior/outside/engineering/parts_storage_exterior)
"swQ" = (
/turf/open/floor/strata/floor3/east,
/area/strata/ag/interior/outside/checkpoints/south)
"sxr" = (
/obj/effect/blocker/sorokyne_cold_water,
/obj/structure/platform_decoration/strata{
Expand Down Expand Up @@ -33012,7 +33035,7 @@
/area/strata/ag/exterior/marsh/relay_marshes)
"ubN" = (
/turf/open/asphalt/cement,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"ucl" = (
/obj/structure/bed/chair{
dir = 8
Expand Down Expand Up @@ -34640,6 +34663,9 @@
"xje" = (
/turf/open/asphalt/cement/cement1,
/area/strata/ag/interior/outside/engineering/parts_storage_exterior)
"xjp" = (
/turf/open/floor/strata/orange_cover,
/area/strata/ag/interior/mining_outpost/south_dormitories)
"xjr" = (
/turf/open/auto_turf/strata_grass/layer0,
/area/strata/ug/interior/jungle/platform/east)
Expand Down Expand Up @@ -34853,7 +34879,7 @@
"xDu" = (
/obj/structure/sign/nosmoking_2,
/turf/closed/wall/strata_outpost/reinforced,
/area/strata/ag/interior/outside/engineering/parts_storage)
/area/strata/ag/interior/outside/checkpoints/south)
"xDD" = (
/obj/effect/decal/cleanable/blood,
/turf/open/auto_turf/strata_grass/layer0_mud,
Expand Down Expand Up @@ -39726,9 +39752,9 @@ chq
aMB
aJP
ctC
aOS
aQv
aRC
iGm
aPh
pWz
aSR
aUu
aWi
Expand Down Expand Up @@ -39901,9 +39927,9 @@ aIn
aLf
aMB
aNJ
aOP
aQv
aRA
xjp
aPh
clW
aSS
ctx
cty
Expand Down Expand Up @@ -40076,10 +40102,10 @@ chq
aLf
aMB
fno
aoj
aQv
cnv
aST
ckX
aPh
cov
miI
spJ
cty
cty
Expand Down Expand Up @@ -40251,8 +40277,8 @@ chr
bWy
aMB
cjv
aoj
aQw
ckX
lmF
aRD
aSR
aUv
Expand Down Expand Up @@ -40426,9 +40452,9 @@ fWV
aLg
aMB
cjv
aoj
aQv
cnv
ckX
aPh
cov
aac
aac
aWk
Expand Down Expand Up @@ -40601,10 +40627,10 @@ aJQ
aLh
aMB
cjv
aOP
aQv
aRA
nog
xjp
aPh
clW
cnB
aac
aWk
bnm
Expand Down Expand Up @@ -40776,10 +40802,10 @@ ceq
aLi
aMD
crY
aOS
aQv
cnv
azx
iGm
aPh
cov
cjw
aac
bXc
jgX
Expand Down Expand Up @@ -46621,7 +46647,7 @@ vrH
rXy
aac
aac
hYc
cwT
cwT
cbO
ixS
Expand Down Expand Up @@ -46796,11 +46822,11 @@ mCK
qfC
aac
aac
hYc
cwT
qDI
gpr
tRC
hYc
swQ
cwT
aac
bxy
xCX
Expand Down Expand Up @@ -46971,11 +46997,11 @@ vrH
rXy
aac
aac
hYc
cwT
psE
lrd
pXB
hYc
cwT
aac
bea
bxy
Expand Down Expand Up @@ -47149,8 +47175,8 @@ aac
xDu
nQk
ubN
tRC
hYc
swQ
cwT
aac
aac
bea
Expand Down

0 comments on commit c4bf3d6

Please sign in to comment.