cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-06 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some mapping errors not using the mapping error log. (#64114)

Browse Source 
Should help prevent #64066 from reoccurring.
This commit is contained in:
ShizCalev
2022-01-18 12:18:04 -05:00
committed by GitHub
parent b4c08c4bd5
commit 7b471582d8
7 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/__HELPERS/_logging.dm
View File

@@ -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"

4
code/controllers/configuration/configuration.dm
View File

@@ -350,7 +350,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)

12
code/controllers/subsystem/shuttle.dm
View File

@@ -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)
@@ -818,11 +818,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)

2
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -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

2
code/modules/mapping/space_management/zlevel_manager.dm
View File

@@ -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)

2
code/modules/power/apc.dm
View File

@@ -304,7 +304,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()

8
code/modules/shuttle/arrivals.dm
View File

@@ -30,7 +30,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()
@@ -45,12 +45,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