diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 94447dbeeb..07b50ebcad 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -107,6 +107,9 @@ /datum/reagent/drink/lowpower price_tag = 4 +/datum/reagent/drink/highpower + price_tag = 7 + // Spirituous liquors // /datum/reagent/ethanol/irish_cream @@ -384,6 +387,11 @@ /datum/reagent/ethanol/bookwyrm price_tag = 4 +/datum/reagent/ethanol/flapper + price_tag = 4 + +/datum/reagent/toxin/oilslide + price_tag = 5 // The Cheap Shit // 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 497cc1a335..afcf63e231 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3219,5 +3219,43 @@ M.sleeping = max(M.sleeping, 20) M.drowsyness = max(M.drowsyness, 60) +/datum/reagent/drink/highpower + name = "The High power" + id = "highpower" + description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." + taste_description = "copper, ozone, and pain" + color = "#a2f563" + glass_name = "highpower" + glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." + +/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + if(prob(5)) + M.say("!skin's crackles with energy and seems to be in pain.") + M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",60) + M.AdjustWeakened(1) //Getting sapped makes the victim fall + M.add_chemical_effect(CE_SPEEDBOOST, 1) + +/datum/reagent/ethanol/flapper + name = "Flapper" + id = "flapper" + description = "A common drink among blood-drinkers, and those who just wanna drink. Tinnibat be damned." + taste_description = "a bloody good time" + color = "#763424" + strength = 15 + + glass_name = "flapper" + glass_desc = "A common drink among blood-drinkers, and those who just wanna drink. Tinnibat be damned." + +/datum/reagent/toxin/oilslide + name = "Oil slide" + id = "oilslide" + description = "Tasty, if you're a synth, not so much for organics." + taste_description = "oil, slime, and fuel! Tastes also like synthetic backwash" + color = "#331a1a" + + glass_name = "oilslide" + glass_desc = "Tasty, if you're a synth, not so much for organics." \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 76e8496319..65d6b0e2ef 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2307,6 +2307,27 @@ required_reagents = list("coldfront" = 1, "limejuice" = 1, "stoxin" = 1) result_amount = 3 +/datum/chemical_reaction/drinks/highpower + name = "The high power" + id = "highpower" + result = "highpower" + required_reagents = list("lowpower" = 1, "iron" = 1, "uranium" = 1) + result_amount = 3 + +/datum/chemical_reaction/drinks/flapper + name = "Flapper" + id = "flapper" + result = "flapper" + required_reagents = list("whiskey" = 1, "blood" = 1, "ice" = 1) + result_amount = 3 + +/datum/chemical_reaction/toxin/oilslide + name = "Oil slide" + id = "oilslide" + result = "oilslide" + required_reagents = list("moonshine" = 1, "lube" = 1, "fuel" = 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 05c65fcbb9..a17005e87d 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm @@ -553,4 +553,13 @@ Drinks Data glass_icon_state = "jackbrew" /datum/reagent/ethanol/bookwyrm - glass_icon_state = "bookwyrm" \ No newline at end of file + glass_icon_state = "bookwyrm" + +/datum/reagent/drink/highpower + glass_icon_state = "highpower" + +/datum/reagent/ethanol/flapper + glass_icon_state = "flapper" + +/datum/reagent/toxin/oilslide + glass_icon_state = "oilslide" \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index b981044f43..e49b7c0713 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ