diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index cb56e303..731baf2a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -47,7 +47,6 @@ //Add a "exclude" string to do the opposite, making it only only species listed that can't wear it. //You append this to clothing objects. //Hyper change// - Variables for HS13 checks - var/roomy = 0 //0 For false /obj/item/clothing/Initialize() @@ -95,6 +94,7 @@ to_chat(user, "You fix the damage on [src] with [C].") return 1 //Hyper Change// + /* if(istype(W, /obj/item/bluespace_thread)) var/obj/item/bluespace_thread/B = W if ((istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit)) && roomy != 1) //Make sure the thread is used on an item that could be ripped off in the first place @@ -106,6 +106,7 @@ qdel(B) else user.show_message("You probably don't need any more room in that.", 1) + */ //Long live roomy = TRUE return ..() /obj/item/clothing/Destroy() diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 436adc47..5893e970 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -103,8 +103,6 @@ actions_types = list(/datum/action/item_action/toggle_helmet) var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit var/obj/item/tank/jetpack/suit/jetpack = null - roomy = TRUE - /obj/item/clothing/suit/space/hardsuit/Initialize() if(jetpack && ispath(jetpack)) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 765cc946..c1b5a448 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -10,7 +10,6 @@ max_integrity = 250 resistance_flags = NONE armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - roomy = TRUE /obj/item/clothing/suit/armor/Initialize() . = ..() diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a5661c3a..07097fa8 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -590,7 +590,6 @@ item_state = "coatcentcom" armor = list("melee" = 40, "bullet" = 45, "laser" = 45, "energy" = 35, "bomb" = 40, "bio" = 25, "rad" = 25, "fire" = 35, "acid" = 50) hoodtype = /obj/item/clothing/head/hooded/winterhood/centcom - roomy = TRUE /obj/item/clothing/suit/hooded/wintercoat/centcom/Initialize() . = ..() @@ -599,7 +598,6 @@ /obj/item/clothing/head/hooded/winterhood/centcom icon_state = "winterhood_centcom" armor = list("melee" = 40, "bullet" = 45, "laser" = 45, "energy" = 35, "bomb" = 40, "bio" = 25, "rad" = 25, "fire" = 35, "acid" = 50) - roomy = TRUE /obj/item/clothing/suit/hooded/wintercoat/captain name = "captain's winter coat" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 188caece..bfc95cc8 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -119,14 +119,12 @@ item_state = "g_suit" item_color = "officer" alt_covers_chest = TRUE - roomy = TRUE /obj/item/clothing/under/rank/centcom_commander desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders, adorned with a golden K and a star. signifying work under Kinaris." name = "\improper CentCom Commander's jumpsuit" icon_state = "centcom" item_state = "dg_suit" item_color = "centcom" - roomy = TRUE /obj/item/clothing/under/rank/centcom_officer/skirt name = "\improper CentCom Officer's jumpskirt" desc = "It's a jumpskirt worn by CentCom's officials, adorned with a golden K and a star, signifying work under Kinaris." @@ -136,7 +134,6 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - roomy = TRUE /obj/item/clothing/under/space name = "\improper NASA jumpsuit" desc = "It has a NASA logo on it and is made of space-proofed materials." @@ -169,7 +166,6 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT can_adjust = FALSE resistance_flags = FIRE_PROOF | ACID_PROOF - roomy = TRUE /obj/item/clothing/under/owl name = "owl uniform" desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction." diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm index b0857692..27bf460e 100644 --- a/code/modules/reagents/reagent_containers/rags.dm +++ b/code/modules/reagents/reagent_containers/rags.dm @@ -128,8 +128,6 @@ var/flat_icon = "towel_flat" var/folded_icon = "towel" var/list/possible_colors - //Hyper Change - var/roomy = TRUE //To cover XL bits /obj/item/reagent_containers/rag/towel/Initialize() . = ..() diff --git a/hyperstation/code/obj/bluespace sewing kit.dm b/hyperstation/code/obj/bluespace sewing kit.dm index 7bb4fe72..808f6a5f 100644 --- a/hyperstation/code/obj/bluespace sewing kit.dm +++ b/hyperstation/code/obj/bluespace sewing kit.dm @@ -1,9 +1,10 @@ //Jay Sparrow #define ROOMY = "ROOMY" +//Sorry jay, I killed it. /obj/item/bluespace_thread name = "Bluespace Sewing Kit" - desc = "Thread infused with bluespace dust to make your clothes a little more roomy." + desc = "Thread infused with bluespace dust to make your clothes a little more roomy. Current sewing technology already incorporates this, so thankfully, the days of needing these are long gone. Good souvenir though." icon = 'hyperstation/icons/obj/bluespace_thread.dmi' icon_state = "thread" item_state = "thread" @@ -32,4 +33,4 @@ time = 40 reqs = list(/obj/item/stack/ore/bluespace_crystal = 1, /obj/item/stack/sheet/cloth = 3) - category = CAT_MISC \ No newline at end of file + category = CAT_MISC diff --git a/hyperstation/code/obj/rewards.dm b/hyperstation/code/obj/rewards.dm index 992ee8a8..6ab4c9bd 100644 --- a/hyperstation/code/obj/rewards.dm +++ b/hyperstation/code/obj/rewards.dm @@ -34,7 +34,6 @@ icon_state = "luwethtrench" item_state = "luwethtrench" mutantrace_variation = NO_MUTANTRACE_VARIATION - roomy = TRUE /obj/item/clothing/gloves/ring/luweth name = "Luweth’s Wedding Band" diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 9441668f..69ae859a 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -75,22 +75,7 @@ /datum/status_effect/chem/breast_enlarger/on_apply(mob/living/carbon/human/H)//Removes clothes, they're too small to contain you. You belong to space now. log_game("FERMICHEM: [owner]'s breasts has reached comical sizes. ID: [owner.key]") - var/mob/living/carbon/human/o = owner - var/items = o.get_contents() - for(var/obj/item/W in items) - if(W == o.w_uniform || W == o.wear_suit) - //Hyper change - var/obj/item/clothing/W2 = W - var/datum/antagonist/changeling/changeling = o.mind.has_antag_datum(/datum/antagonist/changeling) - if(!(W2.roomy == 1 || changeling)) //If the clothes are "roomy" then don't do this. //Or if a changeling - //Hyper change end - o.dropItemToGround(W, TRUE) - playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) - to_chat(o, "Your clothes give, ripping into pieces 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..!") - o.visible_message("[o]'s chest suddenly bursts forth, ripping their clothes off!'") - else - to_chat(o, "Your bountiful bosom is so rich with mass, you seriously doubt you'll be able to fit any clothes over it.") - return ..() + return ..() /datum/status_effect/chem/breast_enlarger/tick(mob/living/carbon/human/H)//If you try to wear clothes, you fail. Slows you down if you're comically huge var/mob/living/carbon/human/o = owner @@ -103,17 +88,6 @@ sizeMoveMod(1) owner.remove_status_effect(src) */ - var/items = o.get_contents() - for(var/obj/item/W in items) - if(W == o.w_uniform || W == o.wear_suit) - //Hyper change// Check for a flag before we remove clothes. - var/obj/item/clothing/W2 = W - var/datum/antagonist/changeling/changeling = o.mind.has_antag_datum(/datum/antagonist/changeling) - if(!(W2.roomy == 1 || changeling)) //If the clothes are "roomy" then don't do this. // Or a ling - //End Hyper Change// - o.dropItemToGround(W, TRUE) - playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) - to_chat(owner, "Your enormous breasts are way too large to fit anything over them!") /* if (B.size == "huge") if(prob(1)) @@ -167,35 +141,9 @@ /datum/status_effect/chem/penis_enlarger/on_apply(mob/living/carbon/human/H)//Removes clothes, they're too small to contain you. You belong to space now. log_game("FERMICHEM: [owner]'s dick has reached comical sizes. ID: [owner.key]") - var/mob/living/carbon/human/o = owner - var/items = o.get_contents() - if(o.w_uniform || o.wear_suit) - //Hyper change// Check for a flag before we remove clothes. - var/obj/item/clothing/suit = o.get_item_by_slot(SLOT_W_UNIFORM) - var/obj/item/clothing/jacket = o.get_item_by_slot(SLOT_WEAR_SUIT) - var/datum/antagonist/changeling/changeling = o.mind.has_antag_datum(/datum/antagonist/changeling) - if(!(suit.roomy == 1 && jacket.roomy == 1)) //If the clothes are "roomy" then don't do this. - if(!changeling) //Or a changeling - //End Hyper Change// - to_chat(o, "Your clothes give, ripping into peices under the strain of your swelling pecker! Unless you manage to reduce the size of your emancipated trouser snake, there's no way you're going to be able to put anything on over this girth..!") - owner.visible_message("[o]'s schlong suddenly bursts forth, ripping their clothes off!'") - else - to_chat(o, "Your emancipated trouser snake is so ripe with girth, you seriously doubt you'll be able to fit any clothes over it.") - for(var/obj/item/W in items) - if(W == o.w_uniform || W == o.wear_suit) - //Hyper change// Check for a flag before we remove clothes. - var/obj/item/clothing/W2 = W - var/datum/antagonist/changeling/changeling = o.mind.has_antag_datum(/datum/antagonist/changeling) - if(!(W2.roomy == 1 || changeling)) //If the clothes are "roomy" then don't do this. - //End Hyper Change// - o.dropItemToGround(W, TRUE) - playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) return ..() - - /datum/status_effect/chem/penis_enlarger/tick(mob/living/carbon/M) - var/mob/living/carbon/human/o = owner /* HYPER CHANGE: Removes blood loss and movement penalties var/obj/item/organ/genital/penis/P = o.getorganslot("penis") moveCalc = 1+((round(P.length) - 21)/3) //effects how fast you can move @@ -205,23 +153,6 @@ o.ResetBloodVol() owner.remove_status_effect(src) */ - - var/items = o.get_contents() - for(var/obj/item/W in items) - //Hyper change// Check for a flag before we remove clothes. - if(istype(W, /obj/item/clothing)) - var/obj/item/clothing/W2 = W - var/datum/antagonist/changeling/changeling = o.mind.has_antag_datum(/datum/antagonist/changeling) - if(!(W2.roomy == 1 || changeling)) //If the clothes are "roomy" then don't do this. - //End Hyper Change// - if (o.arousalloss > 32) // warning that your shaft is getting errect! - if(W == o.w_uniform || W == o.wear_suit ) - to_chat(M, "Your swelling cock begins to strain against your clothes tightly!") - if (o.arousalloss > 33) - if(W == o.w_uniform || W == o.wear_suit ) - o.dropItemToGround(W, TRUE) - playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) - to_chat(owner, "Your erect member is way to large to fit anything over! You will need to be flaccid again to wear clothes!") /* switch(round(P.cached_length)) if(21) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index cb71321d..5766ae47 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -95,19 +95,6 @@ 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 - if (B.cached_size >= 8.5 && B.cached_size < 9) - if(H.w_uniform || H.wear_suit) - //Hyper change// Check for a flag before we remove clothes. - var/obj/item/clothing/suit = H.get_item_by_slot(SLOT_W_UNIFORM) - var/obj/item/clothing/jacket = H.get_item_by_slot(SLOT_WEAR_SUIT) - if(!(suit.roomy == 1 && jacket.roomy == 1)) //If the clothes are "roomy" then don't do this. - var/datum/antagonist/changeling/changeling = M.mind.has_antag_datum(/datum/antagonist/changeling) - if(!changeling)//Changelings can in fact calm their tits - //End Hyper Change// - var/target = M.get_bodypart(BODY_ZONE_CHEST) - to_chat(M, "Your breasts begin to strain against your clothes tightly!") - M.adjustOxyLoss(5, 0) - M.apply_damage(1, BRUTE, target) B.update() ..() @@ -247,7 +234,6 @@ /datum/reagent/fermi/penis_enlarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch. if(!ishuman(M)) return - var/mob/living/carbon/human/H = M var/obj/item/organ/genital/penis/P = M.getorganslot("penis") var/obj/item/organ/genital/testicles/T = M.getorganslot("testicles") //Hyper Change if(!P)//They do have a preponderance for escapism, or so I've heard. @@ -298,20 +284,6 @@ P.cached_length = P.cached_length + 0.1 //Hyper change// Increase ball size too T.size = T.size + 0.1 - - if (P.cached_length >= 20.5 && P.cached_length < 21) - if(H.w_uniform || H.wear_suit|| H.arousalloss > 33) - //Hyper change// Check for a flag before we remove clothes. - var/obj/item/clothing/suit = H.get_item_by_slot(SLOT_W_UNIFORM) - var/obj/item/clothing/jacket = H.get_item_by_slot(SLOT_WEAR_SUIT) - if((!suit.roomy == 1 || !jacket.roomy == 1)) //If the clothes are "roomy" then don't do this. - var/datum/antagonist/changeling/changeling = M.mind.has_antag_datum(/datum/antagonist/changeling) - if(!changeling)//Changelings keep it in their pants - //End Hyper Change// - var/target = M.get_bodypart(BODY_ZONE_CHEST) - to_chat(M, "Your cock begins to strain against your clothes tightly!") - M.apply_damage(1, BRUTE, target) - T.update() //Hyper change - Make the ball size update P.update() ..()