From 39efec0df701391adf5cb837275716b09da429cd Mon Sep 17 00:00:00 2001 From: Useroth <37159550+Useroth@users.noreply.github.com> Date: Sat, 9 Oct 2021 05:23:58 +0200 Subject: [PATCH] Expanding preference choices and naming things what they are. (#8696) * Weh * forgot one thing * oops x2 * Update cursed_shit.tsx * Update examine_tgui.dm --- code/modules/mob/living/carbon/human/examine_tgui.dm | 4 ++-- .../code/modules/client/preferences/erp_preferences.dm | 6 +++--- .../features/character_preferences/skyrat/cursed_shit.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine_tgui.dm b/code/modules/mob/living/carbon/human/examine_tgui.dm index f637a844929..a5a3e00172c 100644 --- a/code/modules/mob/living/carbon/human/examine_tgui.dm +++ b/code/modules/mob/living/carbon/human/examine_tgui.dm @@ -50,8 +50,8 @@ var/e_prefs_nc = preferences.read_preference(/datum/preference/choiced/erp_status_nc) var/e_prefs_v = preferences.read_preference(/datum/preference/choiced/erp_status_v) ooc_notes += "ERP: [e_prefs]\n" - ooc_notes += "Non-conforming - [e_prefs_nc]\n" - ooc_notes += "VR - [e_prefs_v]\n" + ooc_notes += "Non-Con: [e_prefs_nc]\n" + ooc_notes += "Vore: [e_prefs_v]\n" ooc_notes += "\n" ooc_notes += holder.dna.features["ooc_notes"] diff --git a/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm b/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm index 7f5da5f7df4..cf7b01a544a 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm @@ -68,7 +68,7 @@ savefile_key = "erp_status_pref" /datum/preference/choiced/erp_status/init_possible_values() - return list("Yes", "Ask", "Check OOC", "No") + return list("Yes - Switch", "Yes - Sub", "Yes - Dom", "Check OOC", "Ask", "No") /datum/preference/choiced/erp_status/create_default_value() return "Ask" @@ -98,7 +98,7 @@ savefile_key = "erp_status_pref_nc" /datum/preference/choiced/erp_status_nc/init_possible_values() - return list("Yes", "Ask", "No") + return list("Yes - Switch", "Yes - Sub", "Yes - Dom", "Check OOC", "Ask", "No") /datum/preference/choiced/erp_status_nc/create_default_value() return "Ask" @@ -128,7 +128,7 @@ savefile_key = "erp_status_pref_v" /datum/preference/choiced/erp_status_v/init_possible_values() - return list("Yes", "Ask", "No") + return list("Yes - Switch", "Yes - Prey", "Yes - Pred", "Check OOC", "Ask", "No") /datum/preference/choiced/erp_status_v/create_default_value() return "Ask" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/cursed_shit.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/cursed_shit.tsx index 13aef3bc39d..7ecf0e07aec 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/cursed_shit.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/cursed_shit.tsx @@ -121,11 +121,11 @@ export const erp_status_pref: FeatureChoiced = { }; export const erp_status_pref_nc: FeatureChoiced = { - name: "ERP Non-conforming Status", + name: "ERP Non-Con Status", component: FeatureDropdownInput, }; export const erp_status_pref_v: FeatureChoiced = { - name: "ERP VR Status", + name: "ERP Vore Status", component: FeatureDropdownInput, };