diff --git a/code/datums/chemistry/Chemistry-Recipes.dm b/code/datums/chemistry/Chemistry-Recipes.dm index 0880866a..011cf387 100644 --- a/code/datums/chemistry/Chemistry-Recipes.dm +++ b/code/datums/chemistry/Chemistry-Recipes.dm @@ -545,7 +545,7 @@ datum drinkrecipe = 1 cocktail_beepskybeer - name = "Beepskybräu Security Schwarzbier" + name = "Beepskybräu Security Schwarzbier" id = "beepskybeer" result = "beepskybeer" required_reagents = list("beer" = 1, "nanites" = 1) @@ -608,7 +608,7 @@ datum name = "Space-Cuba Libre" id = "libre" result = "libre" - required_reagents = list("cola" = 1, "rum" = 1, "juice_lime" = 1) + required_reagents = list("rcola" = 2, "juice_lime" = 1) result_amount = 3 mix_phrase = "You shed a single patriotic tear as the drink comes together." mix_sound = 'sound/misc/drinkfizz.ogg' @@ -775,6 +775,15 @@ datum result_amount = 2 mix_phrase = "The ghosts of starlets past waft by." mix_sound = 'sound/misc/drinkfizz.ogg' + + rum_and_cola + name = "Rum and Cola" + id = "rcola" + result = "rcola" + required_reagents = list("rum" = 1, "cola" = 1) + result_amount = 2 + mix_phrase = "A sweet and bitter aroma fills the air." + mix_sound = 'sound/misc/drinkfizz.ogg' cocktail_gchronic name = "Gin and Chronic" @@ -849,7 +858,7 @@ datum mix_sound = 'sound/effects/blobattack.ogg' cocktail_pinacolada - name = "Piña Colada" + name = "Piña Colada" id = "pinacolada" result = "pinacolada" required_reagents = list("juice_pineapple" = 1, "rum" = 1, "coconut_milk" = 1) @@ -902,6 +911,17 @@ datum id = "necroni2" required_reagents = list("negroni" = 2, "ectoplasm" = 1) result_amount = 3 + + cocktail_honky_tonic + name = "Honky Tonic" + id = "honky_tonic" + result = "honky_tonic" + required_reagents = list("tonic" = 1, "lube" = 1, "colors" = 1, "neurotoxin" = 1) + result_amount = 4 + mix_phrase = "The drink honks at you! What the fuck?" + mix_sound = 'sound/misc/drinkfizz_honk.ogg' + drinkrecipe = 1 + squeeze name = "Squeeze" diff --git a/code/datums/chemistry/Reagents-FoodDrink.dm b/code/datums/chemistry/Reagents-FoodDrink.dm index 7db5ea6a..3ef77ae3 100644 --- a/code/datums/chemistry/Reagents-FoodDrink.dm +++ b/code/datums/chemistry/Reagents-FoodDrink.dm @@ -262,7 +262,8 @@ datum taste = "spooky" fooddrink/alcoholic/beepskybeer - name = "Beepskybräu Security Schwarzbier" + name = "Beepskybräu Security Schwarzbier" + name = "Beepskybräu Security Schwarzbier" id = "beepskybeer" description = "A dark German beer, typically served with dark bread, cream cheese, and an intense appreciation for the law." reagent_state = LIQUID @@ -1008,6 +1009,129 @@ datum alch_strength = 3 description = "A Drink then you'll have that's not bad - / At least, so they say in Jamaica!" reagent_state = LIQUID + + fooddrink/alcoholic/rcola + name = "Rum and Cola" + id = "rcola" + fluid_r = 115 + fluid_g = 38 + fluid_b = 77 + alch_strength = 2 + description = "It's fizzy, it's tangy, and perfect for when you can't decide if you wanna get the jitters or knock yourself out!" + reagent_state = LIQUID + + fooddrink/alcoholic/honky_tonic + name = "Honky Tonic" + id = "honky_tonic" + fluid_r = 255 + fluid_g = 102 + fluid_b = 204 + alch_strength = 2 + description = "The true miracle of this bastardization of mixology is that it somehow isn't lethal." + reagent_state = LIQUID + + // Occasionally weakens and stuns the mob. Sometimes they honk. More rarely, they might even randomly say something stupid against their will. + on_mob_life(var/mob/M) + ..(M) + if(!M) M = holder.my_atom + src = null + if(prob(10)) + boutput(M, "Your body feels like it's being tickled from the inside out!") + M.stunned += 2 + M.weakened += 2 + M.emote("laugh") + M.visible_message("[M] sneezes. \His sneeze sounds like a honk!") + playsound(M.loc, "sound/items/bikehorn.ogg", 50, 1) + if (prob(4)) + //Create an alphabet soup of random phrases and force the mob to say it! + var/message = null + var/messageStart = pick( + "Man, I sure feel like a",\ + "You are a",\ + "My mother once told me that I was born a",\ + "Father always said all I needed was a",\ + "That's just like the time I ate a",\ + "Aunty Muriel was always prone to giving me a",\ + "Your face looks like a",\ + "Spoiler alert! We're all living inside of a",\ + "Tonight we're gonna go on a trip in a",\ + "Save me! I'm being attacked by a",\ + "Brainstorming time; let's try making a",\ + "Let's try feeding the captain a",\ + "Chill out and dive right into the",\ + "Take off the clown's mask to reveal a",\ + "I heard you talking about me! You said I was a",\ + "Y'know, right now I could totally go for a",\ + "I read in a book once that in each and every one of us is a",\ + "I asked the captain what he thought of me, and he just turned to me and said I was a",\ + "You and me? We're just like a ") + var/messageAdjective = pick( + " REALLY big ",\ + " smelly ",\ + " delicious ",\ + " sweet sweet ",\ + " totally bodacious ",\ + "n awesomely radical ",\ + " super stinky ",\ + "n ugly-ass ",\ + " dum-dum bum-bum ",\ + " gorgeous and beautiful ",\ + " gramatically incorrect ",\ + " needlessly vulgar and generally problematic ",\ + " fucking dumbass bullshit poopie ",\ + " tired old ",\ + " mentally corrupt ",\ + " pretentious little ",\ + " not-so-robust ",\ + " flowery and aromatic ",\ + " fourth-wall breaking ",\ + " dirty yellow-bellied ",\ + " drunken and drugged ",\ + "n uncannily realistic") + var/messageNoun = pick( + "ghost!",\ + "freak!",\ + "pirate!",\ + "lawyer with WAY too much free time.",\ + "man made of meat.",\ + "bowl of word soup.",\ + "bee.",\ + "greytider.",\ + "buttbot.",\ + "existential nightmare.",\ + "key to worldwide destruction...",\ + "novel without a proper ending.",\ + "space station!",\ + "monkey.",\ + "frog.",\ + "space god.",\ + "monster made of madness.",\ + "wizard!",\ + "burrito.",\ + "ass." ,\ + "cluwne.") + var/messageEnd = null + if (prob(50)) + messageEnd = pick( + " What did I mean by this?",\ + " And that's not even half of it!",\ + " Thanks for coming to my presentation.",\ + " Thank you have a good day.",\ + " I'M the traitor by the way!",\ + " Please free me from this chemical prison.",\ + " And that's just the tip of the iceberg!",\ + " By the way, I'm hungry.",\ + " Sorry, was that too much information?",\ + " Momma told me to keep that a secret though.",\ + " Sorry, didn't mean to make myself cry!",\ + " Sorry, I may be a little tipsy.",\ + " I never looked at life the same way ever since I learned that.",\ + " Deep, huh?",\ + " I still ponder the meaning of it to be honest.",\ + " I still haven't gotten over that.") + message = messageStart + messageAdjective + messageNoun + messageEnd + M.say(message) + return fooddrink/alcoholic/maitai name = "Mai Tai" @@ -1118,7 +1242,7 @@ datum reagent_state = LIQUID fooddrink/alcoholic/pinacolada - name = "Piña Colada" + name = "Piña Colada" id = "pinacolada" fluid_r = 255 fluid_g = 255 diff --git a/data/AdminPrefs.sav b/data/AdminPrefs.sav new file mode 100644 index 00000000..e69de29b diff --git a/sound/misc/drinkfizz_honk.ogg b/sound/misc/drinkfizz_honk.ogg new file mode 100644 index 00000000..2f4df411 Binary files /dev/null and b/sound/misc/drinkfizz_honk.ogg differ