diff --git a/code/_global_vars/lists/misc.dm b/code/_global_vars/lists/misc.dm index 27680640fb..f8666fc68e 100644 --- a/code/_global_vars/lists/misc.dm +++ b/code/_global_vars/lists/misc.dm @@ -11,9 +11,7 @@ GLOBAL_LIST_EMPTY(tagger_locations) GLOBAL_LIST_INIT(char_directory_tags, list("Pred", "Pred-Pref", "Prey", "Prey-Pref", "Switch", "Non-Vore", "Unset")) GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP", "Unset")) // CHOMPStation Edit Start: Directory Update -GLOBAL_LIST_INIT(char_directory_bdsmtags, list("Dominant", "Submissive", "Switch", "No BDSM", "Unset")) GLOBAL_LIST_INIT(char_directory_sexualitytags, list("Straight", "Bisexual", "Pansexual", "Gay", "Lesbian", "Asexual", "Demisexual", "Unset")) GLOBAL_LIST_INIT(char_directory_gendertags, list("Male", "Female", "Nonbinary", "Trans Man", "Trans Woman", "Other", "Ungendered", "Unset")) -GLOBAL_LIST_INIT(char_directory_furrypreftags, list("Furries Only", "Humans/Demis Only", "Either/Or", "Furries Preferred", "Humans/Demis Preferred", "Unset")) // CHOMPStation Edit End: Directory Update GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 65626b44d0..2091566980 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -8,8 +8,6 @@ S["directory_gendertag"] >> pref.directory_gendertag // CHOMPStation Edit: Character Directory Update S["directory_sexualitytag"] >> pref.directory_sexualitytag // CHOMPStation Edit: Character Directory Update S["directory_erptag"] >> pref.directory_erptag - S["directory_bdsmtag"] >> pref.directory_bdsmtag // CHOMPStation Edit: Character Directory Update - S["directory_furrypreftag"] >> pref.directory_furrypreftag // CHOMPStation Edit: Character Directory Update S["directory_ad"] >> pref.directory_ad S["sensorpref"] >> pref.sensorpref S["capture_crystal"] >> pref.capture_crystal @@ -20,8 +18,6 @@ S["directory_gendertag"] << pref.directory_gendertag // CHOMPStation Edit: Character Directory Update S["directory_sexualitytag"] << pref.directory_sexualitytag // CHOMPStation Edit: Character Directory Update S["directory_erptag"] << pref.directory_erptag - S["directory_bdsmtag"] << pref.directory_bdsmtag // CHOMPStation Edit: Character Directory Update - S["directory_furrypreftag"] << pref.directory_furrypreftag // CHOMPStation Edit: Character Directory Update S["directory_ad"] << pref.directory_ad S["sensorpref"] << pref.sensorpref S["capture_crystal"] << pref.capture_crystal @@ -39,8 +35,6 @@ pref.directory_gendertag = sanitize_inlist(pref.directory_gendertag, GLOB.char_directory_gendertags, initial(pref.directory_gendertag)) // CHOMPStation Edit: Character Directory Update pref.directory_sexualitytag = sanitize_inlist(pref.directory_sexualitytag, GLOB.char_directory_sexualitytags, initial(pref.directory_sexualitytag)) // CHOMPStation Edit: Character Directory Update pref.directory_erptag = sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag)) - pref.directory_bdsmtag = sanitize_inlist(pref.directory_bdsmtag, GLOB.char_directory_bdsmtags, initial(pref.directory_bdsmtag)) // CHOMPStation Edit: Character Directory Update - pref.directory_furrypreftag = sanitize_inlist(pref.directory_furrypreftag, GLOB.char_directory_furrypreftags, initial(pref.directory_furrypreftag)) // CHOMPStation Edit: Character Directory Update pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) pref.capture_crystal = sanitize_integer(pref.capture_crystal, 0, 1, initial(pref.capture_crystal)) @@ -51,8 +45,6 @@ . += "Character Directory Gender: [pref.directory_gendertag]
" // CHOMPStation Edit: Character Directory Update . += "Character Directory Sexuality: [pref.directory_sexualitytag]
" // CHOMPStation Edit: Character Directory Update . += "Character Directory ERP Tag: [pref.directory_erptag]
" - . += "Character Directory BDSM Tag: [pref.directory_bdsmtag]
" // CHOMPStation Edit: Character Directory Update - . += "Character Directory Furry/Human Preference: [pref.directory_furrypreftag]
" // CHOMPStation Edit: Character Directory Update . += "Character Directory Advertisement: Set Directory Ad
" . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" . += "Capture Crystal Preference [pref.capture_crystal ? "Yes" : "No"]
" @@ -87,20 +79,6 @@ return pref.directory_erptag = new_erptag return TOPIC_REFRESH - // CHOMPStation Edit Start: Directory Update - else if(href_list["directory_bdsmtag"]) - var/new_bdsmtag = tgui_input_list(user, "Pick a new BDSM tag for the character directory", "Character BDSM Tag", GLOB.char_directory_bdsmtags, pref.directory_bdsmtag) - if(!new_bdsmtag) - return - pref.directory_bdsmtag = new_bdsmtag - return TOPIC_REFRESH - else if(href_list["directory_furrypreftag"]) - var/new_furrypreftag = tgui_input_list(user, "Pick a new Furry/Human preference tag for the character directory", "Character Furry/Human Preference", GLOB.char_directory_furrypreftags, pref.directory_furrypreftag) - if(!new_furrypreftag) - return - pref.directory_furrypreftag = new_furrypreftag - return TOPIC_REFRESH - // CHOMPStation Edit End: Directory Update else if(href_list["directory_ad"]) var/msg = sanitize(tgui_input_text(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes pref.directory_ad = msg diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm index 12d8630f25..87de2213a4 100644 --- a/code/modules/client/preferences_vr.dm +++ b/code/modules/client/preferences_vr.dm @@ -5,8 +5,6 @@ // CHOMPStation Edit Start: Directory Update var/directory_gendertag = "Unset" // Gender stuff! var/directory_sexualitytag = "Unset" // Sexuality! - var/directory_furrypreftag = "Unset" // Furry/human preference! - var/directory_bdsmtag = "Unset" // BDSM prefs! Dom/Sub/Switch // CHOMPStation Edit End: Directory Update var/directory_ad = "" //Advertisement stuff to show in character directory. var/sensorpref = 5 //Set character's suit sensor level diff --git a/code/modules/client/verbs/character_directory.dm b/code/modules/client/verbs/character_directory.dm index a772c77d2f..ddc14fd8c5 100644 --- a/code/modules/client/verbs/character_directory.dm +++ b/code/modules/client/verbs/character_directory.dm @@ -35,8 +35,6 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) 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["personalErpTag"] = user?.client?.prefs?.directory_erptag || "Unset" - data["personalBDSMTag"] = user?.client?.prefs?.directory_bdsmtag || "Unset" // CHOMPStation Edit: Character Directory Update - data["personalFurryPrefTag"] = user?.client?.prefs?.directory_furrypreftag || "Unset" // CHOMPStation Edit: Character Directory Update data["personalEventTag"] = vantag_choices_list[user?.client?.prefs?.vantag_preference] //CHOMPEdit return data @@ -60,8 +58,6 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) 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/erptag = C.prefs.directory_erptag || "Unset" - var/bdsmtag = C.prefs.directory_bdsmtag || "Unset" // CHOMPStation Edit: Character Directory Update - var/furrypreftag = C.prefs.directory_furrypreftag || "Unset" // CHOMPStation Edit: Character Directory Update var/eventtag = vantag_choices_list[C.prefs.vantag_preference] //CHOMPEdit var/character_ad = C.prefs.directory_ad @@ -124,8 +120,6 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) "gendertag" = gendertag, // CHOMPStation Edit: Character Directory Update "sexualitytag" = sexualitytag, // CHOMPStation Edit: Character Directory Update "erptag" = erptag, - "bdsmtag" = bdsmtag, // CHOMPStation Edit: Character Directory Update - "furrypreftag" = furrypreftag, // CHOMPStation Edit: Character Directory Update "eventtag" = eventtag, //CHOMPEdit "character_ad" = character_ad, "flavor_text" = flavor_text, @@ -176,20 +170,6 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) return usr?.client?.prefs?.directory_erptag = new_erptag return TRUE - // CHOMPStation Edit Start: Directory Update - if("setBDSMTag") - var/list/new_bdsmtag = tgui_input_list(usr, "Pick a new BDSM tag for the character directory", "Character BDSM Tag", GLOB.char_directory_bdsmtags) - if(!new_bdsmtag) - return - usr?.client?.prefs?.directory_bdsmtag = new_bdsmtag - return TRUE - if("setFurryPrefTag") - var/list/new_furrypreftag = tgui_input_list(usr, "Pick a new Furry/Human preference tag for the character directory", "Character Furry/Human Preference", GLOB.char_directory_furrypreftags) - if(!new_furrypreftag) - return - usr?.client?.prefs?.directory_furrypreftag = new_furrypreftag - return TRUE - // CHOMPStation Edit End: Directory Update //CHOMPEdit start if("setEventTag") var/list/names_list = list() diff --git a/tgui/packages/tgui/interfaces/CharacterDirectory.js b/tgui/packages/tgui/interfaces/CharacterDirectory.js index 6bee1061bf..e85401f833 100644 --- a/tgui/packages/tgui/interfaces/CharacterDirectory.js +++ b/tgui/packages/tgui/interfaces/CharacterDirectory.js @@ -25,16 +25,8 @@ const getTagColor = (tag) => { export const CharacterDirectory = (props, context) => { const { act, data } = useBackend(context); - const { - personalVisibility, - personalTag, - personalGenderTag, - personalSexualityTag, - personalErpTag, - personalBDSMTag, - personalFurryPrefTag, - personalEventTag, - } = data; + const { personalVisibility, personalTag, personalGenderTag, personalSexualityTag, personalErpTag, personalEventTag } = + data; const [overlay, setOverlay] = useLocalState(context, 'overlay', null); @@ -64,12 +56,6 @@ export const CharacterDirectory = (props, context) => {