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.

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

Fix: Black Mesa and Space Hotel #904

Merged
merged 3 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 43 additions & 10 deletions _maps/map_files220/RandomZLevels/blackmesa.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2343,7 +2343,7 @@
"cTV" = (
/obj/structure/alien/xenoweeds,
/obj/effect/bump_teleporter{
id = "lambda_xen";
id = "lambda_lab_gate";
density = 0
},
/turf/simulated/floor/engine,
Expand Down Expand Up @@ -3619,6 +3619,11 @@
/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/fast,
/turf/simulated/floor/mineral/titanium,
/area/awaymission/black_mesa/entrance)
"etS" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/acid_lake_building)
"etZ" = (
/obj/effect/bump_teleporter{
id = "lambda2";
Expand Down Expand Up @@ -3697,6 +3702,10 @@
/obj/machinery/door/airlock/public,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_science_room)
"exS" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/deep_sci_storage)
"eyf" = (
/obj/structure/flora/biolumini/mine,
/turf/simulated/floor/beach/away/coastline/xen{
Expand Down Expand Up @@ -7864,6 +7873,14 @@
icon_state = "alienvault"
},
/area/awaymission/black_mesa/xen/nihilanth_arena)
"jLi" = (
/obj/structure/inflatable{
opacity = 1;
color = "#556B2F"
},
/obj/machinery/recharge_station,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/xen/acid_lake_building)
"jLu" = (
/obj/structure/sign/chemistry{
pixel_y = -32
Expand Down Expand Up @@ -8333,6 +8350,10 @@
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
"koI" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/cryo_room)
"kpg" = (
/obj/structure/cable{
d1 = 2;
Expand Down Expand Up @@ -10322,8 +10343,8 @@
/area/awaymission/black_mesa/science_labs)
"mMa" = (
/obj/effect/bump_teleporter/lambda{
id = "lambda_xen2";
id_target = "lambda2";
id = "lambda_xen3";
id_target = "lambda_lab_gate";
color = "lime"
},
/turf/simulated/floor/vault{
Expand Down Expand Up @@ -15256,6 +15277,10 @@
/obj/structure/alien/xenoweeds,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/science_decon_room)
"sCM" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/wood/fancy/cherry,
/area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth)
"sCN" = (
/obj/structure/table,
/obj/item/paper_bin{
Expand Down Expand Up @@ -17450,6 +17475,10 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/security_outpost)
"vug" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/xen/acid_lake_building)
"vuI" = (
/obj/structure/flora/biolumini/mine/weaklight,
/turf/simulated/floor/plating/xen,
Expand Down Expand Up @@ -19251,6 +19280,10 @@
/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/tram_room)
"xGZ" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/cryo_storage)
"xHI" = (
/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen,
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -32451,7 +32484,7 @@ qeH
rvt
pTC
uzo
uzo
etS
pzr
uzo
lUJ
Expand Down Expand Up @@ -32563,7 +32596,7 @@ qQx
lQm
lQm
nmA
aHI
sCM
aHI
aHI
nmA
Expand Down Expand Up @@ -32966,9 +32999,9 @@ pzr
aNx
pzr
pzr
pzr
jLi
uzo
xlP
vug
pzr
jSI
uCx
Expand Down Expand Up @@ -57660,7 +57693,7 @@ cBU
cBU
cBU
dgN
sHE
exS
mIc
wBx
mIc
Expand Down Expand Up @@ -65679,9 +65712,9 @@ ptr
ptr
uDt
pOl
pOl
koI
xZT
bBe
xGZ
xzz
bBe
bBe
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/maps220/code/Areas/away.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
icon_state = "awaycontent9"

/area/ruin/space/spacehotelv1/entryhallway
name = "awaycontent17"
name = "Hotel Entry Hallway"
icon_state = "awaycontent10"

/area/ruin/space/spacehotelv1/restoraunt3
Expand Down