From ee67e6a0d8a159363de9e8f298e3e09eaa1b0a96 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Mon, 26 Nov 2012 12:44:02 +0000 Subject: [PATCH] Runtime fix for null.occupations undefined var git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5200 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/client/preferences.dm | 10 ++++++---- code/modules/client/preferences_savefile.dm | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a61f6d77373..fb5bce15793 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -210,10 +210,12 @@ datum/preferences user << browse(dat, "window=preferences;size=560x560") proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), width = 550, height = 500) - //limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice. - //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. - //width - Screen' width. Defaults to 550 to make it look nice. - //height - Screen's height. Defaults to 500 to make it look nice. + if(!job_master) return + + //limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice. + //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. + //width - Screen' width. Defaults to 550 to make it look nice. + //height - Screen's height. Defaults to 500 to make it look nice. var/HTML = "" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index c59ccce23b2..d7f3d3003a5 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -88,6 +88,7 @@ if(!fexists(path)) return 0 var/savefile/S = new /savefile(path) if(!S) return 0 + S.cd = "/" if(!slot) slot = default_slot slot = sanitize_integer(slot, 1, MAX_SAVE_SLOTS, initial(default_slot)) if(slot != default_slot)