Skip to content

Commit

Permalink
TGS Test Merge (#6830)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevinz authored and Kevinz committed Nov 3, 2024
2 parents a2bdd67 + fa77baa commit de7cec5
Show file tree
Hide file tree
Showing 6 changed files with 10,220 additions and 6,142 deletions.
2 changes: 1 addition & 1 deletion _mapload/victory.dm → _mapload/endeavour.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#error Duplicate FORCE_MAP, what are you doing!?
#endif

#define FORCE_MAP "victory"
#define FORCE_MAP "endeavour"
2 changes: 1 addition & 1 deletion maps/endeavour/endeavour.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
traits = list(
ZTRAIT_STATION,
ZTRAIT_FACILITY_SAFETY,
ZTRAIT_LEGACY_BELTER_DOCK,
)
base_turf = /turf/simulated/open
link_below = /datum/map_level/endeavour/ship/deck_three
Expand All @@ -175,6 +174,7 @@
traits = list(
ZTRAIT_STATION,
ZTRAIT_FACILITY_SAFETY,
ZTRAIT_LEGACY_BELTER_DOCK,
)
base_turf = /turf/simulated/open
link_below = /datum/map_level/endeavour/ship/deck_four
Expand Down
Loading

0 comments on commit de7cec5

Please sign in to comment.