cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

god I hope I didn't break anything here

Browse Source
This commit is contained in:
Razgriz
2023-02-12 17:34:15 -07:00
committed by GitHub
parent d684ef18bc
commit 5d90e19b33
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/character_directory.dm
+2 -7
View File
@@ -30,21 +30,16 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
/datum/character_directory/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = ..()
<<<<<<< HEAD
data["personalVisibility"] = user?.client?.prefs?.show_in_directory
data["personalTag"] = user?.client?.prefs?.directory_tag || "Unset"
data["personalErpTag"] = user?.client?.prefs?.directory_erptag || "Unset"
data["personalEventTag"] = vantag_choices_list[user?.client?.prefs?.vantag_preference] //CHOMPEdit
=======
if (user?.mind)
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
else if (user?.client?.prefs)
data["personalVisibility"] = user.client.prefs.show_in_directory
data["personalTag"] = user.client.prefs.directory_tag || "Unset"
data["personalErpTag"] = user.client.prefs.directory_erptag || "Unset"
>>>>>>> c55fa159ab... Merge pull request #14359 from Seris02/characterdirectorybetter
data["personalEventTag"] = vantag_choices_list[user.client.prefs.vantag_preference] //CHOMPEdit
return data