shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

this is annoying, why is angel not defind as a race

Browse Source
This commit is contained in:
TrilbySpaceClone
2020-04-14 11:13:49 -04:00
parent c5b1324d44
commit 79a72a50d4
6 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
code/modules/food_and_drinks/recipes/drinks_recipes.dm
View File

@@ -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)

9
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -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!"

2
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -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)