From 79a72a50d48cf075f8e86c31d2cb129333d61efd Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 14 Apr 2020 11:13:49 -0400 Subject: [PATCH] this is annoying, why is angel not defind as a race --- code/__DEFINES/food.dm | 1 + code/__DEFINES/is_helpers.dm | 1 + code/datums/mood_events/drink_events.dm | 5 ++ .../food_and_drinks/recipes/drinks_recipes.dm | 51 ++++++++++++++++--- .../chemistry/reagents/drink_reagents.dm | 9 ++++ .../chemistry/reagents/other_reagents.dm | 2 + 6 files changed, 63 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 72e6a12f84..a347fd7327 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -18,3 +18,4 @@ #define DRINK_VERYGOOD 3 #define DRINK_FANTASTIC 4 #define FOOD_AMAZING 5 +#define RACE_DRINK 6 \ No newline at end of file diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 55bfcaff79..0f5e52f69e 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -67,6 +67,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid) ) #define isdwarf(A) (is_species(A, /datum/species/dwarf)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) +#define isangel(A) (is_species(A, /datum/species/angel)) // Citadel specific species #define isipcperson(A) (is_species(A, /datum/species/ipc)) diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm index 70acffdb8f..24384a1ee4 100644 --- a/code/datums/mood_events/drink_events.dm +++ b/code/datums/mood_events/drink_events.dm @@ -23,6 +23,11 @@ mood_change = 4 timeout = 2 MINUTES +/datum/mood_event/race_drink + description = "That drink was made for me!\n" + mood_change = 10 + timeout = 20 MINUTES + /datum/mood_event/amazingtaste description = "Amazing taste!\n" mood_change = 50 //Is this not really high..? diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 2cf3f0afea..9754b46773 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -933,23 +933,62 @@ /datum/chemical_reaction/nord_king name = "Nord King" id = /datum/reagent/consumable/nord_king - results = list(/datum/reagent/consumable/nord_king = 3) + results = list(/datum/reagent/consumable/nord_king = 10) required_reagents = list(/datum/reagent/consumable/ethanol = 5, /datum/reagent/consumable/honey = 1, /datum/reagent/consumable/ethanol/red_mead = 10) /datum/chemical_reaction/velvet_kiss name = "Velvet Kiss" id = /datum/reagent/consumable/velvet_kiss - results = list(/datum/reagent/consumable/velvet_kiss = 3) + results = list(/datum/reagent/consumable/velvet_kiss = 15) //Limited races use this required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/wine = 10) +/datum/chemical_reaction/abduction_fruit + name = "Abduction Fruit" + id = /datum/reagent/consumable/abduction_fruit + results = list(/datum/reagent/consumable/abduction_fruit = 3) + required_reagents = list(/datum/reagent/consumable/limejuice = 10, /datum/reagent/consumable/strawberryjuice = 5, /datum/reagent/consumable/watermelonjuice = 10) +/datum/chemical_reaction/bug_zapper + name = "Bug Zapper" + id = /datum/reagent/consumable/bug_zapper + results = list(/datum/reagent/consumable/bug_zapper = 20) //Harder to make + required_reagents = list(/datum/reagent/consumable/lemonjuice = 10, /datum/reagent/teslium = 1, /datum/reagent/copper = 10) +/datum/chemical_reaction/mush_crush + name = "Mush Crush" + id = /datum/reagent/consumable/mush_crush + results = list(/datum/reagent/consumable/mush_crush = 10) + required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/water = 5, /datum/reagent/toxin/coffeepowder = 10) +/datum/chemical_reaction/darkbrew + name = "Darkbrew" + id = /datum/reagent/consumable/darkbrew + results = list(/datum/reagent/consumable/darkbrew = 20)//Limited races use this + required_reagents = list(/datum/reagent/liquid_dark_matter = 5, /datum/reagent/toxin/bungotoxin = 5, /datum/reagent/toxin/coffeepowder = 10) +/datum/chemical_reaction/hollow_bone + name = "Hollow Bone" + id = /datum/reagent/consumable/hollow_bone + results = list(/datum/reagent/consumable/hollow_bone = 10) + required_reagents = list(/datum/reagent/toxin/bonehurtingjuice = 5, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/coconutmilk = 10) +/datum/chemical_reaction/frisky_kitty + name = "Frisky Kitty" + id = /datum/reagent/consumable/frisky_kitty + results = list(/datum/reagent/consumable/frisky_kitty = 2) + required_reagents = list(/datum/reagent/consumable/catnip_tea = 1, /datum/reagent/consumable/milk = 1) + required_temp = 296 //Just above room temp (22.85'C) +/datum/chemical_reaction/jell_wyrm + name = "Jell Wyrm" + id = /datum/reagent/consumable/jell_wyrm + results = list(/datum/reagent/consumable/jell_wyrm = 2) + required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/toxin/carpotoxin = 1, /datum/reagent/carbondioxide = 5) + required_temp = 333 // (59.85'C) - - - - +/datum/chemical_reaction/laval_spit + name = "Laval Spit" + id = /datum/reagent/consumable/laval_spit + results = list(/datum/reagent/consumable/laval_spit = 20) //Limited use + required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/consumable/ethanol/mauna_loa = 10, /datum/reagent/sulfur = 5) + required_temp = 900 // (626.85'C) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 52c06bca9b..d354d030f5 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -965,3 +965,12 @@ glass_icon_state = "glass_yellow" glass_name = "glass of bungo juice" glass_desc = "Exotic! You feel like you are on vacation already." + +/datum/reagent/consumable/coldscales + name = "Coldscales" + color = "#5AEB52" //(90, 235, 82) + description = "A cold looking drink made for people with scales." + taste_description = "dead flies" + glass_icon_state = "coldscales" + glass_name = "glass of coldscales" + glass_desc = "A soft green drink that looks inviting!" diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index d9b2aafb4b..5e28766cd3 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -370,6 +370,8 @@ M.stuttering = 0 holder.del_reagent(type) // maybe this is a little too perfect and a max() cap on the statuses would be better?? return + if(isangel(M)) + quality = DRINK_GOOD holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack /datum/reagent/water/holywater/reaction_turf(turf/T, reac_volume)