Skip to content

Commit

Permalink
Cuts the clown, mime, deity and religion names and loadout bibles int…
Browse files Browse the repository at this point in the history
…o little itty pieces. (#2966)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Removes cruft!!!! finally!! 

## Why It's Good For The Game

im like doomguy except instead of killing demons im killing the ancient
ghosts of tgstation humor
## Changelog

:cl:

del: Removed the bible from loadout, as well as the religion and deity
names because god is dead. Clown and mime names too.

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Martinpachu authored May 20, 2024
1 parent 85aed30 commit e034787
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
7 changes: 1 addition & 6 deletions code/_globalvars/lists/names.dm
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
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
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

0 comments on commit e034787

Please sign in to comment.