diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index ee9bc5bb429a..888def7a7182 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -41,11 +41,6 @@ List of configurable names in preferences and their metadata ), */ GLOBAL_LIST_INIT(preferences_custom_names, list( - "human" = list("pref_name" = "Backup Human", "qdesc" = "backup human name, used in the event you are assigned a command role as another species", "group" = "backup_human", "allow_null" = FALSE), - "clown" = list("pref_name" = "Clown" , "qdesc" = "clown name", "group" = "fun", "allow_null" = FALSE), - "mime" = list("pref_name" = "Mime", "qdesc" = "mime name" , "group" = "fun", "allow_null" = FALSE), "cyborg" = list("pref_name" = "Cyborg", "qdesc" = "cyborg name (Leave empty to use default naming scheme)", "group" = "silicons", "allow_null" = TRUE), "ai" = list("pref_name" = "AI", "qdesc" = "ai name", "group" = "silicons", "allow_null" = FALSE), - "religion" = list("pref_name" = "Chaplain religion", "qdesc" = "religion" , "group" = "chaplain", "allow_null" = FALSE), - "deity" = list("pref_name" = "Chaplain deity", "qdesc" = "deity", "group" = "chaplain", "allow_null" = FALSE) - )) +)) diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm index 5b8df328e6e2..d9e6d8f13020 100644 --- a/code/modules/client/loadout/loadout_general.dm +++ b/code/modules/client/loadout/loadout_general.dm @@ -30,10 +30,6 @@ display_name = "bandana, red" path = /obj/item/clothing/mask/bandana/red -/datum/gear/bible - display_name = "bible" - path = /obj/item/storage/book/bible - /datum/gear/flask display_name = "flask" path = /obj/item/reagent_containers/food/drinks/flask diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f4584749609c..b1aef68b112b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2507,20 +2507,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) /datum/preferences/proc/get_default_name(name_id) switch(name_id) - if("human") - return random_unique_name() if("ai") return pick(GLOB.ai_names) if("cyborg") return DEFAULT_CYBORG_NAME - if("clown") - 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)