Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master220' into grey_species_r…
Browse files Browse the repository at this point in the history
…ework
  • Loading branch information
Samirakis committed Dec 24, 2024
2 parents ff0b8ac + 2855464 commit efe1887
Show file tree
Hide file tree
Showing 189 changed files with 36,178 additions and 35,425 deletions.
12 changes: 11 additions & 1 deletion _maps/__MAP_DEFINES.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
#define SPAWN_RUINS "Spawn Ruins"
// Ghost role Taipan z-level.
#define TAIPAN "RaMSS Taipan"
// Reserved z-level used only by shuttles
#define RESERVED_LEVEL "Transit/Reserved"

// Level names
#define CENTCOMM "CentComm"
Expand All @@ -41,16 +43,21 @@
#define EMPTY_AREA "Empty Area"
#define AWAY_MISSION "Away Mission"
#define RAMSS_TAIPAN "RAMSS Taipan"
#define RESERVED_ZONE "Transit/Reserved"

/*
2024-01-14, the typical z-levels for a single-level station are:
You can change orders for z-level(from 3 to last cause centcom and admin are compiled right into) and everything shouldn't break
If something breaks due to z order change, it means it's hardcoded and then it means someone fucked up in coding.
2024-06-18, the typical z-levels for a single-level station are:
1: CentCom
2: Admin Zone
3: Station
4: Mining
5: Taipan
6: Away mission
7-11: Randomized space
last: Transit
*/

// Whether this z level is linked up/down. Bool.
Expand Down Expand Up @@ -81,3 +88,6 @@
#define PLACE_LAVA_RUIN "lavaland"

#define MAX_RUIN_SIZE_VALUE 170 // Which ruin should be considered large and create a separate level of space for it.

//Reserved/Transit turf type
#define RESERVED_TURF_TYPE /turf/space
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
height = 30;
id = "freegolem";
name = "Free Golem Ship";
width = 20
width = 20;
preferred_direction = 4
},
/turf/simulated/floor/pod/dark,
/area/shuttle/freegolem)
Expand Down
3 changes: 2 additions & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,8 @@
id = "whiteship";
name = "NT Medical Ship";
rebuildable = 1;
width = 17
width = 17;
preferred_direction = 4
},
/turf/simulated/floor/plating,
/area/shuttle/abandoned)
Expand Down
Loading

0 comments on commit efe1887

Please sign in to comment.