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

Resurrect Cargonia #6916

Merged
merged 14 commits into from
Dec 16, 2024
Merged

Resurrect Cargonia #6916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e9faba0
shuttle changes
washikarasu Dec 12, 2024
54b3223
cargonia
washikarasu Dec 12, 2024
186f30f
tritium
washikarasu Dec 12, 2024
25c44e0
academic level fix
washikarasu Dec 12, 2024
dbc0cdf
fire alarms where I thought some lacked
washikarasu Dec 12, 2024
0d3b1f2
i did a goof :), its fixed
washikarasu Dec 12, 2024
417278a
Merge branch 'master' into cargo
washikarasu Dec 12, 2024
2edd054
swapping paint stripes for paint
washikarasu Dec 12, 2024
5427bd2
Merge branch 'cargo' of https://github.com/washikarasu/A-Repo-To-Repa…
washikarasu Dec 12, 2024
3629b2a
paint touchups again
washikarasu Dec 12, 2024
0fe2839
last touchups for now
washikarasu Dec 12, 2024
ff58c9c
Merge branch 'master' into cargo
washikarasu Dec 13, 2024
b6721d7
Merge branch 'master' into cargo
washikarasu Dec 15, 2024
3d018d7
Merge branch 'master' into cargo
washikarasu Dec 16, 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
2 changes: 1 addition & 1 deletion maps/endeavour/levels/deck1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7883,7 +7883,7 @@
"fND" = (
/obj/structure/memorial{
name = "NSV Endeavour's Builder's Plate";
desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminis Melro, B.S.E; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow."
desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminis Melro, A.P., Ph.D.; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow."
},
/turf/simulated/wall/prepainted/civilian,
/area/station/stairs_one)
Expand Down
31 changes: 2 additions & 29 deletions maps/endeavour/levels/deck2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19856,21 +19856,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"mMY" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/open,
/area/rnd/research/researchdivision)
"mNh" = (
/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/fpmaint2)
Expand Down Expand Up @@ -21772,18 +21757,6 @@
},
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/general)
"nXl" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/railing{
dir = 4
},
/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/open,
/area/rnd/research/researchdivision)
"nXm" = (
/turf/simulated/floor/tiled/dark,
/area/rnd/anomaly_lab/containment_two)
Expand Down Expand Up @@ -52104,8 +52077,8 @@ kCt
kCt
cda
lBS
mMY
nXl
lBS
lBS
lBS
ffI
vWo
Expand Down
Loading
Loading