diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index d6db35e68d..fad9ddcda5 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -102,10 +102,6 @@
#define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus
-#define STATUS_EFFECT_BREASTS_ENLARGEMENT /datum/status_effect/chem/breast_enlarger //Applied slowdown due to the ominous bulk.
-
-#define STATUS_EFFECT_PENIS_ENLARGEMENT /datum/status_effect/chem/penis_enlarger //More applied slowdown, just like the above.
-
#define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
#define STATUS_EFFECT_MESMERIZE /datum/status_effect/mesmerize //Just reskinned no_combat_mode
diff --git a/code/modules/arousal/organs/breasts.dm b/code/modules/arousal/organs/breasts.dm
index 9e30530ad3..e37224e401 100644
--- a/code/modules/arousal/organs/breasts.dm
+++ b/code/modules/arousal/organs/breasts.dm
@@ -88,7 +88,6 @@
to_chat(owner, "You feel your breasts shrinking away from your body as your chest flattens out.")
QDEL_IN(src, 1)
return
- var/enlargement = FALSE
switch(rounded_cached)
if(0) //flatchested
size = "flat"
@@ -96,16 +95,8 @@
size = breast_values[rounded_cached]
if(9 to 15) //massive
size = breast_values[rounded_cached]
- enlargement = TRUE
if(16 to INFINITY) //rediculous
size = "huge"
- enlargement = TRUE
- if(owner)
- var/status_effect = owner.has_status_effect(STATUS_EFFECT_BREASTS_ENLARGEMENT)
- if(enlargement && !status_effect)
- owner.apply_status_effect(STATUS_EFFECT_BREASTS_ENLARGEMENT)
- else if(!enlargement && status_effect)
- owner.remove_status_effect(STATUS_EFFECT_BREASTS_ENLARGEMENT)
if(rounded_cached < 16 && owner)//Because byond doesn't count from 0, I have to do this.
var/mob/living/carbon/human/H = owner
diff --git a/code/modules/arousal/organs/penis.dm b/code/modules/arousal/organs/penis.dm
index a8e95673ae..05553cd3c7 100644
--- a/code/modules/arousal/organs/penis.dm
+++ b/code/modules/arousal/organs/penis.dm
@@ -39,7 +39,6 @@
return
var/rounded_length = round(length)
var/new_size
- var/enlargement = FALSE
var/max_D = CONFIG_GET(number/penis_max_inches_prefs)
switch(rounded_length)
if(0 to 6) //If modest size
@@ -48,18 +47,8 @@
new_size = 2
if(12 to max_D) //If massive
new_size = 3
- if(max_D + 1 to max_D+13) //If massive and due for large effects, modified in case some server owner running recent citcode decides to be insane with dick sizes in the config
- new_size = 3
- enlargement = TRUE
if(max_D+14 to INFINITY) //If comical
new_size = 4 //no new sprites for anything larger yet
- enlargement = TRUE
- if(owner)
- var/status_effect = owner.has_status_effect(STATUS_EFFECT_PENIS_ENLARGEMENT)
- if(enlargement && !status_effect)
- owner.apply_status_effect(STATUS_EFFECT_PENIS_ENLARGEMENT)
- else if(!enlargement && status_effect)
- owner.remove_status_effect(STATUS_EFFECT_PENIS_ENLARGEMENT)
if(linked_organ)
linked_organ.size = clamp(size + new_size, BALLS_SIZE_MIN, BALLS_SIZE_MAX)
linked_organ.update()
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 0e971d4ced..8f48e90068 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -32,82 +32,6 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/datum/status_effect/chem/breast_enlarger
- id = "breast_enlarger"
- alert_type = null
- var/moveCalc = 1
- var/cachedmoveCalc = 1
- var/last_checked_size //used to prevent potential cpu waste from happening every tick.
-
-/datum/status_effect/chem/breast_enlarger/on_apply()//Removes clothes, they're too small to contain you. You belong to space now.
- log_reagent("FERMICHEM: [owner]'s breasts has reached comical sizes. ID: [owner.key]")
- return ..()
-
-/datum/status_effect/chem/breast_enlarger/tick()//If you try to wear clothes, you fail. Slows you down if you're comically huge
- var/mob/living/carbon/human/H = owner
- var/obj/item/organ/genital/breasts/B = H.getorganslot(ORGAN_SLOT_BREASTS)
- if(!B)
- H.remove_status_effect(src)
- return
- moveCalc = 1+((round(B.cached_size) - 9)/3) //Afffects how fast you move, and how often you can click.
-
- if(last_checked_size != B.cached_size)
- H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/status_effect/breast_hypertrophy, multiplicative_slowdown = moveCalc)
-
- if (B.size == "huge")
- if(prob(1))
- to_chat(owner, "Your back is feeling sore.")
- var/target = H.get_bodypart(BODY_ZONE_CHEST)
- H.apply_damage(0.1, BRUTE, target)
- else
- if(prob(1))
- to_chat(H, "Your back is feeling a little sore.")
- last_checked_size = B.cached_size
- ..()
-
-/datum/status_effect/chem/breast_enlarger/on_remove()
- log_reagent("FERMICHEM: [owner]'s breasts has reduced to an acceptable size. ID: [owner.key]")
- to_chat(owner, "Your expansive chest has become a more managable size, liberating your movements.")
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/breast_hypertrophy)
- return ..()
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/datum/status_effect/chem/penis_enlarger
- id = "penis_enlarger"
- alert_type = null
- var/bloodCalc
- var/moveCalc
- var/last_checked_size //used to prevent potential cpu waste, just like the above.
-
-/datum/status_effect/chem/penis_enlarger/on_apply()//Removes clothes, they're too small to contain you. You belong to space now.
- log_reagent("FERMICHEM: [owner]'s dick has reached comical sizes. ID: [owner.key]")
- return ..()
-
-
-/datum/status_effect/chem/penis_enlarger/tick()
- var/mob/living/carbon/human/H = owner
- var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
- if(!P)
- owner.remove_status_effect(src)
- return
- moveCalc = 1+((round(P.length) - 21)/3) //effects how fast you can move
- bloodCalc = 1+((round(P.length) - 21)/15) //effects how much blood you need (I didn' bother adding an arousal check because I'm spending too much time on this organ already.)
- if(P.length < 22 && H.has_movespeed_modifier(/datum/movespeed_modifier/status_effect/penis_hypertrophy))
- to_chat(owner, "Your rascally willy has become a more managable size, liberating your movements.")
- H.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/penis_hypertrophy)
- else if(P.length >= 22 && !H.has_movespeed_modifier(/datum/movespeed_modifier/status_effect/penis_hypertrophy))
- to_chat(H, "Your indulgent johnson is so substantial, it's taking all your blood and affecting your movements!")
- H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/status_effect/penis_hypertrophy, multiplicative_slowdown = moveCalc)
- H.AdjustBloodVol(bloodCalc)
- ..()
-
-/datum/status_effect/chem/penis_enlarger/on_remove()
- log_reagent("FERMICHEM: [owner]'s dick has reduced to an acceptable size. ID: [owner.key]")
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/penis_hypertrophy)
- owner.ResetBloodVol()
- return ..()
-
///////////////////////////////////////////////
// Astral INSURANCE
///////////////////////////////////////////////