Merge pull request #40690 from ShizCalev/default-religion-runtime

Fixes default religion preference runtime
This commit is contained in:
Jordan Brown
2018-10-05 09:38:05 -04:00
committed by yogstation13-bot
parent b148d7328a
commit 7c3f12e5e4
3 changed files with 10 additions and 3 deletions

View File

@@ -48,3 +48,6 @@
#define JOB_UNAVAILABLE_PLAYTIME 3
#define JOB_UNAVAILABLE_ACCOUNTAGE 4
#define JOB_UNAVAILABLE_SLOTFULL 5
#define DEFAULT_RELIGION "Christianity"
#define DEFAULT_DEITY "Space Jesus"

View File

@@ -1671,6 +1671,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
return pick(GLOB.clown_names)
if("mime")
return pick(GLOB.mime_names)
if("religion")
return DEFAULT_RELIGION
if("deity")
return DEFAULT_DEITY
return random_unique_name()
/datum/preferences/proc/ask_for_custom_name(mob/user,name_id)

View File

@@ -39,11 +39,11 @@ Chaplain
H.put_in_hands(N)
return
var/new_religion = "Christianity"
var/new_religion = DEFAULT_RELIGION
if(M.client && M.client.prefs.custom_names["religion"])
new_religion = M.client.prefs.custom_names["religion"]
var/new_deity = "Space Jesus"
var/new_deity = DEFAULT_DEITY
if(M.client && M.client.prefs.custom_names["deity"])
new_deity = M.client.prefs.custom_names["deity"]
@@ -51,7 +51,7 @@ Chaplain
switch(lowertext(new_religion))
if("christianity")
if("christianity") // DEFAULT_RELIGION
B.name = pick("The Holy Bible","The Dead Sea Scrolls")
if("satanism")
B.name = "The Unholy Bible"