Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Adds a fallback if the bar selection is null, along with plenty of admin messages #12297

Merged
JamieD1 merged 5 commits into from
Sep 17, 2021
Merged

Adds a fallback if the bar selection is null, along with plenty of admin messages #12297

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c26faed
Adds a fallback if the bar selection is null, along with plenty of ad…
adamsong Sep 12, 2021
4631866
Update code/controllers/subsystem/job.dm
adamsong Sep 16, 2021
288b63d
Update job.dm
Bibby0110 Sep 16, 2021
4f4453c
Added logging to log_game
adamsong Sep 16, 2021
b2e3abf
Copied the wrong string
adamsong Sep 16, 2021
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
15 changes: 15 additions & 0 deletions code/controllers/subsystem/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,21 @@ 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")
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 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)
Expand Down