From c26faed9364367d39e2d8564df8d0e119887607b Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Sat, 11 Sep 2021 19:33:26 -0500 Subject: [PATCH 1/5] Adds a fallback if the bar selection is null, along with plenty of admin messages --- code/controllers/subsystem/job.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 5dafdac0c3f9..2e6ddef747a3 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -552,6 +552,19 @@ SUBSYSTEM_DEF(job) var/datum/map_template/template = SSmapping.station_room_templates[choice] + if(isnull(template)) + message_admins("WARNING: BAR TEMPLATE [choice] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") + for(var/backup_bar in GLOB.potential_box_bars) + template = SSmapping.station_room_templates[backup_bar] + if(isnull(template)) + message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") + else + break + + if(isnull(template)) + message_admins("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!") + return + for(var/obj/effect/landmark/stationroom/box/bar/B in GLOB.landmarks_list) template.load(B.loc, centered = FALSE) qdel(B) From 4631866a2e58602c22a260f13503f321646e0ed7 Mon Sep 17 00:00:00 2001 From: adamsong Date: Thu, 16 Sep 2021 12:46:07 -0500 Subject: [PATCH 2/5] Update code/controllers/subsystem/job.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> --- code/controllers/subsystem/job.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 2e6ddef747a3..6c550e365320 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -556,7 +556,9 @@ SUBSYSTEM_DEF(job) message_admins("WARNING: BAR TEMPLATE [choice] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") for(var/backup_bar in GLOB.potential_box_bars) template = SSmapping.station_room_templates[backup_bar] - if(isnull(template)) + if(!isnull(template)) + break + message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") else break From 288b63d81d6214f0bc40a5667b896060c6d537da Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Thu, 16 Sep 2021 19:56:33 +0200 Subject: [PATCH 3/5] Update job.dm --- code/controllers/subsystem/job.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 6c550e365320..372f57e21382 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -559,9 +559,6 @@ SUBSYSTEM_DEF(job) if(!isnull(template)) break message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") - message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") - else - break if(isnull(template)) message_admins("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!") From 4f4453cc8a578c67f3e505d3b8e4dba21b637407 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Thu, 16 Sep 2021 12:59:39 -0500 Subject: [PATCH 4/5] Added logging to log_game --- code/controllers/subsystem/job.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 372f57e21382..cab6c2bfd09a 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -554,14 +554,17 @@ SUBSYSTEM_DEF(job) if(isnull(template)) message_admins("WARNING: BAR TEMPLATE [choice] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") + log_game("WARNING: BAR TEMPLATE [choice] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") for(var/backup_bar in GLOB.potential_box_bars) template = SSmapping.station_room_templates[backup_bar] if(!isnull(template)) break message_admins("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") + log_game("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") if(isnull(template)) message_admins("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!") + log_game("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") return for(var/obj/effect/landmark/stationroom/box/bar/B in GLOB.landmarks_list) From b2e3abf29e066ac5994debd9eb2fb82aa116c6a1 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Thu, 16 Sep 2021 13:10:03 -0500 Subject: [PATCH 5/5] Copied the wrong string --- code/controllers/subsystem/job.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index cab6c2bfd09a..68b6810d2dfc 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -564,7 +564,7 @@ SUBSYSTEM_DEF(job) if(isnull(template)) message_admins("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!") - log_game("WARNING: BAR TEMPLATE [backup_bar] FAILED TO LOAD! ATTEMPTING TO LOAD BACKUP") + log_game("WARNING: BAR RECOVERY FAILED! THERE WILL BE NO BAR FOR THIS ROUND!") return for(var/obj/effect/landmark/stationroom/box/bar/B in GLOB.landmarks_list)