cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into shep-dev-looping-alarms

Browse Source
This commit is contained in:
Razgriz
2023-02-14 15:17:33 -07:00
committed by GitHub
parent d62a268ede 6b817a4d2f
commit 6126a0ec69
37 changed files with 996 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
code/modules/client/verbs/character_directory.dm
View File

@@ -34,9 +34,9 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
data["personalVisibility"] = user.mind.show_in_directory
data["personalTag"] = user.mind.directory_tag || "Unset"
data["personalErpTag"] = user.mind.directory_erptag || "Unset"
data["personalEventTag"] = vantag_choices_list[user.client.prefs.vantag_preference] //CHOMPEdit
data["personalGenderTag"] = user.client.prefs.directory_gendertag || "Unset" // CHOMPStation Edit: Character Directory Update
data["personalSexualityTag"] = user.client.prefs.directory_sexualitytag || "Unset" // CHOMPStation Edit: Character Directory Update
data["personalEventTag"] = vantag_choices_list[user.mind.vantag_preference] //CHOMPEdit
data["personalGenderTag"] = user.mind.directory_gendertag || "Unset" // CHOMPStation Edit: Character Directory Update
data["personalSexualityTag"] = user.mind.directory_sexualitytag || "Unset" // CHOMPStation Edit: Character Directory Update
else if (user?.client?.prefs)
data["personalVisibility"] = user.client.prefs.show_in_directory
data["personalTag"] = user.client.prefs.directory_tag || "Unset"
@@ -62,9 +62,9 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
var/species = null
var/ooc_notes = null
var/flavor_text = null
var/gendertag = C.prefs.directory_gendertag || "Unset" // CHOMPStation Edit: Character Directory Update
var/sexualitytag = C.prefs.directory_sexualitytag || "Unset" // CHOMPStation Edit: Character Directory Update
var/eventtag = vantag_choices_list[C.prefs.vantag_preference] //CHOMPEdit
var/gendertag = null // CHOMPStation Edit: Character Directory Update
var/sexualitytag = null // CHOMPStation Edit: Character Directory Update
var/eventtag = vantag_choices_list[VANTAG_NONE] //CHOMPEdit
var/tag
var/erptag
var/character_ad
@@ -72,10 +72,16 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
tag = C.mob.mind.directory_tag || "Unset"
erptag = C.mob.mind.directory_erptag || "Unset"
character_ad = C.mob.mind.directory_ad
gendertag = C.mob.mind.directory_gendertag || "Unset"
sexualitytag = C.mob.mind.directory_sexualitytag || "Unset"
eventtag = vantag_choices_list[C.mob.mind.vantag_preference]
else
tag = C.prefs.directory_tag || "Unset"
erptag = C.prefs.directory_erptag || "Unset"
character_ad = C.prefs.directory_ad
gendertag = C.prefs.directory_gendertag || "Unset"
sexualitytag = C.prefs.directory_sexualitytag || "Unset"
eventtag = vantag_choices_list[C.prefs.vantag_preference]
//CHOMPEdit Start
if(ishuman(C.mob))
@@ -176,19 +182,6 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
if(!new_tag)
return
return set_for_mind_or_prefs(user, action, new_tag, can_set_prefs, can_set_mind)
// CHOMPStation Edit Start: Directory Update
if("setGenderTag")
var/list/new_gendertag = tgui_input_list(usr, "Pick a new Gender tag for the character directory. This is YOUR gender, not what you prefer.", "Character Gender Tag", GLOB.char_directory_gendertags)
if(!new_gendertag)
return
usr?.client?.prefs?.directory_gendertag = new_gendertag
return TRUE
if("setSexualityTag")
var/list/new_sexualitytag = tgui_input_list(usr, "Pick a new Sexuality/Orientation tag for the character directory", "Character Sexuality/Orientation Tag", GLOB.char_directory_sexualitytags)
if(!new_sexualitytag)
return
usr?.client?.prefs?.directory_sexualitytag = new_sexualitytag
return TRUE
// CHOMPStation Edit End: Directory Update
if("setErpTag")
var/list/new_erptag = tgui_input_list(usr, "Pick a new ERP tag for the character directory", "Character ERP Tag", GLOB.char_directory_erptags)
@@ -209,8 +202,17 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
if(isnull(new_ad))
return
return set_for_mind_or_prefs(user, action, new_ad, can_set_prefs, can_set_mind)
//CHOMPEdit start
//CHOMPEdit begin
// CHOMPStation Edit Start: Directory Update
if("setGenderTag")
var/list/new_gendertag = tgui_input_list(usr, "Pick a new Gender tag for the character directory. This is YOUR gender, not what you prefer.", "Character Gender Tag", GLOB.char_directory_gendertags)
if(!new_gendertag)
return
return set_for_mind_or_prefs(user, action, new_gendertag, can_set_prefs, can_set_mind)
if("setSexualityTag")
var/list/new_sexualitytag = tgui_input_list(usr, "Pick a new Sexuality/Orientation tag for the character directory", "Character Sexuality/Orientation Tag", GLOB.char_directory_sexualitytags)
if(!new_sexualitytag)
return
return set_for_mind_or_prefs(user, action, new_sexualitytag, can_set_prefs, can_set_mind)
if("setEventTag")
var/list/names_list = list()
for(var/C in vantag_choices_list)
@@ -218,9 +220,8 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
var/list/new_eventtag = input(usr, "Pick your preference for event involvement", "Event Preference Tag", usr?.client?.prefs?.vantag_preference) as null|anything in names_list
if(!new_eventtag)
return
usr?.client?.prefs?.vantag_preference = names_list[new_eventtag]
return TRUE
//CHOMPEdit end
return set_for_mind_or_prefs(user, action, names_list[new_eventtag], can_set_prefs, can_set_mind)
//CHOMPEdit end
/datum/character_directory/proc/set_for_mind_or_prefs(mob/user, action, new_value, can_set_prefs, can_set_mind)
can_set_prefs &&= !!user.client.prefs
@@ -253,3 +254,18 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
if (can_set_mind)
user.mind.directory_ad = new_value
return TRUE
if ("setEventTag")
if (can_set_prefs)
user.client.prefs.vantag_preference = new_value
if (can_set_mind)
user.mind.vantag_preference = new_value
if ("setGenderTag")
if (can_set_prefs)
user.client.prefs.directory_gendertag = new_value
if (can_set_mind)
user.mind.directory_gendertag = new_value
if ("setSexualityTag")
if (can_set_prefs)
user.client.prefs.directory_sexualitytag = new_value
if (can_set_mind)
user.mind.directory_sexualitytag = new_value