Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cuts the clown, mime, deity and religion names and loadout bibles into little itty pieces. #2966

Merged
merged 3 commits into from
May 20, 2024
Merged

Cuts the clown, mime, deity and religion names and loadout bibles into little itty pieces. #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a83d0ae
waa
Martinpachu May 6, 2024
750d610
auurgh
Martinpachu May 7, 2024
2f34752
kills god
Martinpachu May 7, 2024
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
7 changes: 1 addition & 6 deletions code/_globalvars/lists/names.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
))
))
4 changes: 0 additions & 4 deletions code/modules/client/loadout/loadout_general.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions code/modules/client/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading