diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 14a88602f2..baaa0da0c2 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -41,15 +41,17 @@ /datum/status_effect/chem/BElarger/on_apply(mob/living/carbon/M)//Removes clothes, they're too small to contain you. You belong to space now. message_admins("BElarge started!") var/mob/living/carbon/human/H = M - for(var/obj/item/W in H) + var/items = M.get_contents() + for(W in items) if(W == H.w_uniform || W == H.wear_suit) - H.dropItemToGround(W) - playsound(owner.loc, 'sound/items/poster_ripped.ogg', 50, 1) - //items |= owner.get_equipped_items(TRUE) - owner.visible_message("[M]'s chest suddenly bursts forth, ripping their clothes off!'") - to_chat(owner, "Your clothes give, ripping into peices under the strain of your swelling breasts! Unless you manage to reduce the size of your breasts, there's no way you're going to be able to put anything on over these melons..!") - //owner.dropItemToGround(owner.wear_suit) - //owner.dropItemToGround(owner.w_uniform) + M.dropItemToGround(W, TRUE) + message_admins("Dropping [W]") + playsound(owner.loc, 'sound/items/poster_ripped.ogg', 50, 1) + //items |= owner.get_equipped_items(TRUE) + owner.visible_message("[M]'s chest suddenly bursts forth, ripping their clothes off!'") + to_chat(owner, "Your clothes give, ripping into peices under the strain of your swelling breasts! Unless you manage to reduce the size of your breasts, there's no way you're going to be able to put anything on over these melons..!") + //owner.dropItemToGround(owner.wear_suit) + //owner.dropItemToGround(owner.w_uniform) /datum/status_effect/chem/BElarger/tick(mob/living/carbon/M)//If you try to wear clothes, you fail. Slows you down if you're comically huge message_admins("BElarge tick!") diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 9717622c04..d945436817 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -93,24 +93,34 @@ H.remove_status_effect(/datum/status_effect/chem/BElarger) if(9 to 15) size = breast_sizes[round(cached_size)] - //if(!H.has_status_effect(/datum/status_effect/chem/BElarger)) - H.apply_status_effect(/datum/status_effect/chem/BElarger) + if(!H.has_status_effect(/datum/status_effect/chem/BElarger)) + H.apply_status_effect(/datum/status_effect/chem/BElarger) message_admins("Attempting to apply.") if(16 to INFINITY) size = cached_size - message_admins("Breast size: [size], [cached_size], [owner]") - if(size == 0)//Bloody byond with it's counting from 1 - size = 17 - message_admins("[breast_values[prev_size]] vs [breast_values[size]]") - if (!(prev_size == breast_values[size])) - if(prev_size == 0)//rabble rabble - prev_size = 17 - if (breast_values[size] > breast_values[prev_size]) - to_chat(owner, "Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a [uppertext(size)]-cup.") - prev_size = cached_size - else if (breast_values[size] < breast_values[prev_size]) - to_chat(owner, "Your breasts [pick("shrink down to", "decrease into", "diminish into", "deflate into", "shrivel regretfully into", "shrivels into")] a [uppertext(size)]-cup.") - prev_size = cached_size - icon_state = "breasts_[shape]_[size]" - H.update_body() + + if(round(cached_size) < 16)//Because byond doesn't count from 0, I have to do this. + if (prev_size == 0) + prev_size = "flat" + message_admins("Breast size: [size], [cached_size], [owner]") + if(size == 0)//Bloody byond with it's counting from 1 + size = "flat" + message_admins("[prev_size] vs [breast_values[size]]") + message_admins("breast_values[size] vs [breast_values[prev_size]]") + if (breast_values[size] > breast_values[prev_size]) + to_chat(owner, "Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a [uppertext(size)]-cup.") + //prev_size = cached_size + else if (breast_values[size] < breast_values[prev_size]) + to_chat(owner, "Your breasts [pick("shrink down to", "decrease into", "diminish into", "deflate into", "shrivel regretfully into", "shrivels into")] a [uppertext(size)]-cup.") + //prev_size = cached_size + prev_size = size + icon_state = "breasts_[shape]_[size]" + H.update_body() + else + if(!isnum(prev_size)) + prev_size = breast_values[prev_size] + if(size > prev_size) + to_chat(owner, "Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom, taking both of your hands to hold!.") + else if (size < prev_size) + to_chat(owner, "Your breasts do something crazy that the big Fermis in the sky didn't account for.") //breasts.icon_state = "breasts_[shape]_[size]_0_FRONT"