diff --git a/code/game/objects/items/stacks/sheets/hot_ice.dm b/code/game/objects/items/stacks/sheets/hot_ice.dm index 5d1d90a008e..66ea157f496 100644 --- a/code/game/objects/items/stacks/sheets/hot_ice.dm +++ b/code/game/objects/items/stacks/sheets/hot_ice.dm @@ -5,7 +5,7 @@ singular_name = "hot ice" icon = 'icons/obj/stack_objects.dmi' custom_materials = list(/datum/material/hot_ice=MINERAL_MATERIAL_AMOUNT) - grind_results = list(/datum/reagent/toxin/plasma = 300) + grind_results = list(/datum/reagent/toxin/hot_ice = 50) material_type = /datum/material/hot_ice /obj/item/stack/sheet/hot_ice/suicide_act(mob/living/carbon/user) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 69e212c5885..de005307139 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -21,6 +21,10 @@ results = list(/datum/reagent/consumable/icecoffee = 4) required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/coffee = 3) +/datum/chemical_reaction/hoticecoffee + results = list(/datum/reagent/consumable/hot_ice_coffee = 3) + required_reagents = list(/datum/reagent/toxin/hot_ice = 1, /datum/reagent/consumable/coffee = 2) + /datum/chemical_reaction/nuka_cola results = list(/datum/reagent/consumable/nuka_cola = 6) required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/space_cola = 6) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 87275535126..19aa060636a 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -338,6 +338,26 @@ ..() . = 1 +/datum/reagent/consumable/hot_ice_coffee + name = "Hot Ice Coffee" + description = "Coffee with pulsing ice shards" + color = "#102838" // rgb: 16, 40, 56 + nutriment_factor = 0 + taste_description = "bitter coldness and a hint of smoke" + glass_icon_state = "hoticecoffee" + glass_name = "hot ice coffee" + glass_desc = "A sharp drink, this can't have come cheap" + +/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/M) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.AdjustSleeping(-60, FALSE) + M.adjust_bodytemperature(-7 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) + M.Jitter(5) + M.adjustToxLoss(1*REM, 0) + ..() + . = TRUE + /datum/reagent/consumable/icetea name = "Iced Tea" description = "No relation to a certain rap artist/actor." diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index c64a4704d2e..963288c1e18 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -108,6 +108,23 @@ return ..() +/datum/reagent/toxin/hot_ice + name = "Hot Ice Slush" + description = "Frozen plasma, worth its weight in gold, to the right people" + reagent_state = SOLID + color = "#724cb8" // rgb: 114, 76, 184 + taste_description = "thick and smokey" + specific_heat = SPECIFIC_HEAT_PLASMA + toxpwr = 3 + material = /datum/material/hot_ice + +/datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/M) + if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) + holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2*REM) + M.adjustPlasma(20) + M.adjust_bodytemperature(-7 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal()) + return ..() + /datum/reagent/toxin/lexorin name = "Lexorin" description = "A powerful poison used to stop respiration." diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index e1ee94fce05..ee7515e36d2 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -44,6 +44,11 @@ results = list(/datum/reagent/toxin/lexorin = 3) required_reagents = list(/datum/reagent/toxin/plasma = 1, /datum/reagent/hydrogen = 1, /datum/reagent/medicine/salbutamol = 1) +/datum/chemical_reaction/hot_ice_melt + results = list(/datum/reagent/toxin/plasma = 12) //One sheet of hot ice makes 200m of plasma + required_reagents = list(/datum/reagent/toxin/hot_ice = 1) + required_temp = T0C + 30 //Don't burst into flames when you melt + /datum/chemical_reaction/chloralhydrate results = list(/datum/reagent/toxin/chloralhydrate = 1) required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/chlorine = 3, /datum/reagent/water = 1) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 1e045d91d1c..d739ec7591e 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ