diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index df7bfbd840..94447dbeeb 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -103,6 +103,9 @@ /datum/reagent/drink/bubbleteabanana price_tag = 5 + +/datum/reagent/drink/lowpower + price_tag = 4 // Spirituous liquors // @@ -269,6 +272,9 @@ /datum/reagent/ethanol/coffee/irishcoffee price_tag = 4 + +/datum/reagent/ethanol/coffee/jackbrew + price_tag = 6 /datum/reagent/ethanol/longislandicedtea price_tag = 4 @@ -371,7 +377,14 @@ /datum/reagent/ethanol/erebusmoonrise price_tag = 4 + +/datum/reagent/ethanol/coldfront + price_tag = 4 +/datum/reagent/ethanol/bookwyrm + price_tag = 4 + + // The Cheap Shit // /datum/reagent/ethanol/hooch diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index df2d2799bc..dc339c1f3f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -554,6 +554,10 @@ message = "makes a noise." m_type = 2 + if ("weh") + message = "lets out a weh." + m_type = 1 + if ("whimper") if (miming) message = "appears hurt." @@ -727,7 +731,7 @@ src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \ frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, \ raise, salute, scream, sneeze, shake, shiver, shrug, sigh, signal-#1-10, slap-(none)/mob, smile, sneeze, sniff, snore, stare-(none)/mob, stopsway/swag, sway/wag, swish, tremble, twitch, \ - twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping" + twitch_v, vomit, weh, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping" else src << "Unusable emote '[act]'. Say *help for a list." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 8ae7e94a56..497cc1a335 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3130,4 +3130,94 @@ glass_name = "blue train" glass_desc = "A glass of what can only be described as the bastard child between coolant and alcohol made by a madman." + +/datum/reagent/drink/lowpower + name = "The low power" + id = "lowpower" + description = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly." + taste_description = "creamy lemonade, with some zest" + color = "#5d8d39" + + glass_name = "lowpower" + glass_desc = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly." + +/datum/reagent/drink/lowpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_DIONA) + return + M.adjustToxLoss(-0.5 * removed) + +/datum/reagent/ethanol/coffee/jackbrew + name = "Jack's brew" + id = "jackbrew" + description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." + taste_description = "wishing you could give up on the day" + color = "#4C3100" + strength = 15 + + glass_name = "Jack's brew" + glass_desc = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." + +/datum/reagent/ethanol/coffee/jackbrew/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_TAJARA) + removed *= 1.25 + if(alien == IS_SLIME) + M.make_jittery(4) //Hyperactive fluid pumping results in unstable 'skeleton', resulting in vibration. + if(dose >= 5) + M.nutrition = (M.nutrition - (removed * 2)) //Sadly this movement starts burning food in higher doses. + ..() + if(prob(5)) + M.emote(pick("twitch", "blink_r", "shiver", "weh")) + M.add_chemical_effect(CE_SPEEDBOOST, 1) + +/datum/reagent/ethanol/bookwyrm + name = "Bookwyrm's bite" + id = "bookwyrm" + description = "You'd probably fancy a nice nap by the fireplace after drinking this." + taste_description = "Mint, lime and a cold cozy nap" + color = "#5678c3" + strength = 20 + adj_temp = -10 + targ_temp = 273 //Dilluted cold front wont be the death of anyone who cant handle sipping liquid nitrogen. + + glass_name = "Bookwyrm's bite" + glass_desc = "A cold lime mint drink. Dont drink to much or you might fall asleep." + +/datum/reagent/ethanol/bookwyrm/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + + var/threshold = 1 + if(alien == IS_SKRELL) + threshold = 1.2 + + if(alien == IS_SLIME) + threshold = 6 //Evens to 3 due to the fact they are considered 'small' for flaps. + + var/effective_dose = dose + if(issmall(M)) + effective_dose *= 2 + + if(effective_dose < 1 * threshold) + if(effective_dose == metabolism * 2 || prob(5)) + M.emote("yawn") + else if(effective_dose < 1.5 * threshold) + M.eye_blurry = max(M.eye_blurry, 10) + else if(effective_dose < 5 * threshold) + if(prob(50)) + M.Weaken(2) + M.drowsyness = max(M.drowsyness, 20) + else + if(alien == IS_SLIME) //They don't have eyes, and they don't really 'sleep'. Fumble their general senses. + M.eye_blurry = max(M.eye_blurry, 30) + if(prob(20)) + M.ear_deaf = max(M.ear_deaf, 4) + M.Confuse(2) + else + M.Weaken(2) + else + M.sleeping = max(M.sleeping, 20) + M.drowsyness = max(M.drowsyness, 60) + + \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index ef39e951e9..76e8496319 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2286,6 +2286,27 @@ required_reagents = list("coolant" = 2, "ethanol" = 2, "nutriment" = 1) result_amount = 5 +/datum/chemical_reaction/drinks/lowpower + name = "The low power" + id = "lowpower" + result = "lowpower" + required_reagents = list("lemonade" = 1, "cream" = 1, "limejuice" = 1) + result_amount = 3 + +/datum/chemical_reaction/drinks/jackbrew + name = "Jack's brew" + id = "jackbrew" + result = "jackbrew" + required_reagents = list("irishcoffee" = 1, "hyperzine" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/bookwyrm + name = "Bookwyrm's bite" + id = "bookwyrm" + result = "bookwyrm" + required_reagents = list("coldfront" = 1, "limejuice" = 1, "stoxin" = 1) + result_amount = 3 + //R-UST Port /datum/chemical_reaction/hyrdophoron name = "Hydrophoron" diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm index 01582920f4..05c65fcbb9 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm @@ -519,19 +519,19 @@ Drinks Data glass_icon_state = "bubbleteawatermelonglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/drink/bubbleteawatermelon +/datum/reagent/drink/bubbleteastrawberry glass_icon_state = "bubbleteastrawberryglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/drink/bubbleteawatermelon +/datum/reagent/drink/bubbleteacherry glass_icon_state = "bubbleteacherryglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/drink/bubbleteawatermelon +/datum/reagent/drink/bubbleteacoffee glass_icon_state = "bubbleteacoffeeglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/drink/bubbleteawatermelon +/datum/reagent/drink/bubbleteabanana glass_icon_state = "bubbleteabananaglass" glass_center_of_mass = list("x"=16, "y"=9) @@ -541,4 +541,16 @@ Drinks Data /datum/reagent/toxin/bluetrain glass_icon_state = "bluetrain" - glass_center_of_mass = list("x"=16, "y"=8) \ No newline at end of file + glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/drink/lovepotion + glass_icon_state = "lovepotion" + +/datum/reagent/drink/lowpower + glass_icon_state = "lowpower" + +/datum/reagent/ethanol/coffee/jackbrew + glass_icon_state = "jackbrew" + +/datum/reagent/ethanol/bookwyrm + glass_icon_state = "bookwyrm" \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 5baf162951..b981044f43 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ