diff --git a/code/__defines/_layers.dm b/code/__defines/_layers.dm index 3fd13ad3b03..d6d454cd1be 100644 --- a/code/__defines/_layers.dm +++ b/code/__defines/_layers.dm @@ -32,6 +32,11 @@ #define LAYER_UNDER_TABLE 2.79 #define LAYER_ABOVE_TABLE 2.81 +#define OVERMAP_SECTOR_LAYER 3.01 +#define OVERMAP_IMPORTANT_SECTOR_LAYER 3.02 +#define OVERMAP_SHIP_LAYER 3.03 +#define OVERMAP_SHUTTLE_LAYER 3.03 + #define MECH_UNDER_LAYER 4 #define MECH_BASE_LAYER 4.01 #define MECH_HATCH_LAYER 4.02 diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index 22c537d7bfd..c0ec90ebcfd 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -15,6 +15,8 @@ var/generic_object = TRUE //Used to give basic scan descriptions of every generic overmap object that excludes noteworthy locations, ships and exoplanets var/static_vessel = FALSE //Used to expand scan details for visible space stations + layer = OVERMAP_SECTOR_LAYER + var/list/map_z = list() var/known = 0 //shows up on nav computers automatically diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index 54607e704ac..6c9914a1b8f 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -9,6 +9,7 @@ var/status = SHIP_STATUS_LANDED icon_state = "shuttle" moving_state = "shuttle_moving" + layer = OVERMAP_SHUTTLE_LAYER /obj/effect/overmap/visitable/ship/landable/Destroy() shuttle_moved_event.unregister(SSshuttle.shuttles[shuttle], src) diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm index 477b171adf7..2987b258758 100644 --- a/code/modules/overmap/ships/ship.dm +++ b/code/modules/overmap/ships/ship.dm @@ -22,6 +22,8 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND) generic_object = FALSE var/moving_state = "ship_moving" + layer = OVERMAP_SHIP_LAYER + //RP fluff details to appear on scan readouts for mobile objects. var/propulsion = "Chemical Composite Gas Thrust" //Slower than light propulsion method. No variation in this currently exists yet except the Horizon which heats its gas. var/drive = "None equipped, FTL incapable" //Faster than light propulsion method, will usually be warp drives for third party ships and nothing for shuttles diff --git a/html/changelogs/geeves-overmap_layering.yml b/html/changelogs/geeves-overmap_layering.yml new file mode 100644 index 00000000000..107501640ac --- /dev/null +++ b/html/changelogs/geeves-overmap_layering.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added layering to the overmap, which sectors being on the bottom, ships in the middle, and shuttles on top." \ No newline at end of file