diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 5624ac09440..140bd88c2dd 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -2717,3 +2717,144 @@ datum M.bodytemperature = max(310, M.bodytemperature-5) ..() return + + sbiten + name = "Sbiten" + id = "sbiten" + description = "A spicy Vodka! Might be a little hot for the little guys!" + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 360) + M.bodytemperature = min(360, M.bodytemperature+50) //310 is the normal bodytemp. 310.055 + if(!data) data = 1 + data++ + M.dizziness +=6 + if(data >= 45 && data <125) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 6 + else if(data >= 125 && prob(33)) + M.confused = max(M:confused+5,5) + ..() + return + + red_mead + name = "Red Mead" + id = "red_mead" + description = "The true Viking drink! Even though it has a strange red color." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=5 + if(data >= 55 && data <115) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 4 + else if(data >= 115 && prob(33)) + M.confused = max(M:confused+4,4) + ..() + return + + mead + name = "Mead" + id = "mead" + description = "A Vikings drink, though a cheap one." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=4 + if(data >= 55 && data <115) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 4 + else if(data >= 115 && prob(33)) + M.confused = max(M:confused+3,3) + ..() + return + + + iced_beer + name = "Iced Beer" + id = "iced_beer" + description = "A beer which is so cold the air around it freezes." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 270) + M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055 + if(!data) data = 1 + data++ + M.dizziness +=5 + if(data >= 45 && data <125) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 6 + else if(data >= 125 && prob(33)) + M.confused = max(M:confused+4,5) + ..() + return + + grog + name = "Grog" + id = "grog" + description = "A fine drink for Space." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.dizziness +=7 + if(data >= 55 && data <115) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 7 + else if(data >= 115 && prob(33)) + M.confused = max(M:confused+7,7) + ..() + return + + nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + description = "A high quality drink promising to jitter you." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 30) + M.confused = max(M:confused+3,0) + M.make_dizzy(10) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + if(!data) data = 1 + data++ + switch(data) + if(51 to INFINITY) + M:sleeping += 2 + ..() + return + + soy_latte + name = "Soy Latte" + id = "soy_latte" + description = "A nice and tasty beverage while you are reading." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + ..() + M.dizziness = max(0,M.dizziness-20) + M:drowsyness = max(0,M:drowsyness-20) + M:sleeping = 0 + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature+5) + M.make_jittery(5) + ..() + return + + cafe_latte + name = "Cafe Latte" + id = "cafe_latte" + description = "A nice, strong and tasty beverage while you are reading." + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + ..() + M.dizziness = max(0,M.dizziness-30) + M:drowsyness = max(0,M:drowsyness-30) + M:sleeping = 0 + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature+10) + M.make_jittery(10) + ..() + return diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index 700d832ec48..2bf2b4c6fb7 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -828,3 +828,59 @@ datum result = "bahama_mama" required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1) result_amount = 6 + + sbiten + name = "Sbiten" + id = "sbiten" + result = "sbiten" + required_reagents = list("vodka" = 10, "capsaicin" = 1) + result_amount = 10 + + red_mead + name = "Red Mead" + id = "red_mead" + result = "red_mead" + required_reagents = list("blood" = 1, "water" = 1, "wine" = 1) + result_amount = 3 + + mead + name = "Mead" + id = "mead" + result = "mead" + required_reagents = list("orangejuice" = 1, "wine" = 1) + result_amount = 2 + + iced_beer + name = "Iced Beer" + id = "iced_beer" + result = "iced_beer" + required_reagents = list("beer" = 10, "frostoil" = 1) + result_amount = 10 + + grog + name = "Grog" + id = "grog" + result = "grog" + required_reagents = list("rum" = 1, "water" = 1) + result_amount = 2 + + nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + result = "nuka_cola" + required_reagents = list("radium" = 1, "cola" = 1) + result_amount = 2 + + soy_latte + name = "Soy Latte" + id = "soy_latte" + result = "soy_latte" + required_reagents = list("coffee" = 1, "soymilk" = 1) + result_amount = 2 + + cafe_latte + name = "Cafe Latte" + id = "cafe_latte" + result = "cafe_latte" + required_reagents = list("coffee" = 1, "milk" = 1, "cream" = 1) + result_amount = 3 diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 71bff992ad0..79328da1f56 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2712,6 +2712,38 @@ icon_state = "bahama_mama" name = "Bahama Mama" desc = "Tropic cocktail" + if("sbiten") + icon_state = "sbitenglass" + name = "Sbiten" + desc = "A spicy mix of Vodka and Spice. Very hot." + if("red_mead") + icon_state = "red_meadglass" + name = "Red Mead" + desc = "A True Vikings Beverage, though its color is strange." + if("mead") + icon_state = "meadglass" + name = "Mead" + desc = "A Vikings Beverage, though a cheap one." + if("iced_beer") + icon_state = "iced_beerglass" + name = "Iced Beer" + desc = "A beer so frosty, the air around it freezes." + if("grog") + icon_state = "grogglass" + name = "Grog" + desc = "A fine and cepa drink for Space." + if("nuka_cola") + icon_state = "nuka_colaglass" + name = "Nuka Cola" + desc = "A high quality Cola promised to make you jitter." + if("soy_latte") + icon_state = "soy_latte" + name = "Soy Latte" + desc = "A nice and refrshing beverage while you are reading." + if("cafe_latte") + icon_state = "cafe_latte" + name = "Cafe Latte" + desc = "A nice, strong and refreshing beverage while you are reading." else icon_state ="glass_brown" name = "Glass of ..what?" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 03472464bb2..f6f67286be1 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 4416b69d021..38923c20bf1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -708,10 +708,8 @@ #include "code\modules\mob\living\carbon\metroid\examine.dm" #include "code\modules\mob\living\carbon\metroid\hud.dm" #include "code\modules\mob\living\carbon\metroid\life.dm" -#include "code\modules\mob\living\carbon\metroid\login.dm" #include "code\modules\mob\living\carbon\metroid\metroid.dm" #include "code\modules\mob\living\carbon\metroid\powers.dm" -#include "code\modules\mob\living\carbon\metroid\say.dm" #include "code\modules\mob\living\carbon\monkey\death.dm" #include "code\modules\mob\living\carbon\monkey\emote.dm" #include "code\modules\mob\living\carbon\monkey\examine.dm"