From 383e09651fcea0f63bbd72f43fee0f6f7391f21d Mon Sep 17 00:00:00 2001 From: r4d6 Date: Sat, 21 Dec 2019 14:55:37 -0500 Subject: [PATCH] Suggestions --- code/controllers/subsystem/air.dm | 6 +++--- code/controllers/subsystem/mapping.dm | 4 +--- code/game/objects/effects/landmarks.dm | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 193756dc5a..0cd2e94b72 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -382,6 +382,9 @@ SUBSYSTEM_DEF(air) CHECK_TICK /datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines) + if(!initialized) + return + for(var/A in atmos_machines) var/obj/machinery/atmospherics/AM = A AM.atmosinit() @@ -392,9 +395,6 @@ SUBSYSTEM_DEF(air) AM.build_network() CHECK_TICK - if(!initialized) - return - /datum/controller/subsystem/air/proc/get_init_dirs(type, dir) if(!pipe_init_dirs_cache[type]) pipe_init_dirs_cache[type] = list() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index db2ea74157..8c8ad2d337 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -528,16 +528,14 @@ GLOBAL_LIST_EMPTY(the_station_areas) isolated_ruins_z = add_new_zlevel("Isolated Ruins/Reserved", list(ZTRAIT_RESERVED = TRUE, ZTRAIT_ISOLATED_RUINS = TRUE)) initialize_reserved_level(isolated_ruins_z.z_value) return isolated_ruins_z.z_value - + // Station Ruins /datum/controller/subsystem/mapping var/list/station_room_templates = list() /datum/controller/subsystem/mapping/proc/seedStation() - message_admins("Seeding Station") for(var/V in GLOB.stationroom_landmarks) var/obj/effect/landmark/stationroom/LM = V LM.load() - message_admins("Station seeded") if(GLOB.stationroom_landmarks.len) seedStation() //I'm sure we can trust everyone not to insert a 1x1 rooms which loads a landmark which loads a landmark which loads a la... diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 42f554e27f..297d69a215 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -464,15 +464,14 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) var/datum/map_template/template = SSmapping.station_room_templates[template_name] if(!template) return FALSE - testing("Ruin \"[template_name]\" placed at ([T.x], [T.y], [T.z])") + testing("Room \"[template_name]\" placed at ([T.x], [T.y], [T.z])") template.load(T, centered = FALSE) template.loaded++ GLOB.stationroom_landmarks -= src qdel(src) - message_admins("Stationroom loaded successfully") return TRUE -// The landmark for the Engine +// The landmark for the Engine on Box /obj/effect/landmark/stationroom/box/engine template_names = list("Engine SM", "Engine Singulo", "Engine Tesla")