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

fixing the atlas explo shuttle cargo transfer system #6922

Merged
merged 2 commits into from
Dec 20, 2024
Merged

fixing the atlas explo shuttle cargo transfer system #6922

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7289c
fixing the atlas explo shuttle cargo transfer system
GySgtMurphy Dec 14, 2024
4062adc
Merge branch 'master' into Atlas-Explo-Shuttle-tweaks-n'-fixes
GySgtMurphy Dec 20, 2024
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
44 changes: 41 additions & 3 deletions maps/rift/levels/rift-06-surface3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16937,6 +16937,23 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
"byF" = (
/obj/machinery/door/blast/regular{
density = 0;
dir = 4;
icon_state = "pdoor0";
id = "shuttle blast";
name = "Shuttle Blast Doors";
opacity = 0
},
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint_stripe/violet,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/shuttle/excursion/cargo)
"bBv" = (
/obj/map_helper/airlock/door/int_door,
/obj/structure/cable/green{
Expand Down Expand Up @@ -17041,6 +17058,15 @@
/obj/structure/flora/tree/pine,
/turf/simulated/floor/outdoors/snow/noblend/lythios43c,
/area/rift/surfacebase/outside/outside3)
"bKl" = (
/obj/effect/paint/black,
/obj/effect/paint_stripe/violet,
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/wall/rshull,
/area/shuttle/excursion/cargo)
"bKm" = (
/obj/structure/flora/grass/both{
pixel_x = 6;
Expand Down Expand Up @@ -25273,6 +25299,14 @@
/obj/effect/debris/cleanable/blood/oil/streak,
/turf/simulated/floor,
/area/shuttle/oldcentury)
"qss" = (
/obj/effect/paint/black,
/obj/effect/paint_stripe/violet,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/wall/rshull,
/area/shuttle/excursion/cargo)
"qsA" = (
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -28677,6 +28711,10 @@
"wJJ" = (
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint_stripe/violet,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/shuttle/excursion/cargo)
"wKU" = (
Expand Down Expand Up @@ -44268,7 +44306,7 @@ oGm
oGm
afV
aQn
mHU
byF
avr
amn
aej
Expand Down Expand Up @@ -44462,7 +44500,7 @@ axn
lxt
dcP
wJJ
lxt
bKl
azE
amn
aej
Expand Down Expand Up @@ -44656,7 +44694,7 @@ aHo
aYI
afV
aVj
lxt
qss
lxt
amn
aej
Expand Down
Loading