diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 35b507c5..9a7404a9 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -270,9 +270,16 @@ name = "penis enlargement pill" list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10) price = 4 + icon_state = "pill_lewd" /obj/item/reagent_containers/pill/breast_enlargement name = "breast enlargement pill" list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10) price = 4 + icon_state = "pill_lewd" +/obj/item/reagent_containers/pill/butt_enlargement + name = "butt enlargement pill" + list_reagents = list(/datum/reagent/fermi/butt_enlarger = 10) + price = 4 + icon_state = "pill_lewd" \ No newline at end of file diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 228036ec..b723785e 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index e014869a..67288e4d 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -51,6 +51,7 @@ /obj/item/dildo/custom = 5, /obj/item/reagent_containers/pill/penis_enlargement = 3, /obj/item/reagent_containers/pill/breast_enlargement = 3, + /obj/item/reagent_containers/pill/butt_enlargement = 3, /obj/item/clothing/gloves/latexsleeves = 3, /obj/item/clothing/shoes/highheels = 3, /obj/item/clothing/neck/stole = 2, diff --git a/modular_citadel/code/modules/arousal/organs/anus.dm b/modular_citadel/code/modules/arousal/organs/anus.dm index 5be324d2..11a31bc6 100644 --- a/modular_citadel/code/modules/arousal/organs/anus.dm +++ b/modular_citadel/code/modules/arousal/organs/anus.dm @@ -25,7 +25,7 @@ var/lowershape = lowertext(shape) //Reflect the size of dat ass on examine. - switch(size) + switch(round(size)) if(1) size_name = "average" if(2) diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index 9ffa447b..9324c567 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -482,23 +482,23 @@ if(G.slot == "anus" && G.size > 0) //we have a different size system genital_overlay.icon = 'hyperstation/icons/obj/genitals/butt.dmi' - genital_overlay.icon_state = "butt_[size]_OTHER" + genital_overlay.icon_state = "butt_[round(size)]_OTHER" genital_overlay.layer = -ID_LAYER //in front of suit, behind bellies. //creates directional layering by rendering twice. North has higher layer priority to occlude hands. genital_overlay_directional.icon = 'hyperstation/icons/obj/genitals/butt.dmi' - genital_overlay_directional.icon_state = "butt_[size]_NORTH" + genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH" genital_overlay_directional.layer = -NECK_LAYER colourcode = "butt_color" if(use_skintones) //butts are forced a colour, either skin tones, or main colour. how ever, mutants use a darker version, because of their body tone. genital_overlay.color = "#[skintone2hex(H.skin_tone)]" - genital_overlay.icon_state = "butt_[size]_OTHER" - genital_overlay_directional.icon_state = "butt_[size]_NORTH" + genital_overlay.icon_state = "butt_[round(size)]_OTHER" + genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH" else genital_overlay.color = "#[H.dna.features["mcolor"]]" - genital_overlay.icon_state = "butt_[size]_OTHER_m" - genital_overlay_directional.icon_state = "butt_[size]_NORTH_m" + genital_overlay.icon_state = "butt_[round(size)]_OTHER_m" + genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH_m" if(S.center) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index 3e2d266b..68eb0762 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -264,8 +264,8 @@ nP.prev_length = 1 M.reagents.remove_reagent(type, 5) P = nP - - if(!T)//Hyper change// Adds testicles if there are none. + + if(!T)//Hyper change// Adds testicles if there are none. //If they have Acute hepatic pharmacokinesis, then route processing though liver. if(HAS_TRAIT(M, TRAIT_PHARMA)) @@ -378,3 +378,52 @@ P.cached_length = P.cached_length + 0.1 P.update() ..() + + + +///Ass enhancer + +/datum/reagent/fermi/butt_enlarger + name = "Denbu Draft" + description = "A mixture of natural vitamins and valentines plant extract, causing butt enlargement on mammals." + color = "#E60584" // rgb: 96, 0, 255 + taste_description = "butter with a sweet aftertaste" //pass me the butter, OM NOM + overdose_threshold = 17 + can_synth = FALSE + +/datum/reagent/fermi/butt_enlarger/on_mob_add(mob/living/carbon/M) + . = ..() + if(iswendigo(M)) + return + log_game("FERMICHEM: [M] ckey: [M.key] has ingested Butt enhancer") + var/mob/living/carbon/human/H = M + H.genital_override = TRUE + var/obj/item/organ/genital/anus/B = H.getorganslot("anus") + if(!B) + return + +/datum/reagent/fermi/butt_enlarger/on_mob_life(mob/living/carbon/M) //Increases butt size + if(!ishuman(M))//Just in case + return..() + + 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, "Your ass cheeks bulge outwards and feel heavier.") + 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() + ..() \ No newline at end of file