From 7963a93f3f6bd9ee43f8264daf3d3275fa35a042 Mon Sep 17 00:00:00 2001 From: TotallyNotADog Date: Mon, 24 Jan 2022 01:06:31 -0600 Subject: [PATCH] makes some pref toggles actually work makes the buttons functional for hypno, aphro, and ass slapping, and makes enlargement prefs actually functional instead of just affecting new organs --- code/__DEFINES/citadel_defines.dm | 2 +- code/modules/client/preferences.dm | 15 +++++-- .../chemistry/reagents/enlargement.dm | 43 ++++++++++--------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 8f9fa99f9..86b7410b6 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -139,7 +139,7 @@ #define HYPNO (1<<7) #define NEVER_HYPNO (1<<8) #define NO_APHRO (1<<9) -#define NO_ASS_SLAP (1<<9) +#define NO_ASS_SLAP (1<<10) #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 2f8fc19f8..2ecd4ec20 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Loadout" dat += "Game Preferences" dat += "Antagonist Preferences" - dat += "Content Preferences" + dat += "Content Preferences" if(!path) dat += "
Please create an account to save your preferences
" @@ -1202,9 +1202,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "

Other content prefs

" dat += "Breast Enlargement: [(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]
" dat += "Penis Enlargement: [(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"]
" - dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"]
" + dat += "Hypno: [(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"]
" dat += "Aphrodisiacs: [(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"]
" - dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]
" + dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]
" dat += "
" dat += "
" @@ -2746,6 +2746,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("hypno") cit_toggles ^= HYPNO + if("never_hypno") + cit_toggles ^= NEVER_HYPNO + + if("aphro") + cit_toggles ^= NO_APHRO + + if("ass_slap") + cit_toggles ^= NO_ASS_SLAP + //END CITADEL EDIT if("ambientocclusion") diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index 61bd76885..a13253d4d 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -73,7 +73,7 @@ if(!(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT)) var/obj/item/organ/liver/L = M.getorganslot("liver") if(L) - L.swelling+= 0.05 + //L.swelling+= 0.05 HYPER CHANGE: Liver swelling is the non-lewd equivalent of large genitals impeding movement. Feature is depreciated on Hyper. return..() else M.adjustToxLoss(1) @@ -95,15 +95,16 @@ to_chat(M, "Your chest feels warm, tingling with newfound sensitivity.") M.reagents.remove_reagent(type, 5) B = nB - //If they have them, increase size. If size is comically big, limit movement and rip clothes. - B.cached_size = B.cached_size + 0.05 - B.update() + //If they have them, and opted in, increase size. + if(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT) + B.cached_size = B.cached_size + 0.05 + B.update() ..() /datum/reagent/fermi/breast_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders. if(!(M.client?.prefs.cit_toggles & FORCED_FEM)) var/obj/item/organ/liver/L = M.getorganslot("liver") - L.swelling+= 0.05 + //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life() return ..() var/obj/item/organ/genital/penis/P = M.getorganslot("penis") @@ -142,10 +143,11 @@ var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts") if(!(M.client?.prefs.cit_toggles & BREAST_ENLARGEMENT) || !B) var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER) - L.swelling-= 0.05 + //L.swelling-= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life() return ..() - B.cached_size = B.cached_size - 0.05 - B.update() + if(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT) + B.cached_size = B.cached_size - 0.05 + B.update() ..() /datum/reagent/fermi/BEsmaller_hypo @@ -241,7 +243,7 @@ if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT)) var/obj/item/organ/liver/L = M.getorganslot("liver") if(L) - L.swelling+= 0.05 + //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life() return..() else M.adjustToxLoss(1) @@ -260,7 +262,7 @@ if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT)) var/obj/item/organ/liver/L = M.getorganslot("liver") if(L) - L.swelling+= 0.05 + //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life() return..() else M.adjustToxLoss(1) @@ -276,18 +278,18 @@ nP.prev_length = 1 M.reagents.remove_reagent(type, 5) P = nP - - P.cached_length = P.cached_length + 0.1 - //Hyper change// Increase ball size too - T.size = T.size + 0.1 - T.update() //Hyper change - Make the ball size update - P.update() + if(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT) + P.cached_length = P.cached_length + 0.1 + //Hyper change// Increase ball size too + T.size = T.size + 0.1 + T.update() //Hyper change - Make the ball size update + P.update() ..() /datum/reagent/fermi/penis_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders. if(!(M.client?.prefs.cit_toggles & FORCED_MASC)) var/obj/item/organ/liver/L = M.getorganslot("liver") - L.swelling+= 0.05 + //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life() return..() var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts") @@ -325,10 +327,11 @@ var/obj/item/organ/genital/penis/P = H.getorganslot("penis") if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT) || !P) var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER) - L.swelling-= 0.05 + //L.swelling-= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life() return..() - P.cached_length = P.cached_length - 0.1 - P.update() + if(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT) + P.cached_length = P.cached_length - 0.1 + P.update() ..() /datum/reagent/fermi/PEsmaller_hypo