Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions code/controllers/subsystem/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ SUBSYSTEM_DEF(mapping)
continue
parsed_maps[pm] = total_z // save the start Z of this file
total_z += bounds[MAP_MAXZ] - bounds[MAP_MINZ] + 1

// multiz compatibility required
if (!length(traits)) // null or empty - default
for (var/i in 1 to total_z)
traits += list(default_traits)
else if (total_z != length(traits)) // mismatch
INIT_ANNOUNCE("WARNING: [length(traits)] trait sets specified for [total_z] z-levels in [path]!")
log_debug("[length(traits)] trait sets specified for [total_z] z-levels in [path]!")
if (total_z < length(traits)) // ignore extra traits
traits.Cut(total_z + 1)
while (total_z > length(traits)) // fall back to defaults on extra levels
Expand Down
4 changes: 4 additions & 0 deletions code/game/turfs/open_space.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr

movable.forceMove(below)
movable.onZImpact(below, height)

/turf/open_space/solid
baseturfs = /turf/open_space/solid
density = TRUE
10 changes: 5 additions & 5 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -21397,7 +21397,7 @@
/turf/open/floor/plating/plating_catwalk/no_build,
/area/almayer/middeck/hanger)
"bcf" = (
/turf/solid_open_space,
/turf/open_space/solid,
/area/almayer/middeck/hanger)
"bcg" = (
/obj/effect/decal/warning_stripes{
Expand Down Expand Up @@ -32729,25 +32729,25 @@
/area/almayer/middeck/maintenance/paft)
"bAW" = (
/obj/effect/attach_point/weapon/dropship1/left_fore,
/turf/solid_open_space,
/turf/open_space/solid,
/area/almayer/middeck/hanger)
"bAX" = (
/obj/effect/attach_point/electronics/dropship1{
dir = 1;
attach_id = 5
},
/turf/solid_open_space,
/turf/open_space/solid,
/area/almayer/middeck/hanger)
"bAY" = (
/obj/effect/attach_point/electronics/dropship1{
dir = 1;
attach_id = 6
},
/turf/solid_open_space,
/turf/open_space/solid,
/area/almayer/middeck/hanger)
"bAZ" = (
/obj/effect/attach_point/weapon/dropship1/right_fore,
/turf/solid_open_space,
/turf/open_space/solid,
/area/almayer/middeck/hanger)
"bBa" = (
/obj/effect/decal/cleanable/dirt,
Expand Down
Loading