diff --git a/jollystation_modules/code/datums/mood_events/reagent_mood_events.dm b/jollystation_modules/code/datums/mood_events/reagent_mood_events.dm index e8ff716d9ca3..67b87e8a7474 100644 --- a/jollystation_modules/code/datums/mood_events/reagent_mood_events.dm +++ b/jollystation_modules/code/datums/mood_events/reagent_mood_events.dm @@ -16,6 +16,16 @@ description = "I drank some nice, calming psychite tea.\n" mood_change = 8 +/datum/mood_event/full_on_pilk + description = "I am now full on pilk! That was some amazing bubbly goodness!\n" + mood_change = 7 + timeout = 7 MINUTES + +/datum/mood_event/pegged + description = "OH YEAH, NOW IM PEGGED!\n" + mood_change = 8 + timeout = 7 MINUTES + // Addiction moodlets /datum/mood_event/luciferium_light mood_change = -4 diff --git a/jollystation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/jollystation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 09330beca5a4..c36c4aa4d241 100644 --- a/jollystation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/jollystation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -18,3 +18,11 @@ /datum/chemical_reaction/drink/green_tea results = list(/datum/reagent/consumable/green_tea = 5) required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5) //tea powder is obtained from tea plants. + +/datum/chemical_reaction/drink/pilk + results = list(/datum/reagent/consumable/pilk = 2) + required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/space_cola = 1) + +/datum/chemical_reaction/drink/pilk/peg_nog + results = list(/datum/reagent/consumable/ethanol/peg_nog = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/eggnog = 1, /datum/reagent/consumable/space_cola = 1) diff --git a/jollystation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/jollystation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 003b635283af..3524003e5468 100644 --- a/jollystation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/jollystation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -88,3 +88,50 @@ icon_state = "green_tea_cup" //actually unused because of how mugs work... ...for now. icon = 'jollystation_modules/icons/obj/drinks.dmi' list_reagents = list(/datum/reagent/consumable/green_tea = 30) + +/datum/reagent/consumable/pilk + name = "Pilk" + description = "A horrid bubbling combination of milk and cola. You are a fucking alchemist and no-one can tell you otherwise." + color = "#BEAE7E" // rgb: 190, 174, 126 + quality = -4 //this is godawful, though i dont think negative quality actually does anything + nutriment_factor = 2 * REAGENTS_METABOLISM //somehow more filling than pure nutriment + taste_description = "bubbles, milk, whatever the hell pepis is and a want to die" //pepis is canon now, its the rival brand to Space Cola. Renember to rename this to explicitly say pepis if it gets added in. + glass_icon_state = "pilk" //the sprite has what is intended to be foam on top as pilk makes that in real life + glass_name = "glass of pilk" + glass_desc = "A horrid bubbling combination of milk and cola. You are a fucking alchemist and no-one can tell you otherwise." + glass_price = DRINK_PRICE_MEDIUM + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/pilk/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + if(!isfelinid(M)) //felinids love pilk + if(isskeleton(M)) + M.adjustBruteLoss(1, 0) //ITS POISON + else + M.adjust_disgust(4 * REM * delta_time) + else + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "full_on_pilk", /datum/mood_event/full_on_pilk, name) + ..() + +/datum/reagent/consumable/ethanol/peg_nog + name = "Peg Nog" + description = "Its time to get PEGGED!" + color = "#C1C17B" // rgb: 193, 193, 123 + quality = -6 //its somehow worse + nutriment_factor = 3 * REAGENTS_METABOLISM //more filling + boozepwr = 20 + taste_description = "getting pegged" //oh no + glass_icon_state = "peg_nog" + glass_name = "glass of peg nog" + glass_desc = "Its time to get PEGGED!" + glass_price = DRINK_PRICE_MEDIUM + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/peg_nog/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + if(!isfelinid(M)) //felinids love peg nog too! + if(isskeleton(M)) + M.adjustBruteLoss(2, 0) //when drinking this you wish for bone hurting juice + else + M.adjust_disgust(7 * REM * delta_time) + else + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "pegged", /datum/mood_event/pegged, name) + ..() diff --git a/jollystation_modules/icons/obj/drinks.dmi b/jollystation_modules/icons/obj/drinks.dmi index 38e9f42b3c29..aee7890e3574 100644 Binary files a/jollystation_modules/icons/obj/drinks.dmi and b/jollystation_modules/icons/obj/drinks.dmi differ