diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 935f9e4d08..5f0286efa1 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -11,7 +11,6 @@ pref.capture_crystal = save_data["capture_crystal"] pref.auto_backup_implant = save_data["auto_backup_implant"] pref.borg_petting = save_data["borg_petting"] - pref.stomach_vision = save_data["stomach_vision"] /datum/category_item/player_setup_item/vore/misc/save_character(list/save_data) save_data["show_in_directory"] = pref.show_in_directory @@ -22,7 +21,6 @@ save_data["capture_crystal"] = pref.capture_crystal save_data["auto_backup_implant"] = pref.auto_backup_implant save_data["borg_petting"] = pref.borg_petting - save_data["stomach_vision"] = pref.stomach_vision /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character) if(pref.sensorpref > 5 || pref.sensorpref < 1) @@ -30,7 +28,6 @@ character.sensorpref = pref.sensorpref character.capture_crystal = pref.capture_crystal //Vore Stomach Sprite Preference - character.stomach_vision = pref.stomach_vision character.recalculate_vis() /datum/category_item/player_setup_item/vore/misc/sanitize_character() @@ -41,7 +38,6 @@ pref.capture_crystal = sanitize_integer(pref.capture_crystal, 0, 1, initial(pref.capture_crystal)) pref.auto_backup_implant = sanitize_integer(pref.auto_backup_implant, 0, 1, initial(pref.auto_backup_implant)) pref.borg_petting = sanitize_integer(pref.borg_petting, 0, 1, initial(pref.borg_petting)) - pref.stomach_vision = sanitize_integer(pref.stomach_vision, 0, 1, initial(pref.stomach_vision)) /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
" @@ -53,7 +49,6 @@ . += span_bold("Capture Crystal Preference:") + " [pref.capture_crystal ? "Yes" : "No"]
" . += span_bold("Spawn With Backup Implant:") + " [pref.auto_backup_implant ? "Yes" : "No"]
" . += span_bold("Allow petting as robot:") + " [pref.borg_petting ? "Yes" : "No"]
" - . += span_bold("Enable Stomach Sprites:") + " [pref.stomach_vision ? "Yes" : "No"]
" if(CONFIG_GET(flag/allow_metadata)) . += span_bold("Private Notes: Edit") + "
" @@ -93,9 +88,6 @@ else if(href_list["toggle_borg_petting"]) pref.borg_petting = pref.borg_petting ? 0 : 1; return TOPIC_REFRESH - else if(href_list["toggle_stomach_vision"]) - pref.stomach_vision = pref.stomach_vision ? 0 : 1; - return TOPIC_REFRESH else if(href_list["edit_private_notes"]) var/new_metadata = sanitize(tgui_input_text(user,"Write some notes for yourself. These can be anything that is useful, whether it's character events that you want to remember or a bit of lore. Things that you would normally stick in a txt file for yourself!", "Private Notes", html_decode(pref.read_preference(/datum/preference/text/living/private_notes)), multiline = TRUE, prevent_enter = TRUE), extra = 0) if(new_metadata && CanUseTopic(user)) diff --git a/code/modules/client/preferences/types/game/adult.dm b/code/modules/client/preferences/types/game/adult.dm new file mode 100644 index 0000000000..c27611f3a0 --- /dev/null +++ b/code/modules/client/preferences/types/game/adult.dm @@ -0,0 +1,34 @@ +/datum/preference/toggle/tummy_sprites + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "VISIBLE_TUMMIES" + savefile_identifier = PREFERENCE_PLAYER + default_value = TRUE //it IS a vore server + +/datum/preference/toggle/tummy_sprites/apply_to_client_updated(client/client, value) + client.mob.recalculate_vis() + . = ..() + +// Vorey sounds +/datum/preference/toggle/belch_noises // Belching noises - pref toggle for 'em + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "BELCH_NOISES" + default_value = TRUE + savefile_identifier = PREFERENCE_PLAYER + +/datum/preference/toggle/eating_noises + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "EATING_NOISES" + default_value = TRUE + savefile_identifier = PREFERENCE_PLAYER + +/datum/preference/toggle/digestion_noises + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "DIGEST_NOISES" + default_value = TRUE + savefile_identifier = PREFERENCE_PLAYER + +/datum/preference/toggle/vore_health_bars + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "VORE_HEALTH_BARS" + default_value = TRUE + savefile_identifier = PREFERENCE_PLAYER diff --git a/code/modules/client/preferences/types/game/chat.dm b/code/modules/client/preferences/types/game/chat.dm index 4bf527a1cf..ddeff834fb 100644 --- a/code/modules/client/preferences/types/game/chat.dm +++ b/code/modules/client/preferences/types/game/chat.dm @@ -44,12 +44,6 @@ default_value = TRUE savefile_identifier = PREFERENCE_PLAYER -/datum/preference/toggle/vore_health_bars - category = PREFERENCE_CATEGORY_GAME_PREFERENCES - savefile_key = "VORE_HEALTH_BARS" - default_value = TRUE - savefile_identifier = PREFERENCE_PLAYER - /datum/preference/toggle/show_lore_news category = PREFERENCE_CATEGORY_GAME_PREFERENCES savefile_key = "NEWS_POPUP" diff --git a/code/modules/client/preferences/types/game/sound.dm b/code/modules/client/preferences/types/game/sound.dm index 8b120e89e0..405588c74a 100644 --- a/code/modules/client/preferences/types/game/sound.dm +++ b/code/modules/client/preferences/types/game/sound.dm @@ -129,25 +129,6 @@ default_value = TRUE savefile_identifier = PREFERENCE_PLAYER -// Vorey sounds -/datum/preference/toggle/belch_noises // Belching noises - pref toggle for 'em - category = PREFERENCE_CATEGORY_GAME_PREFERENCES - savefile_key = "BELCH_NOISES" - default_value = TRUE - savefile_identifier = PREFERENCE_PLAYER - -/datum/preference/toggle/eating_noises - category = PREFERENCE_CATEGORY_GAME_PREFERENCES - savefile_key = "EATING_NOISES" - default_value = TRUE - savefile_identifier = PREFERENCE_PLAYER - -/datum/preference/toggle/digestion_noises - category = PREFERENCE_CATEGORY_GAME_PREFERENCES - savefile_key = "DIGEST_NOISES" - default_value = TRUE - savefile_identifier = PREFERENCE_PLAYER - /datum/preference/numeric/ambience_freq category = PREFERENCE_CATEGORY_GAME_PREFERENCES savefile_key = "ambience_freq" diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm index 8453d0f16a..c3a8d182bc 100644 --- a/code/modules/client/preferences_vr.dm +++ b/code/modules/client/preferences_vr.dm @@ -7,7 +7,6 @@ var/capture_crystal = 1 //Whether or not someone is able to be caught with capture crystals var/auto_backup_implant = FALSE //Whether someone starts with a backup implant or not. var/borg_petting = TRUE //Whether someone can be petted as a borg or not. - var/stomach_vision = TRUE //Whether or not someone can view stomach sprites var/job_talon_high = 0 var/job_talon_med = 0 diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 0f24332e3a..a6ffa4ba2f 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -197,7 +197,7 @@ if(vantag_hud) compiled_vis |= VIS_CH_VANTAG - if(stomach_vision) + if(client?.prefs.read_preference(/datum/preference/toggle/tummy_sprites)) compiled_vis += VIS_CH_STOMACH if(soulgem?.flag_check(SOULGEM_SEE_SR_SOULS)) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 5b6adb3173..de65509f0f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1112,7 +1112,6 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/image/wing_image = get_wing_image(FALSE) - var/obj/item/organ/external/chest = organs_by_name[BP_TORSO] if(wing_image) wing_image.layer = BODY_LAYER+WING_LAYER diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm index 3be06ebe6b..9925a3a91e 100644 --- a/code/modules/mob/mob_defines_vr.dm +++ b/code/modules/mob/mob_defines_vr.dm @@ -1,6 +1,5 @@ /mob var/vantag_hud = 0 // Do I have the HUD enabled? - var/stomach_vision = 1 // By default, you will see stomachs. var/mob/temporary_form // For holding onto a temporary form var/disconnect_time = null //Time of client loss, set by Logout(), for timekeeping diff --git a/code/modules/mob/mob_helpers_vr.dm b/code/modules/mob/mob_helpers_vr.dm index 302b9f34dc..cd2c3dfb74 100644 --- a/code/modules/mob/mob_helpers_vr.dm +++ b/code/modules/mob/mob_helpers_vr.dm @@ -3,7 +3,7 @@ if(!plane_holder || !vis_enabled) return - + var/stomach_vision = client?.prefs.read_preference(/datum/preference/toggle/tummy_sprites) if(stomach_vision && !(VIS_CH_STOMACH in vis_enabled)) plane_holder.set_vis(VIS_CH_STOMACH,TRUE) vis_enabled += VIS_CH_STOMACH @@ -40,10 +40,10 @@ if(!toggle) return if(toggle =="Yes") - stomach_vision = 1 //Simple! Easy! + client?.prefs.write_preference_by_type(/datum/preference/toggle/tummy_sprites,TRUE) //Simple! Easy! to_chat(src, "You can now see stomachs!") else - stomach_vision = 0 + client?.prefs.write_preference_by_type(/datum/preference/toggle/tummy_sprites,FALSE) to_chat(src, "You will no longer see stomachs!") recalculate_vis() diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/adult.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/adult.tsx new file mode 100644 index 0000000000..7c212d8c73 --- /dev/null +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/adult.tsx @@ -0,0 +1,38 @@ +import { CheckboxInput, FeatureToggle } from '../base'; + +// Vorey sounds +export const BELCH_NOISES: FeatureToggle = { + name: 'Belch Noises', + category: 'ADULT CONTENT', + description: 'Enable hearing burping noises.', + component: CheckboxInput, +}; + +export const EATING_NOISES: FeatureToggle = { + name: 'Eating Noises', + category: 'ADULT CONTENT', + description: 'Enable hearing vore eating noises.', + component: CheckboxInput, +}; + +export const DIGEST_NOISES: FeatureToggle = { + name: 'Digestion Noises', + category: 'ADULT CONTENT', + description: 'Enable hearing vore digestion noises.', + component: CheckboxInput, +}; + +export const VORE_HEALTH_BARS: FeatureToggle = { + name: 'Vore Health Bars', + category: 'ADULT CONTENT', + description: + 'Periodically shows status health bars in chat occasionally during vore absorption/digestion.', + component: CheckboxInput, +}; + +export const VISIBLE_TUMMIES: FeatureToggle = { + name: 'Visible Stomach Sprites', + category: 'ADULT CONTENT', + description: 'Enable Seeing the various stomach sprites.', + component: CheckboxInput, +}; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/chat.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/chat.tsx index 10c081f060..71a00a535f 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/chat.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/chat.tsx @@ -50,14 +50,6 @@ export const CHAT_MENTION: FeatureToggle = { component: CheckboxInput, }; -export const VORE_HEALTH_BARS: FeatureToggle = { - name: 'Vore Health Bars', - category: 'CHAT', - description: - 'Periodically shows status health bars in chat occasionally during vore absorption/digestion.', - component: CheckboxInput, -}; - export const NEWS_POPUP: FeatureToggle = { name: 'Lore News Popups', category: 'CHAT', diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx index 5fa5d207a1..5284e1435e 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sound.tsx @@ -138,28 +138,6 @@ export const SOUND_MENTORHELP: FeatureToggle = { component: CheckboxInput, }; -// Vorey sounds -export const BELCH_NOISES: FeatureToggle = { - name: 'Belch Noises', - category: 'SOUNDS', - description: 'Enable hearing burping noises.', - component: CheckboxInput, -}; - -export const EATING_NOISES: FeatureToggle = { - name: 'Eating Noises', - category: 'SOUNDS', - description: 'Enable hearing vore eating noises.', - component: CheckboxInput, -}; - -export const DIGEST_NOISES: FeatureToggle = { - name: 'Digestion Noises', - category: 'SOUNDS', - description: 'Enable hearing vore digestion noises.', - component: CheckboxInput, -}; - export const ambience_freq: FeatureNumeric = { name: 'Ambience Frequency', category: 'SOUNDS', diff --git a/vorestation.dme b/vorestation.dme index 46510187ab..cd7275f1d2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2183,6 +2183,7 @@ #include "code\modules\client\preferences\types\character\general\01_basic.dm" #include "code\modules\client\preferences\types\character\general\03_body.dm" #include "code\modules\client\preferences\types\game\admin.dm" +#include "code\modules\client\preferences\types\game\adult.dm" #include "code\modules\client\preferences\types\game\auto_fit_viewport.dm" #include "code\modules\client\preferences\types\game\chat.dm" #include "code\modules\client\preferences\types\game\fps.dm"