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
8 changes: 3 additions & 5 deletions code/controllers/subsystems/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ SUBSYSTEM_DEF(mapping)
var/base_floor_area
/// A list of connected z-levels to avoid repeatedly rebuilding connections
var/list/connected_z_cache = list()
/// A list of turbolift holders to initialize.
var/list/turbolifts_to_initialize = list()
///Associative list of planetoid/exoplanet data currently registered. The key is the planetoid id, the value is the planetoid_data datum.
var/list/planetoid_data_by_id
///List of all z-levels in the world where the index corresponds to a z-level, and the key at that index is the planetoid_data datum for the associated planet
Expand Down Expand Up @@ -169,9 +167,9 @@ SUBSYSTEM_DEF(mapping)

global.level_persistence_ref_map.Cut()

// Generate turbolifts last, since away sites may have elevators to generate too.
for(var/obj/abstract/turbolift_spawner/turbolift as anything in turbolifts_to_initialize)
turbolift.build_turbolift()
for(var/modpack_name in SSmodpacks.loaded_modpacks)
var/decl/modpack/loaded_modpack = SSmodpacks.loaded_modpacks[modpack_name]
loaded_modpack.on_mapping_pre_finalize()

// With levels set up and serde complete (and levels flagged) we can do any remaining level generation.
global.using_map.finalize_map_generation()
Expand Down
9 changes: 3 additions & 6 deletions code/controllers/subsystems/misc_late.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@ SUBSYSTEM_DEF(misc_late)
name = "Late Initialization"
init_order = SS_INIT_MISC_LATE
flags = SS_NO_FIRE
var/list/turbolifts_to_open = list()

/datum/controller/subsystem/misc_late/Initialize()

var/decl/asset_cache/asset_cache = GET_DECL(/decl/asset_cache)
asset_cache.load()

// This is gross but I'm not sure where else to handle it. Sorry.
for(var/datum/turbolift/lift in turbolifts_to_open)
if(!QDELETED(lift))
lift.open_doors()
turbolifts_to_open.Cut()
for(var/modpack_name in SSmodpacks.loaded_modpacks)
var/decl/modpack/loaded_modpack = SSmodpacks.loaded_modpacks[modpack_name]
loaded_modpack.on_misc_late_init()

// Pre-populate the emote list.
decls_repository.get_decls_of_type(/decl/emote)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/turbolift/turbolift_turfs.dm

This file was deleted.

1 change: 0 additions & 1 deletion code/unit_tests/offset_tests.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
var/static/list/exception_types = list(
/obj/machinery/light,
/obj/machinery/camera,
/obj/structure/lift/button/standalone,
/obj/structure/hygiene/sink
)

Expand Down
78 changes: 21 additions & 57 deletions maps/example/example-1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@
"gO" = (
/turf/wall/titanium,
/area/shuttle/ferry)
"gT" = (
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
/turf/floor/tiled/steel_grid,
/area/example/first)
"he" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
Expand Down Expand Up @@ -225,9 +219,7 @@
dir = 1
},
/obj/structure/ladder,
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/effect/floor_decal/industrial/warning/full,
/turf/floor/tiled/dark/monotile,
/area/example/first)
"mo" = (
Expand Down Expand Up @@ -427,10 +419,6 @@
/obj/machinery/light,
/turf/floor/tiled/steel_grid,
/area/example/first)
"tA" = (
/obj/abstract/turbolift_spawner/example,
/turf/floor,
/area/turbolift/example/first)
"uD" = (
/obj/machinery/light,
/turf/floor,
Expand Down Expand Up @@ -652,15 +640,6 @@
/obj/machinery/light,
/turf/floor/tiled/steel_grid,
/area/example/first)
"FZ" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
/obj/machinery/light{
dir = 4
},
/turf/floor,
/area/example/first)
"Gg" = (
/obj/structure/railing/mapped{
dir = 1
Expand Down Expand Up @@ -762,15 +741,9 @@
},
/turf/floor/tiled/steel_grid,
/area/example/first)
"LM" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/floor,
/area/example/first)
"LP" = (
/turf/floor/plating,
/area/turbolift/example/first)
/turf/floor/tiled/dark/monotile,
/area/example/first)
"LW" = (
/obj/machinery/teleport/station,
/turf/floor/tiled/dark/monotile,
Expand Down Expand Up @@ -810,12 +783,6 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/floor/tiled/dark/monotile,
/area/example/first)
"Pp" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
/turf/floor,
/area/example/first)
"Pv" = (
/obj/structure/rack,
/obj/item/gun/projectile/shotgun/pump,
Expand Down Expand Up @@ -871,9 +838,6 @@
},
/turf/floor/tiled/steel_grid,
/area/example/first)
"RW" = (
/turf/floor,
/area/turbolift/example/first)
"Ss" = (
/obj/structure/tank_rack/oxygen,
/obj/effect/floor_decal/corner/orange/half{
Expand Down Expand Up @@ -932,10 +896,10 @@
/turf/floor,
/area/example/first)
"Wi" = (
/obj/effect/floor_decal/industrial/warning/fulltile,
/obj/effect/floor_decal/industrial/warning{
dir = 8
/obj/effect/floor_decal/corner/orange{
dir = 6
},
/obj/effect/floor_decal/industrial/warning,
/turf/floor/tiled/steel_grid,
/area/example/first)
"Wj" = (
Expand Down Expand Up @@ -2892,9 +2856,9 @@ XZ
XZ
XZ
mc
xT
gT
Pp
CU
WW
Yp
VY
kw
kw
Expand Down Expand Up @@ -2946,9 +2910,9 @@ KT
oz
XZ
LP
LP
tA
LM
CU
WW
Yp
VY
kw
kw
Expand Down Expand Up @@ -3000,9 +2964,9 @@ CU
oz
XZ
LP
LP
RW
LM
CU
WW
Yp
on
he
tt
Expand Down Expand Up @@ -3054,9 +3018,9 @@ CU
oz
XZ
LP
LP
RW
LM
CU
WW
Yp
Yp
WF
WF
Expand Down Expand Up @@ -3107,10 +3071,10 @@ Mc
CU
oz
XZ
LP
hA
Wi
Wi
Wi
FZ
WS
Yp
jP
HA
Expand Down
36 changes: 26 additions & 10 deletions maps/example/example-2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/structure/railing/mapped{
dir = 4
},
/turf/floor/tiled/dark/monotile,
/area/example/second)
"kf" = (
Expand Down Expand Up @@ -495,6 +498,9 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/structure/railing/mapped{
dir = 4
},
/turf/floor/tiled/steel_grid,
/area/example/second)
"Gn" = (
Expand Down Expand Up @@ -649,14 +655,24 @@
},
/turf/floor,
/area/example/second)
"Vp" = (
/obj/structure/ladder,
/obj/structure/railing/mapped{
dir = 4
},
/turf/open,
/area/example/second)
"VG" = (
/obj/machinery/fabricator/bioprinter,
/obj/effect/floor_decal/corner/blue/mono,
/turf/floor/tiled/white/monotile,
/area/example/second)
"VL" = (
/obj/structure/sign/warning/fall{
pixel_y = 32
},
/turf/open,
/area/turbolift/example/second)
/area/example/second)
"WW" = (
/obj/effect/floor_decal/corner/mauve/mono,
/obj/machinery/recycler,
Expand Down Expand Up @@ -2588,7 +2604,7 @@ sA
XE
XE
XE
NY
Vp
jW
FE
Gn
Expand Down Expand Up @@ -2643,8 +2659,8 @@ qV
CW
XE
VL
VL
VL
wP
wP
Gn
wP
wP
Expand Down Expand Up @@ -2696,9 +2712,9 @@ CW
CW
CW
XE
VL
VL
VL
wP
wP
wP
Gn
wP
wP
Expand Down Expand Up @@ -2750,9 +2766,9 @@ CW
CW
CW
XE
VL
VL
VL
wP
wP
wP
Gn
wP
wP
Expand Down
Loading
Loading