diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index f6ef08fe0d..d78405eb64 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -53,7 +53,8 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) - GLOB.breasts_size_list = list("a","b","c","d","e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. + GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. + GLOB.gentlmans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger") //END OF CIT CHANGES //Species diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm index cb4c300f60..7c32ef7421 100644 --- a/code/datums/mood_events/drink_events.dm +++ b/code/datums/mood_events/drink_events.dm @@ -6,19 +6,19 @@ /datum/mood_event/quality_nice description = "That drink wasn't bad at all.\n" mood_change = 1 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/quality_good description = "That drink was pretty good.\n" mood_change = 2 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/quality_verygood description = "That drink was great!\n" mood_change = 3 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/quality_fantastic description = "That drink was amazing!\n" mood_change = 4 - timeout = 2 MINUTE + timeout = 2 MINUTES diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 20dacdd38f..6424078b12 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -19,7 +19,7 @@ /datum/mood_event/burnt_thumb description = "I shouldn't play with lighters...\n" mood_change = -1 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/cold description = "It's way too cold in here.\n" @@ -32,17 +32,17 @@ /datum/mood_event/creampie description = "I've been creamed. Tastes like pie flavor.\n" mood_change = -2 - timeout = 3 MINUTE + timeout = 3 MINUTES /datum/mood_event/slipped description = "I slipped. I should be more careful next time...\n" mood_change = -2 - timeout = 3 MINUTE + timeout = 3 MINUTES /datum/mood_event/eye_stab description = "I used to be an adventurer like you, until I took a screwdriver to the eye.\n" mood_change = -4 - timeout = 3 MINUTE + timeout = 3 MINUTES /datum/mood_event/delam //SM delamination description = "Those God damn engineers can't do anything right...\n" @@ -52,7 +52,7 @@ /datum/mood_event/depression description = "I feel sad for no particular reason.\n" mood_change = -9 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord description = "I can't even end it all!\n" @@ -71,7 +71,7 @@ /datum/mood_event/tased description = "There's no \"z\" in \"taser\". It's in the zap.\n" mood_change = -3 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/embedded description = "Pull it out!\n" @@ -80,7 +80,7 @@ /datum/mood_event/table description = "Someone threw me on a table!\n" mood_change = -2 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/table/add_effects() if(ishuman(owner)) @@ -122,7 +122,7 @@ /datum/mood_event/healsbadman description = "I feel a lot better, but wow that was disgusting.\n" mood_change = -4 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/jittery description = "I'm nervous and on edge and I can't stand still!!\n" @@ -131,12 +131,12 @@ /datum/mood_event/vomit description = "I just threw up. Gross.\n" mood_change = -2 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/vomitself description = "I just threw up all over myself. This is disgusting.\n" mood_change = -4 - timeout = 3 MINUTE + timeout = 3 MINUTES /datum/mood_event/painful_medicine description = "Medicine may be good for me but right now it stings like hell.\n" diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index acc8a620ad..c4045f2e07 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -1,7 +1,7 @@ /datum/mood_event/hug description = "Hugs are nice.\n" mood_change = 1 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/arcade description = "I beat the arcade game!\n" @@ -50,7 +50,7 @@ /datum/mood_event/jolly description = "I feel happy for no particular reason.\n" mood_change = 6 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/focused description = "I have a goal, and I will reach it, whatever it takes!\n" //Used for syndies, nukeops etc so they can focus on their goals @@ -83,9 +83,9 @@ /datum/mood_event/chemical_laughter description = "Laughter really is the best medicine! Or is it?\n" mood_change = 4 - timeout = 3 MINUTE + timeout = 3 MINUTES /datum/mood_event/chemical_superlaughter description = "*WHEEZE*\n" mood_change = 12 - timeout = 3 MINUTE + timeout = 3 MINUTES diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm index 5c36054768..eb58f2aa92 100644 --- a/code/datums/mood_events/needs_events.dm +++ b/code/datums/mood_events/needs_events.dm @@ -59,4 +59,4 @@ /datum/mood_event/nice_shower description = "I have recently had a nice shower.\n" mood_change = 2 - timeout = 3 MINUTE + timeout = 3 MINUTES diff --git a/modular_citadel/code/datums/mood_events/generic_negative_events.dm b/modular_citadel/code/datums/mood_events/generic_negative_events.dm index 2d03a7e990..bb04b0b283 100644 --- a/modular_citadel/code/datums/mood_events/generic_negative_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_negative_events.dm @@ -3,12 +3,12 @@ /datum/mood_event/plushjack description = "I have butchered a plush recently.\n" mood_change = -1 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/plush_nostuffing description = "A plush I tried to pet had no stuffing...\n" mood_change = -1 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/emptypred description = "I had to let someone out.\n" diff --git a/modular_citadel/code/datums/mood_events/generic_positive_events.dm b/modular_citadel/code/datums/mood_events/generic_positive_events.dm index 3f9f405955..ffa661e6e9 100644 --- a/modular_citadel/code/datums/mood_events/generic_positive_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_positive_events.dm @@ -3,12 +3,12 @@ /datum/mood_event/headpat description = "Headpats are nice.\n" mood_change = 2 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/hugbox description = "I hugged a box of hugs recently.\n" mood_change = 1 - timeout = 2 MINUTE + timeout = 2 MINUTES /datum/mood_event/plushpet description = "I pet a plush recently.\n" diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 27a2d720bf..ea2fe492f3 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -9,7 +9,7 @@ size = BREASTS_SIZE_DEF //SHOULD BE A LETTER, starts as a number...??? var/cached_size = null //for enlargement SHOULD BE A NUMBER var/prev_size //For flavour texts SHOULD BE A LETTER - var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat") + //var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat") var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0) var/statuscheck = FALSE fluid_id = "milk" @@ -95,12 +95,12 @@ owner.remove_status_effect(/datum/status_effect/chem/BElarger) statuscheck = FALSE if(1 to 8) //If modest size - size = breast_sizes[round(cached_size)] + size = GLOB.breasts_size_list[round(cached_size)] if(owner.has_status_effect(/datum/status_effect/chem/BElarger)) owner.remove_status_effect(/datum/status_effect/chem/BElarger) statuscheck = FALSE if(9 to 15) //If massive - size = breast_sizes[round(cached_size)] + size = GLOB.breasts_size_list[round(cached_size)] if(!owner.has_status_effect(/datum/status_effect/chem/BElarger)) owner.apply_status_effect(/datum/status_effect/chem/BElarger) statuscheck = TRUE @@ -113,7 +113,7 @@ if(size == 0)//Bloody byond with it's counting from 1 size = "flat" if(isnum(prev_size)) - prev_size = breast_sizes[prev_size] + prev_size = GLOB.breasts_size_list[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.") var/mob/living/carbon/human/H = owner diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index a2b4a34549..73afd75002 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -171,7 +171,7 @@ P.length = dna.features["cock_length"] P.girth_ratio = dna.features["cock_girth_ratio"] P.shape = dna.features["cock_shape"] - P.prev_size = P.length + P.prev_length = P.length P.cached_length = P.length P.update() diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 560e019196..4dd10c3ab0 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -18,7 +18,7 @@ var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF var/list/dickflags = list() var/list/knotted_types = list("knotted", "barbed, knotted") - var/prev_size = 6 //really should be renamed to prev_length + var/prev_length = 6 //really should be renamed to prev_length /obj/item/organ/genital/penis/Initialize() . = ..() @@ -59,11 +59,11 @@ if(!owner.has_status_effect(/datum/status_effect/chem/PElarger)) o.apply_status_effect(/datum/status_effect/chem/PElarger) - if (round(length) > round(prev_size)) - to_chat(o, "Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.") - else if (round(length) < round(prev_size)) - to_chat(o, "Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.") - prev_size = length + if (round(length) > round(prev_length)) + to_chat(o, "Your [pick(GLOB.gentlmans_organ_names)] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.") + else if (round(length) < round(prev_length)) + to_chat(o, "Your [pick(GLOB.gentlmans_organ_names)] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.") + prev_length = length icon_state = sanitize_text("penis_[shape]_[size]") girth = (length * girth_ratio)//Is it just me or is this ludicous, why not make it exponentially decay? diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 061ecf9972..e16d12dcc3 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -660,7 +660,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING if(!P) H.emergent_genital_call() return - P.prev_size = P.length + P.prev_length = P.length P.cached_length = P.length /datum/reagent/fermi/PElarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch. @@ -675,7 +675,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING nP.length = 1 to_chat(M, "Your groin feels warm, as you feel a newly forming bulge down below.") nP.cached_length = 1 - nP.prev_size = 1 + nP.prev_length = 1 M.reagents.remove_reagent(src.id, 5) P = nP