adds butt expansion and furranium prefs

This commit is contained in:
TotallyNotADog
2022-01-24 18:58:25 -06:00
parent 4b0e4cc1e2
commit c0baf9687f
4 changed files with 43 additions and 29 deletions
+11 -9
View File
@@ -134,15 +134,17 @@
#define BREAST_ENLARGEMENT (1<<3)
#define PENIS_ENLARGEMENT (1<<4)
#define FORCED_FEM (1<<5)
#define FORCED_MASC (1<<6)
#define HYPNO (1<<7)
#define NEVER_HYPNO (1<<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 ASS_ENLARGEMENT (1<<5)
#define FORCED_FEM (1<<6)
#define FORCED_MASC (1<<7)
#define HYPNO (1<<8)
#define NEVER_HYPNO (1<<9)
#define NO_APHRO (1<<10)
#define NO_ASS_SLAP (1<<11)
#define NO_AUTO_WAG (1<<12)
#define GENITAL_EXAMINE (1<<13)
#define VORE_EXAMINE (1<<14)
#define NO_UWU (1<<15)
#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|BREAST_ENLARGEMENT|PENIS_ENLARGEMENT)
+9 -1
View File
@@ -1204,10 +1204,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<h2>Other content prefs</h2>"
dat += "<b>Breast Enlargement:</b> <a href='?_src_=prefs;preference=breast_enlargement'>[(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]</a><br>"
dat += "<b>Penis Enlargement:</b> <a href='?_src_=prefs;preference=penis_enlargement'>[(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"]</a><br>"
dat += "<b>Ass Enlargement:</b> <a href='?_src_=prefs;preference=ass_enlargement'>[(cit_toggles & ASS_ENLARGEMENT) ? "Allowed" : "Disallowed"]</a><br>"
dat += "<b>Hypno:</b> <a href='?_src_=prefs;preference=never_hypno'>[(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"]</a><br>"
dat += "<b>Aphrodisiacs:</b> <a href='?_src_=prefs;preference=aphro'>[(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"]</a><br>"
dat += "<b>Ass Slapping:</b> <a href='?_src_=prefs;preference=ass_slap'>[(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]</a><br>"
dat += "<b>Automatic Wagging:</b> <a href='?_src_=prefs;preference=auto_wag'>[(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"]</a><br>"
dat += "<b>Automatic Wagging:</b> <a href='?_src_=prefs;preference=auto_wag'>[(cit_toggles & NO_AUTO_WAG) ? "Disallowed" : "Allowed"]</a><br>"
dat += "<b>Forced UwUspeak:</b> <a href='?_src_=prefs;preference=no_uwu'>[(cit_toggles & NO_UWU) ? "Disallowed" : "Allowed"]</a><br>"
dat += "</tr></table>"
dat += "<br>"
@@ -2747,6 +2749,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("penis_enlargement")
cit_toggles ^= PENIS_ENLARGEMENT
if("ass_enlargement")
cit_toggles ^= ASS_ENLARGEMENT
if("feminization")
cit_toggles ^= FORCED_FEM
@@ -2768,6 +2773,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("auto_wag")
cit_toggles ^= NO_AUTO_WAG
if("no_uwu")
cit_toggles ^= NO_UWU
//END CITADEL EDIT
if("ambientocclusion")
@@ -395,22 +395,24 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/anus/B = M.getorganslot("anus")
if(!B) //If they don't have a butt. Give them one!
var/obj/item/organ/genital/anus/nB = new
nB.Insert(M)
if(nB)
if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"])
nB.color = skintone2hex(H.skin_tone)
else if(M.dna.features["breasts_color"])
nB.color = "#[M.dna.features["breasts_color"]]"
else
nB.color = skintone2hex(H.skin_tone)
nB.size = 1
to_chat(M, "<span class='warning'>Your ass cheeks bulge outwards and feel heavier.</b></span>")
M.reagents.remove_reagent(type, 5)
B = nB
//If they have, increase size.
if(B.size < 5) //just make sure you dont break sprites
B.size = B.size + 0.05
B.update()
if(!B) //If they don't have a butt and are opted in, give them one!
if(H.client?.prefs.cit_toggles & ASS_ENLARGEMENT)
var/obj/item/organ/genital/anus/nB = new
nB.Insert(M)
if(nB)
if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"])
nB.color = skintone2hex(H.skin_tone)
else if(M.dna.features["breasts_color"])
nB.color = "#[M.dna.features["breasts_color"]]"
else
nB.color = skintone2hex(H.skin_tone)
nB.size = 1
to_chat(M, "<span class='warning'>Your ass cheeks bulge outwards and feel heavier.</b></span>")
M.reagents.remove_reagent(type, 5)
B = nB
//If they have & opt in, increase size.
if(H.client?.prefs.cit_toggles & ASS_ENLARGEMENT)
if(B.size < 5) //just make sure you dont break sprites
B.size = B.size + 0.05
B.update()
..()
@@ -108,7 +108,9 @@
..()
/datum/reagent/fermi/furranium/on_mob_life(mob/living/carbon/M)
if(M.client?.prefs.cit_toggles & NO_UWU) //if opted out of uwuspeak
holder.del_reagent(type)
return
switch(current_cycle)
if(1 to 9)
if(prob(20))