From 4b0e4cc1e2ed2de991e8e44539433fa81292af3d Mon Sep 17 00:00:00 2001 From: TotallyNotADog Date: Mon, 24 Jan 2022 16:10:47 -0600 Subject: [PATCH] adds genital and vore examine prefs --- code/__DEFINES/citadel_defines.dm | 2 ++ code/modules/client/preferences.dm | 8 ++++++++ code/modules/mob/living/carbon/human/examine.dm | 9 +++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 24251f202..f5c1c28e7 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -141,6 +141,8 @@ #define NO_APHRO (1<<9) #define NO_ASS_SLAP (1<<10) #define NO_AUTO_WAG (1<<11) +#define GENITAL_EXAMINE (1<<12) +#define VORE_EXAMINE (1<<13) #define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|BREAST_ENLARGEMENT|PENIS_ENLARGEMENT) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ffd4de63f..bd32f33c1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1191,6 +1191,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "

Fetish content prefs

" dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"]
" dat += "Exhibitionist:[features["exhibitionist"] == TRUE ? "Yes" : "No"]
" + dat += "Genital examine text:[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"]
" + dat += "Vore examine text:[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"]
" dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"]
" dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"]
" dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]
" @@ -2724,6 +2726,12 @@ GLOBAL_LIST_EMPTY(preferences_datums) parent.mob.hud_used.update_parallax_pref(parent.mob) // Citadel edit - Prefs don't work outside of this. :c + if("genital_examine") + cit_toggles ^= GENITAL_EXAMINE + + if("vore_examine") + cit_toggles ^= VORE_EXAMINE + if("hound_sleeper") cit_toggles ^= MEDIHOUND_SLEEPER diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b9da55e0c..1be10296d 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -127,14 +127,15 @@ . += "[t_He] [t_is] currently in heat." //CIT CHANGES START HERE - adds genital details to examine text - if(LAZYLEN(internal_organs)) + if(LAZYLEN(internal_organs) && user.client?.prefs.cit_toggles & GENITAL_EXAMINE) for(var/obj/item/organ/genital/dicc in internal_organs) if(istype(dicc) && dicc.is_exposed()) . += "[dicc.desc]" - var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code - if(!isnull(cursed_stuff)) - . += cursed_stuff + if(user.client?.prefs.cit_toggles & VORE_EXAMINE) + var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code + if(cursed_stuff) + . += cursed_stuff //END OF CIT CHANGES //Jitters