Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff

This commit is contained in:
Aurorablade
2017-09-02 22:49:05 -04:00
759 changed files with 810 additions and 96 deletions
@@ -75,6 +75,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green = list("grapejuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
)
var/list/dried_items = list(
@@ -424,6 +424,18 @@
drink_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
taste_message = "the number fourty two"
/datum/reagent/consumable/ethanol/flaming_homer
name = "Flaming Moe"
id = "flamingmoe"
description = "This appears to be a mixture of various alcohols blended with prescription medicine. It is lightly toasted..."
reagent_state = LIQUID
color = "#58447f" //rgb: 88, 66, 127
alcohol_perc = 0.5
drink_icon = "flamingmoeglass"
drink_name = "Flaming Moe"
drink_desc = "Happiness is just a Flaming Moe away!"
taste_message = "caramelised booze and sweet, salty medicine"
/datum/reagent/consumable/ethanol/brave_bull
name = "Brave Bull"
id = "bravebull"
@@ -23,6 +23,16 @@
drink_desc = "Are you sure this is tomato juice?"
taste_message = "tomato juice"
/datum/reagent/consumable/drink/pineapplejuice
name = "Pineapple Juice"
id = "pineapplejuice"
description = "Pineapples juiced into a liquid. Sweet and sugary."
color = "#e5b437"
drink_icon = "glass_orange"
drink_name = "Glass of pineapple juice"
drink_desc = "A bright drink, sweet and sugary."
taste_message = "pineapple juice"
/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M)
if(M.getFireLoss() && prob(20))
M.adjustFireLoss(-1)
@@ -224,6 +224,16 @@
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/flaming_homer
name = "Flaming Moe"
id = "flamingmoe"
result = "flamingmoe"
required_reagents = list("vodka" = 1, "gin" = 1, "cognac" = 1, "tequila" = 1, "salglu_solution" = 1) //Close enough
min_temp = 374 //Fire makes it good!
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
mix_message = "The concoction bursts into flame!"
/datum/chemical_reaction/brave_bull
name = "Brave Bull"
id = "bravebull"
@@ -197,4 +197,24 @@
required_reagents = list("beff" = 1, "saltpetre" = 1, "synthflesh" = 1)
result_amount = 2
mix_message = "The beff and the synthflesh combine to form a smoky red log."
mix_sound = 'sound/effects/blobattack.ogg'
mix_sound = 'sound/effects/blobattack.ogg'
/datum/chemical_reaction/enzyme
name = "Universal enzyme"
id = "enzyme"
result = "enzyme"
required_reagents = list("vomit" = 1, "sugar" = 1)
result_amount = 2
min_temp = 750
mix_message = "The mixture emits a horrible smell as you heat up the contents. Luckily, enzymes don't stink."
mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/chemical_reaction/enzyme
name = "Universal enzyme"
id = "enzyme"
result = "enzyme"
required_reagents = list("green_vomit" = 1, "sugar" = 1)
result_amount = 2
min_temp = 750
mix_message = "The mixture emits a horrible smell as you heat up the contents. Luckily, enzymes don't stink."
mix_sound = 'sound/goonstation/misc/fuse.ogg'