Skip to content

Commit

Permalink
TGS Test Merge (#6916)
Browse files Browse the repository at this point in the history
  • Loading branch information
lordme authored and lordme committed Dec 12, 2024
2 parents 6f30272 + 0d3b1f2 commit 2b026e6
Show file tree
Hide file tree
Showing 4 changed files with 5,782 additions and 3,797 deletions.
2 changes: 1 addition & 1 deletion maps/endeavour/levels/deck1.dmm
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
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

0 comments on commit 2b026e6

Please sign in to comment.