diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm index 22afcd02..3fa560c4 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm @@ -25,4 +25,108 @@ glass_desc = "A bold mixture of cheap energy drink, and even cheaper ale. Beloved by partygoers and daredevils across the galaxy. Beloathed by bugpeople" shot_glass_icon_state = "shotglassbrown" pH = 4.5 - value = 0.1 \ No newline at end of file + value = 0.1 + +/datum/reagent/consumable/ethanol/belly_bloats + name = "Belly bloats" + description = "A classic of this sector that bloats the waistline. Hard to stop chugging once you start." + color = "#000000" + boozepwr = 25 + taste_description = "a heavy mix of cherry and beer" + quality = DRINK_GOOD + glass_icon_state = "belly_bloats" + glass_name = "belly bloats" + glass_desc = "The perfect mix to be big and merry with." + shot_glass_icon_state = "shotglassbrown" + hydration = 3 + +/datum/reagent/consumable/ethanol/belly_bloats/on_mob_life(mob/living/carbon/M) + if(M && M?.client?.prefs.weight_gain_chems) // GS13 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/datum/reagent/consumable/ethanol/blobby_mary + name = "Blobby mary" + description = "A bloody mary that may make you immobile. Still wondering if it's blood or tomato juice?" + color = "#000000" + boozepwr = 55 + taste_description = "tomateos and an anvil on your stomach" + quality = DRINK_FANTASTIC + glass_icon_state = "blobby_mary" + glass_name = "blobby mary" + glass_desc = "For the morbidly obese ladies and gentlemen." + shot_glass_icon_state = "shotglassred" + hydration = 4 + +/datum/reagent/consumable/ethanol/blobby_mary/on_mob_life(mob/living/carbon/M) + if(M && M?.client?.prefs.weight_gain_chems) // GS13 + M.nutrition += 25 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/datum/reagent/consumable/heavy_cafe + name = "Heavy cafe" + description = "Coffee, milk, sugar and cream. For the days when you really don't want to work." + color = "#000000" + taste_description = "coffee, milk and sugar" + quality = DRINK_GOOD + glass_icon_state = "heavy_cafe" + glass_name = "heavy cafe" + glass_desc = "To enjoy slow mornings with." + shot_glass_icon_state = "shotglassbrown" + hydration = 3 + +/datum/reagent/consumable/heavy_cafe/on_mob_life(mob/living/carbon/M) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.SetSleeping(0, FALSE) + M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL) + M.Jitter(5) + if(M.getBruteLoss() && prob(20)) + M.heal_bodypart_damage(1,0, 0) + if(M && M?.client?.prefs.weight_gain_chems) // GS13 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/datum/reagent/consumable/fruits_tea + name = "Fruits tea" + description = "Somehow this mix of fruits and tea can cause considerable bulking." + color = "#000000" + taste_description = "a sweet and sour mix" + quality = DRINK_NICE + glass_icon_state = "fruits_tea" + glass_name = "fruits tea" + glass_desc = "Goes down really easy and stays there for a long time." + shot_glass_icon_state = "shotglassgold" + hydration = 4 + +/datum/reagent/consumable/fruits_tea/on_mob_life(mob/living/carbon/M) + if(M && M?.client?.prefs.weight_gain_chems) // GS13 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/datum/reagent/consumable/snakebite + name = "Snakebite" + description = "Guaranteed to stop 100% of all moving." + color = "#000000" + taste_description = "bitter immobility" + quality = DRINK_VERYGOOD + glass_icon_state = "snakebite" + glass_name = "snakebite" + glass_desc = "Won't hurt like a real bite, but you'll still regert drinking this." + shot_glass_icon_state = "shotglassgreen" + hydration = 4 + +/datum/reagent/consumable/snakebite/on_mob_life(mob/living/carbon/M) + if(M && M?.client?.prefs.weight_gain_chems) // GS13 + M.nutrition += 25 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() \ No newline at end of file diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm index 97adc1f1..ebddac2d 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm @@ -13,5 +13,38 @@ results = list(/datum/reagent/consumable/ethanol/glyphid_slammer = 2) required_reagents = list(/datum/reagent/consumable/pwr_game = 1, /datum/reagent/consumable/ethanol/beer = 1) +/datum/chemical_reaction/belly_bloats + name = "Belly bloat" + id = /datum/reagent/consumable/ethanol/belly_bloats + results = list(/datum/reagent/consumable/ethanol/belly_bloats = 2) + required_reagents = list(/datum/reagent/consumable/gibbfloats = 1, /datum/reagent/consumable/ethanol/beer = 1) +/datum/chemical_reaction/blobby_mary + name = "Blobby nary" + id = /datum/reagent/consumable/ethanol/blobby_mary + results = list(/datum/reagent/consumable/ethanol/blobby_mary = 3) + required_reagents = list(/datum/reagent/consumable/tomatojuice = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/lipoifier = 1) +/datum/chemical_reaction/heavy_cafe1 + name = "Heavy cafe" + id = /datum/reagent/consumable/heavy_cafe + results = list(/datum/reagent/consumable/heavy_cafe = 3) + required_reagents = list(/datum/reagent/consumable/cafe_latte = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/heavy_cafe2 + name = "Heavy cafe" + id = /datum/reagent/consumable/heavy_cafe + results = list(/datum/reagent/consumable/heavy_cafe = 3) + required_reagents = list(/datum/reagent/consumable/soy_latte = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/fruits_tea + name = "Snakebite" + id = /datum/reagent/consumable/fruits_tea + results = list(/datum/reagent/consumable/fruits_tea = 3) + required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/tea = 1) + +/datum/chemical_reaction/snakebite + name = "Snakebite" + id = /datum/reagent/consumable/snakebite + results = list(/datum/reagent/consumable/snakebite = 3) + required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/lipoifier = 1) \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 046ec549..9dfd0bbf 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ