mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Removes BDSM and Furry/Human Preference Toggles
This commit is contained in:
@@ -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_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"))
|
GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP", "Unset"))
|
||||||
// CHOMPStation Edit Start: Directory Update
|
// 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_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_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
|
// CHOMPStation Edit End: Directory Update
|
||||||
GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes
|
GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes
|
||||||
|
|||||||
@@ -8,8 +8,6 @@
|
|||||||
S["directory_gendertag"] >> pref.directory_gendertag // CHOMPStation Edit: Character Directory Update
|
S["directory_gendertag"] >> pref.directory_gendertag // CHOMPStation Edit: Character Directory Update
|
||||||
S["directory_sexualitytag"] >> pref.directory_sexualitytag // CHOMPStation Edit: Character Directory Update
|
S["directory_sexualitytag"] >> pref.directory_sexualitytag // CHOMPStation Edit: Character Directory Update
|
||||||
S["directory_erptag"] >> pref.directory_erptag
|
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["directory_ad"] >> pref.directory_ad
|
||||||
S["sensorpref"] >> pref.sensorpref
|
S["sensorpref"] >> pref.sensorpref
|
||||||
S["capture_crystal"] >> pref.capture_crystal
|
S["capture_crystal"] >> pref.capture_crystal
|
||||||
@@ -20,8 +18,6 @@
|
|||||||
S["directory_gendertag"] << pref.directory_gendertag // CHOMPStation Edit: Character Directory Update
|
S["directory_gendertag"] << pref.directory_gendertag // CHOMPStation Edit: Character Directory Update
|
||||||
S["directory_sexualitytag"] << pref.directory_sexualitytag // CHOMPStation Edit: Character Directory Update
|
S["directory_sexualitytag"] << pref.directory_sexualitytag // CHOMPStation Edit: Character Directory Update
|
||||||
S["directory_erptag"] << pref.directory_erptag
|
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["directory_ad"] << pref.directory_ad
|
||||||
S["sensorpref"] << pref.sensorpref
|
S["sensorpref"] << pref.sensorpref
|
||||||
S["capture_crystal"] << pref.capture_crystal
|
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_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_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_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.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))
|
pref.capture_crystal = sanitize_integer(pref.capture_crystal, 0, 1, initial(pref.capture_crystal))
|
||||||
|
|
||||||
@@ -51,8 +45,6 @@
|
|||||||
. += "<b>Character Directory Gender:</b> <a href='?src=\ref[src];directory_gendertag=1'><b>[pref.directory_gendertag]</b></a><br>" // CHOMPStation Edit: Character Directory Update
|
. += "<b>Character Directory Gender:</b> <a href='?src=\ref[src];directory_gendertag=1'><b>[pref.directory_gendertag]</b></a><br>" // CHOMPStation Edit: Character Directory Update
|
||||||
. += "<b>Character Directory Sexuality:</b> <a href='?src=\ref[src];directory_sexualitytag=1'><b>[pref.directory_sexualitytag]</b></a><br>" // CHOMPStation Edit: Character Directory Update
|
. += "<b>Character Directory Sexuality:</b> <a href='?src=\ref[src];directory_sexualitytag=1'><b>[pref.directory_sexualitytag]</b></a><br>" // CHOMPStation Edit: Character Directory Update
|
||||||
. += "<b>Character Directory ERP Tag:</b> <a href='?src=\ref[src];directory_erptag=1'><b>[pref.directory_erptag]</b></a><br>"
|
. += "<b>Character Directory ERP Tag:</b> <a href='?src=\ref[src];directory_erptag=1'><b>[pref.directory_erptag]</b></a><br>"
|
||||||
. += "<b>Character Directory BDSM Tag:</b> <a href='?src=\ref[src];directory_bdsmtag=1'><b>[pref.directory_bdsmtag]</b></a><br>" // CHOMPStation Edit: Character Directory Update
|
|
||||||
. += "<b>Character Directory Furry/Human Preference:</b> <a href='?src=\ref[src];directory_furrypreftag=1'><b>[pref.directory_furrypreftag]</b></a><br>" // CHOMPStation Edit: Character Directory Update
|
|
||||||
. += "<b>Character Directory Advertisement:</b> <a href='?src=\ref[src];directory_ad=1'><b>Set Directory Ad</b></a><br>"
|
. += "<b>Character Directory Advertisement:</b> <a href='?src=\ref[src];directory_ad=1'><b>Set Directory Ad</b></a><br>"
|
||||||
. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>"
|
. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>"
|
||||||
. += "<b>Capture Crystal Preference</b> <a [pref.capture_crystal ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_capture_crystal=1'><b>[pref.capture_crystal ? "Yes" : "No"]</b></a><br>"
|
. += "<b>Capture Crystal Preference</b> <a [pref.capture_crystal ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_capture_crystal=1'><b>[pref.capture_crystal ? "Yes" : "No"]</b></a><br>"
|
||||||
@@ -87,20 +79,6 @@
|
|||||||
return
|
return
|
||||||
pref.directory_erptag = new_erptag
|
pref.directory_erptag = new_erptag
|
||||||
return TOPIC_REFRESH
|
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"])
|
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
|
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
|
pref.directory_ad = msg
|
||||||
|
|||||||
@@ -5,8 +5,6 @@
|
|||||||
// CHOMPStation Edit Start: Directory Update
|
// CHOMPStation Edit Start: Directory Update
|
||||||
var/directory_gendertag = "Unset" // Gender stuff!
|
var/directory_gendertag = "Unset" // Gender stuff!
|
||||||
var/directory_sexualitytag = "Unset" // Sexuality!
|
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
|
// CHOMPStation Edit End: Directory Update
|
||||||
var/directory_ad = "" //Advertisement stuff to show in character directory.
|
var/directory_ad = "" //Advertisement stuff to show in character directory.
|
||||||
var/sensorpref = 5 //Set character's suit sensor level
|
var/sensorpref = 5 //Set character's suit sensor level
|
||||||
|
|||||||
@@ -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["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["personalSexualityTag"] = user?.client?.prefs?.directory_sexualitytag || "Unset" // CHOMPStation Edit: Character Directory Update
|
||||||
data["personalErpTag"] = user?.client?.prefs?.directory_erptag || "Unset"
|
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
|
data["personalEventTag"] = vantag_choices_list[user?.client?.prefs?.vantag_preference] //CHOMPEdit
|
||||||
|
|
||||||
return data
|
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/gendertag = C.prefs.directory_gendertag || "Unset" // CHOMPStation Edit: Character Directory Update
|
||||||
var/sexualitytag = C.prefs.directory_sexualitytag || "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/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/eventtag = vantag_choices_list[C.prefs.vantag_preference] //CHOMPEdit
|
||||||
var/character_ad = C.prefs.directory_ad
|
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
|
"gendertag" = gendertag, // CHOMPStation Edit: Character Directory Update
|
||||||
"sexualitytag" = sexualitytag, // CHOMPStation Edit: Character Directory Update
|
"sexualitytag" = sexualitytag, // CHOMPStation Edit: Character Directory Update
|
||||||
"erptag" = erptag,
|
"erptag" = erptag,
|
||||||
"bdsmtag" = bdsmtag, // CHOMPStation Edit: Character Directory Update
|
|
||||||
"furrypreftag" = furrypreftag, // CHOMPStation Edit: Character Directory Update
|
|
||||||
"eventtag" = eventtag, //CHOMPEdit
|
"eventtag" = eventtag, //CHOMPEdit
|
||||||
"character_ad" = character_ad,
|
"character_ad" = character_ad,
|
||||||
"flavor_text" = flavor_text,
|
"flavor_text" = flavor_text,
|
||||||
@@ -176,20 +170,6 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
|
|||||||
return
|
return
|
||||||
usr?.client?.prefs?.directory_erptag = new_erptag
|
usr?.client?.prefs?.directory_erptag = new_erptag
|
||||||
return TRUE
|
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
|
//CHOMPEdit start
|
||||||
if("setEventTag")
|
if("setEventTag")
|
||||||
var/list/names_list = list()
|
var/list/names_list = list()
|
||||||
|
|||||||
@@ -25,16 +25,8 @@ const getTagColor = (tag) => {
|
|||||||
export const CharacterDirectory = (props, context) => {
|
export const CharacterDirectory = (props, context) => {
|
||||||
const { act, data } = useBackend(context);
|
const { act, data } = useBackend(context);
|
||||||
|
|
||||||
const {
|
const { personalVisibility, personalTag, personalGenderTag, personalSexualityTag, personalErpTag, personalEventTag } =
|
||||||
personalVisibility,
|
data;
|
||||||
personalTag,
|
|
||||||
personalGenderTag,
|
|
||||||
personalSexualityTag,
|
|
||||||
personalErpTag,
|
|
||||||
personalBDSMTag,
|
|
||||||
personalFurryPrefTag,
|
|
||||||
personalEventTag,
|
|
||||||
} = data;
|
|
||||||
|
|
||||||
const [overlay, setOverlay] = useLocalState(context, 'overlay', null);
|
const [overlay, setOverlay] = useLocalState(context, 'overlay', null);
|
||||||
|
|
||||||
@@ -64,12 +56,6 @@ export const CharacterDirectory = (props, context) => {
|
|||||||
<LabeledList.Item label="ERP Tag">
|
<LabeledList.Item label="ERP Tag">
|
||||||
<Button fluid content={personalErpTag} onClick={() => act('setErpTag')} />
|
<Button fluid content={personalErpTag} onClick={() => act('setErpTag')} />
|
||||||
</LabeledList.Item>
|
</LabeledList.Item>
|
||||||
<LabeledList.Item label="BDSM Tag">
|
|
||||||
<Button fluid content={personalBDSMTag} onClick={() => act('setErpTag')} />
|
|
||||||
</LabeledList.Item>
|
|
||||||
<LabeledList.Item label="Furry/Human Pref">
|
|
||||||
<Button fluid content={personalFurryPrefTag} onClick={() => act('setFurryPrefTag')} />
|
|
||||||
</LabeledList.Item>
|
|
||||||
<LabeledList.Item label="Event Pref">
|
<LabeledList.Item label="Event Pref">
|
||||||
<Button fluid content={personalEventTag} onClick={() => act('setEventTag')} />
|
<Button fluid content={personalEventTag} onClick={() => act('setEventTag')} />
|
||||||
</LabeledList.Item>
|
</LabeledList.Item>
|
||||||
@@ -110,12 +96,6 @@ const ViewCharacter = (props, context) => {
|
|||||||
<Section level={2} title="ERP Tag">
|
<Section level={2} title="ERP Tag">
|
||||||
<Box>{overlay.erptag}</Box>
|
<Box>{overlay.erptag}</Box>
|
||||||
</Section>
|
</Section>
|
||||||
<Section level={2} title="BDSM Tag">
|
|
||||||
<Box>{overlay.bdsmtag}</Box>
|
|
||||||
</Section>
|
|
||||||
<Section level={2} title="Furry Preference">
|
|
||||||
<Box>{overlay.furrypreftag}</Box>
|
|
||||||
</Section>
|
|
||||||
<Section level={2} title="Event Pref">
|
<Section level={2} title="Event Pref">
|
||||||
<Box>{overlay.eventtag}</Box>
|
<Box>{overlay.eventtag}</Box>
|
||||||
</Section>
|
</Section>
|
||||||
@@ -157,8 +137,6 @@ const CharacterDirectoryList = (props, context) => {
|
|||||||
<SortButton id="gendertag">Gender</SortButton>
|
<SortButton id="gendertag">Gender</SortButton>
|
||||||
<SortButton id="sexualitytag">Sexuality</SortButton>
|
<SortButton id="sexualitytag">Sexuality</SortButton>
|
||||||
<SortButton id="erptag">ERP Tag</SortButton>
|
<SortButton id="erptag">ERP Tag</SortButton>
|
||||||
<SortButton id="erptag">BDSM Tag</SortButton>
|
|
||||||
<SortButton id="furrypreftag">Furry/Human Pref</SortButton>
|
|
||||||
<SortButton id="eventtag">Event Pref</SortButton>
|
<SortButton id="eventtag">Event Pref</SortButton>
|
||||||
<Table.Cell collapsing textAlign="right">
|
<Table.Cell collapsing textAlign="right">
|
||||||
View
|
View
|
||||||
@@ -177,8 +155,6 @@ const CharacterDirectoryList = (props, context) => {
|
|||||||
<Table.Cell>{character.gendertag}</Table.Cell>
|
<Table.Cell>{character.gendertag}</Table.Cell>
|
||||||
<Table.Cell>{character.sexualitytag}</Table.Cell>
|
<Table.Cell>{character.sexualitytag}</Table.Cell>
|
||||||
<Table.Cell>{character.erptag}</Table.Cell>
|
<Table.Cell>{character.erptag}</Table.Cell>
|
||||||
<Table.Cell>{character.bdsmtag}</Table.Cell>
|
|
||||||
<Table.Cell>{character.furrypreftag}</Table.Cell>
|
|
||||||
<Table.Cell>{character.eventtag}</Table.Cell>
|
<Table.Cell>{character.eventtag}</Table.Cell>
|
||||||
<Table.Cell collapsing textAlign="right">
|
<Table.Cell collapsing textAlign="right">
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user