diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index fed5fe3b79b..d7f087523bb 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -266,8 +266,11 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) WRITE_LOG(GLOB.config_error_log, text) SEND_TEXT(world.log, text) -/proc/log_mapping(text) +/proc/log_mapping(text, skip_world_log) WRITE_LOG(GLOB.world_map_error_log, text) + if(skip_world_log) + return + SEND_TEXT(world.log, text) /proc/log_perf(list/perf_info) . = "[perf_info.Join(",")]\n" diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 155ad474ec4..3581c0284c1 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -349,7 +349,9 @@ Example config: if ("map") currentmap = load_map_config(data, MAP_DIRECTORY_MAPS) if(currentmap.defaulted) - log_config("Failed to load map config for [data]!") + var/error_message = "Failed to load map config for [data]!" + log_config(error_message) + log_mapping(error_message, TRUE) currentmap = null if ("minplayers","minplayer") currentmap.config_min_users = text2num(data) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index ba0fb0ee9ba..0d062acbc0f 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -157,13 +157,13 @@ SUBSYSTEM_DEF(shuttle) has_purchase_shuttle_access = init_has_purchase_shuttle_access() if(!arrivals) - WARNING("No /obj/docking_port/mobile/arrivals placed on the map!") + log_mapping("No /obj/docking_port/mobile/arrivals placed on the map!") if(!emergency) - WARNING("No /obj/docking_port/mobile/emergency placed on the map!") + log_mapping("No /obj/docking_port/mobile/emergency placed on the map!") if(!backup_shuttle) - WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!") + log_mapping("No /obj/docking_port/mobile/emergency/backup placed on the map!") if(!supply) - WARNING("No /obj/docking_port/mobile/supply placed on the map!") + log_mapping("No /obj/docking_port/mobile/supply placed on the map!") return ..() /datum/controller/subsystem/shuttle/proc/setup_shuttles(list/stationary) @@ -830,11 +830,11 @@ SUBSYSTEM_DEF(shuttle) found++ if(found > 1) qdel(P, force=TRUE) - log_world("Map warning: Shuttle Template [S.mappath] has multiple mobile docking ports.") + log_mapping("Shuttle Template [S.mappath] has multiple mobile docking ports.") else preview_shuttle = P if(istype(P, /obj/docking_port/stationary)) - log_world("Map warning: Shuttle Template [S.mappath] has a stationary docking port.") + log_mapping("Shuttle Template [S.mappath] has a stationary docking port.") if(!found) var/msg = "load_template(): Shuttle Template [S.mappath] has no mobile docking port. Aborting import." for(var/T in affected) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 6c2403da1e8..41cabc0e899 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -243,7 +243,7 @@ for(var/atom/movable/AM in location) if(AM != src && insert(AM, mapload) == LOCKER_FULL) // limit reached if(mapload) // Yea, it's a mapping issue. Blame mappers. - WARNING("Closet storage capacity of [type] exceeded on mapload at [AREACOORD(src)]") + log_mapping("Closet storage capacity of [type] exceeded on mapload at [AREACOORD(src)]") break for(var/i in reverse_range(location.get_all_contents())) var/atom/movable/thing = i diff --git a/code/modules/mapping/space_management/zlevel_manager.dm b/code/modules/mapping/space_management/zlevel_manager.dm index 9d6d0a37709..2ad150ebc4b 100644 --- a/code/modules/mapping/space_management/zlevel_manager.dm +++ b/code/modules/mapping/space_management/zlevel_manager.dm @@ -7,7 +7,7 @@ var/list/default_map_traits = DEFAULT_MAP_TRAITS if (default_map_traits.len != world.maxz) - WARNING("More or less map attributes pre-defined ([default_map_traits.len]) than existent z-levels ([world.maxz]). Ignoring the larger.") + log_mapping("More or less map attributes pre-defined ([default_map_traits.len]) than existent z-levels ([world.maxz]). Ignoring the larger.") if (default_map_traits.len > world.maxz) default_map_traits.Cut(world.maxz + 1) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index d8c733c5383..3fe6cec2586 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -315,7 +315,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET if (area) if (area.apc) - WARNING("Duplicate APC created at [AREACOORD(src)]") + log_mapping("Duplicate APC created at [AREACOORD(src)]") area.apc = src update_appearance() diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 76a4b35b452..d3854a226a3 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -32,7 +32,7 @@ /obj/docking_port/mobile/arrivals/register() ..() if(SSshuttle.arrivals) - WARNING("More than one arrivals docking_port placed on map! Ignoring duplicates.") + log_mapping("More than one arrivals docking_port placed on map! Ignoring duplicates.") SSshuttle.arrivals = src /obj/docking_port/mobile/arrivals/LateInitialize() @@ -47,12 +47,12 @@ areas += A if(SSjob.latejoin_trackers.len) - WARNING("Map contains predefined latejoin spawn points and an arrivals shuttle. Using the arrivals shuttle.") + log_mapping("Map contains predefined latejoin spawn points and an arrivals shuttle. Using the arrivals shuttle.") if(!new_latejoin.len) - WARNING("Arrivals shuttle contains no chairs for spawn points. Reverting to latejoin landmarks.") + log_mapping("Arrivals shuttle contains no chairs for spawn points. Reverting to latejoin landmarks.") if(!SSjob.latejoin_trackers.len) - WARNING("No latejoin landmarks exist. Players will spawn unbuckled on the shuttle.") + log_mapping("No latejoin landmarks exist. Players will spawn unbuckled on the shuttle.") return SSjob.latejoin_trackers = new_latejoin