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

MALP and Sierra Small Fixes #8

Merged
merged 3 commits into from
Oct 1, 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
67 changes: 60 additions & 7 deletions _maps/shuttles/subshuttles/nanotrasen_malp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
/obj/effect/turf_decal/siding/thinplating/light{
dir = 8
},
/obj/machinery/atmospherics/components/binary/pump/layer4{
dir = 4;
name = "Off Ship Scrubber Network";
desc = "This pumps vents gasses outside the ship. Not to be used when docked inside a hangerbay. A pump that moves gas by pressure."
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
"bW" = (
Expand Down Expand Up @@ -165,6 +170,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
/turf/open/floor/carpet/black,
/area/ship/bridge)
"gC" = (
Expand Down Expand Up @@ -220,6 +228,18 @@
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
"mZ" = (
/obj/structure/window/reinforced/fulltile/shuttle,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/grille,
/obj/machinery/door/poddoor/shutters{
id = "malp_window"
},
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating,
/area/ship/bridge)
"pi" = (
/obj/structure/window/reinforced{
dir = 1
Expand Down Expand Up @@ -257,19 +277,27 @@
/obj/effect/turf_decal/siding/blue{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/turf/open/floor/carpet/black,
/area/ship/bridge)
"rl" = (
/obj/machinery/atmospherics/components/binary/pump/layer2,
/obj/machinery/atmospherics/components/binary/pump/layer4{
dir = 1
},
/obj/effect/turf_decal/siding/thinplating/light{
dir = 1
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/binary/pump/layer4{
dir = 1;
name = "Ship Scrubber Network";
desc = "This pumps vents gasses into another ships scrubber network. To be used when docked inside a hangerbay. A pump that moves gas by pressure."
},
/obj/machinery/atmospherics/components/binary/pump/layer2{
name = "Ship Atmos Network";
desc = "This pumps takes gasses from another ship. To be used when docked inside a hangerbay. A pump that moves gas by pressure."
},
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/bridge)
"tV" = (
Expand Down Expand Up @@ -331,6 +359,9 @@
/obj/machinery/porta_turret/ship/weak{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
/turf/open/floor/plating,
/area/ship/bridge)
"wC" = (
Expand Down Expand Up @@ -477,6 +508,9 @@
name = "MALP Windows"
},
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"Cw" = (
Expand Down Expand Up @@ -514,6 +548,9 @@
/obj/effect/turf_decal/siding/red{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"Gd" = (
Expand Down Expand Up @@ -552,6 +589,15 @@
},
/obj/effect/turf_decal/siding/yellow/end,
/obj/structure/crate_shelf,
/obj/item/storage/firstaid/brute{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/medical,
/obj/item/storage/firstaid/o2,
/obj/item/storage/firstaid/radiation,
/obj/item/storage/firstaid/toxin,
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"Jw" = (
Expand Down Expand Up @@ -581,6 +627,13 @@
},
/turf/open/floor/carpet/black,
/area/ship/bridge)
"Mi" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
dir = 8
},
/turf/open/floor/plating,
/area/ship/bridge)
"MD" = (
/obj/machinery/computer/helm{
dir = 8
Expand Down Expand Up @@ -670,7 +723,6 @@
/area/ship/bridge)
"RF" = (
/obj/structure/railing,
/obj/machinery/light/floor,
/obj/effect/turf_decal/siding/thinplating/light{
dir = 10
},
Expand Down Expand Up @@ -740,6 +792,7 @@
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/closet/secure_closet/security/sec,
/obj/item/ammo_box/c9mm/ap,
/turf/open/floor/plating,
/area/ship/bridge)

Expand Down Expand Up @@ -840,7 +893,7 @@ ei
MD
wX
Bi
Gd
mZ
wA
"}
(11,1,1) = {"
Expand All @@ -851,5 +904,5 @@ wC
wC
Cw
kT
MG
Mi
"}
Loading
Loading