diff --git a/GainStation13/code/datums/diseases/advance/symptoms/berry.dm b/GainStation13/code/datums/diseases/advance/symptoms/berry.dm index 3d1aa3bd..eef203ce 100644 --- a/GainStation13/code/datums/diseases/advance/symptoms/berry.dm +++ b/GainStation13/code/datums/diseases/advance/symptoms/berry.dm @@ -13,7 +13,7 @@ threshold_desc = list( "Stage Speed" = "Increases the rate of liquid production.", ) - var/datum/reagent/infection_reagent = /datum/reagent/berry_juice_infection + var/datum/reagent/infection_reagent = /datum/reagent/blueberry_juice /datum/symptom/berry/Start(datum/disease/advance/A) if(!..()) @@ -35,52 +35,13 @@ if(prob(base_message_chance)) to_chat(M, "[pick("You feel oddly full...", "Your stomach churns...", "You hear a gurgle...", "You taste berries...")]") else - to_chat(M, "[pick("A deep slosh comes from inside you...", "Your mind feels so light...", "You think blue really suits you...", "Your skin feels so tight...")]") + to_chat(M, "[pick("A deep slosh comes from inside you...", "Your mind feels light...", "You think blue really suits you...", "Your skin feels so tight...")]") M.reagents.add_reagent(infection_reagent, max(A.totalStageSpeed(), 1)) -/datum/reagent/berry_juice_infection - name = "Blueberry Juice" - description = "Totally infectious." - reagent_state = LIQUID - metabolization_rate = 0.25 * REAGENTS_METABOLISM - color = "#0004ff" - var/picked_color - var/list/random_color_list = list("#0058db","#5d00c7","#0004ff","#0057e7") - taste_description = "blueberry pie" - var/no_mob_color = FALSE - value = 10 //it sells. Make that berry factory - -/datum/reagent/berry_juice_infection/on_mob_add(mob/living/L, amount) - if(iscarbon(L)) - var/mob/living/carbon/affected_mob = L - if(affected_mob?.client && !(affected_mob?.client?.prefs?.blueberry_inflation)) - affected_mob.reagents.remove_reagent(/datum/reagent/berry_juice_infection, volume) - return - picked_color = pick(random_color_list) - affected_mob.hider_add(src) - else - L.reagents.remove_reagent(/datum/reagent/berry_juice_infection, volume) - ..() - -/datum/reagent/berry_juice_infection/on_mob_life(mob/living/carbon/M) - if(M?.client && !(M?.client?.prefs?.blueberry_inflation)) - M.reagents.remove_reagent(/datum/reagent/berry_juice_infection, volume) - return - if(!no_mob_color) - M.add_atom_colour(picked_color, WASHABLE_COLOUR_PRIORITY) - M.adjust_fatness(1, FATTENING_TYPE_CHEM) - ..() - -/datum/reagent/berry_juice_infection/on_mob_delete(mob/living/L) - if(!iscarbon(L)) - return - var/mob/living/carbon/C = L - C.hider_remove(src) - /obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target) - if(M.reagents.get_reagent_amount(/datum/reagent/berry_juice_infection) > 0 && (reagents.total_volume + min(amount_per_transfer_from_this, 10)) <= volume) - reagents.add_reagent(/datum/reagent/berry_juice_infection, min(10, amount_per_transfer_from_this)) - M.reagents.remove_reagent(/datum/reagent/berry_juice_infection, min(10, amount_per_transfer_from_this)) + if(M.reagents.get_reagent_amount(/datum/reagent/blueberry_juice) > 0 && (reagents.total_volume + min(amount_per_transfer_from_this, 10)) <= volume) + reagents.add_reagent(/datum/reagent/blueberry_juice, min(10, amount_per_transfer_from_this)) + M.reagents.remove_reagent(/datum/reagent/blueberry_juice, min(10, amount_per_transfer_from_this)) if(M != user) to_chat(user, "You juice [M.name]...") to_chat(M, "[user.name] juices you...") @@ -88,6 +49,3 @@ to_chat(user, "You get some juice out of you...") return ..() - -/datum/reagent/berry_juice_infection/proc/fat_hide() - return (124 * (volume * volume))/1000 //123'840 600% size, about 56'000 400% size, calc was: (3 * (volume * volume))/50 diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 02d1f2c9..f0f64e65 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -99,18 +99,45 @@ /datum/reagent/blueberry_juice name = "Blueberry Juice" - description = "Non-infectious. Hopefully." + description = "Totally infectious." reagent_state = LIQUID + metabolization_rate = 0.25 * REAGENTS_METABOLISM color = "#0004ff" + var/picked_color var/list/random_color_list = list("#0058db","#5d00c7","#0004ff","#0057e7") taste_description = "blueberry pie" var/no_mob_color = FALSE + value = 10 //it sells. Make that berry factory /datum/reagent/blueberry_juice/on_mob_life(mob/living/carbon/M) + if(M?.client && !(M?.client?.prefs?.blueberry_inflation)) + M.reagents.remove_reagent(/datum/reagent/blueberry_juice, volume) + return if(!no_mob_color) - M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) + M.add_atom_colour(picked_color, WASHABLE_COLOUR_PRIORITY) + M.adjust_fatness(1, FATTENING_TYPE_CHEM) ..() +/datum/reagent/blueberry_juice/on_mob_add(mob/living/L, amount) + if(iscarbon(L)) + var/mob/living/carbon/affected_mob = L + if(affected_mob?.client && !(affected_mob?.client?.prefs?.blueberry_inflation)) + affected_mob.reagents.remove_reagent(/datum/reagent/blueberry_juice, volume) + return + picked_color = pick(random_color_list) + affected_mob.hider_add(src) + else + L.reagents.remove_reagent(/datum/reagent/blueberry_juice, volume) + ..() + +/datum/reagent/blueberry_juice/on_mob_delete(mob/living/L) + if(!iscarbon(L)) + return + var/mob/living/carbon/C = L + C.hider_remove(src) + +/datum/reagent/blueberry_juice/proc/fat_hide() + return (124 * (volume * volume))/1000 //123'840 600% size, about 56'000 400% size, calc was: (3 * (volume * volume))/50 // /obj/item/reagent_containers/food/snacks/meat/steak/troll // name = "Troll steak" diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index c9910f5c..df0c0894 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -46,7 +46,8 @@ icon_state = "gum_wrapped" desc = "Doesn't cause anything more than some discoloration... probably." trash = /obj/item/trash/blueberry_gum - list_reagents = list(/datum/reagent/blueberry_juice = 0.5) + list_reagents = list(/datum/reagent/blueberry_juice = 50) + bitesize = 5 filling_color = "#001aff" tastes = list("blueberry gum" = 1) foodtype = FRUIT diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b2e83199..34c654aa 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -895,7 +895,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Honey" if(/datum/reagent/consumable/nutriment) dat += "Nutriment" - if(/datum/reagent/berry_juice_infection) + if(/datum/reagent/blueberry_juice) dat += "Berry Juice" else dat += "Nothing?" @@ -946,7 +946,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Strawberry Milk" if(/datum/reagent/consumable/nutriment) dat += "Nutriment" - if(/datum/reagent/berry_juice_infection) + if(/datum/reagent/blueberry_juice) dat += "Berry Juice" else dat += "Nothing?" @@ -2398,7 +2398,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("Nutriment") features["balls_fluid"] = /datum/reagent/consumable/nutriment if("Berry Juice") - features["balls_fluid"] = /datum/reagent/berry_juice_infection + features["balls_fluid"] = /datum/reagent/blueberry_juice if("egg_size") var/new_size @@ -2447,7 +2447,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("Nutriment") features["breasts_fluid"] = /datum/reagent/consumable/nutriment if("Berry Juice") - features["breasts_fluid"] = /datum/reagent/berry_juice_infection + features["breasts_fluid"] = /datum/reagent/blueberry_juice if("breasts_color") var/new_breasts_color = input(user, "Breast Color:", "Character Preference", "#"+features["breasts_color"]) as color|null