last of the missing stuff, hopefully

This commit is contained in:
Fox-McCloud
2017-01-24 18:33:22 -05:00
parent b1f789e104
commit 36bfee25dc
14 changed files with 281 additions and 73 deletions
+24 -1
View File
@@ -2483,4 +2483,27 @@
trash = /obj/item/trash/tastybread
filling_color = "#A66829"
junkiness = 20
list_reagents = list("nutriment" = 2, "sugar" = 4)
list_reagents = list("nutriment" = 2, "sugar" = 4)
/obj/item/weapon/reagent_containers/food/snacks/yakiimo
name = "yaki imo"
desc = "Made with roasted sweet potatoes!"
icon_state = "yakiimo"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 5, "vitamin" = 4)
filling_color = "#8B1105"
/obj/item/weapon/reagent_containers/food/snacks/roastparsnip
name = "roast parsnip"
desc = "Sweet and crunchy."
icon_state = "roastparsnip"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 3, "vitamin" = 4)
filling_color = "#FF5500"
/obj/item/weapon/reagent_containers/food/snacks/tatortot
name = "tator tot"
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
list_reagents = list("nutriment" = 4)
filling_color = "FFD700"
@@ -71,21 +71,34 @@
input = /obj/item/weapon/reagent_containers/food/snacks/meat
output = /obj/item/weapon/reagent_containers/food/snacks/meatball
/datum/food_processor_process/potato
input = "potato"
/datum/food_processor_process/potatowedges
input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges
output = /obj/item/weapon/reagent_containers/food/snacks/fries
/datum/food_processor_process/sweetpotato
input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet
output = /obj/item/weapon/reagent_containers/food/snacks/yakiimo
/datum/food_processor_process/potato
input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato
output = /obj/item/weapon/reagent_containers/food/snacks/tatortot
/datum/food_processor_process/carrot
input = "carrot"
input = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
output = /obj/item/weapon/reagent_containers/food/snacks/carrotfries
/datum/food_processor_process/soybeans
input = "soybeans"
input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
output = /obj/item/weapon/reagent_containers/food/snacks/soydope
/datum/food_processor_process/spaghetti
input = /obj/item/weapon/reagent_containers/food/snacks/doughslice
output = /obj/item/weapon/reagent_containers/food/snacks/spagetti
/datum/food_processor_process/parsnip
input = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip
output = /obj/item/weapon/reagent_containers/food/snacks/roastparsnip
/////////////////////////
///END OBJECT RECIPIES///
/////////////////////////
@@ -118,6 +118,8 @@
origin_tech = "materials=3;combat=2"
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/bladeslice.ogg'
sharp = 1
edge = 1
/obj/item/weapon/scythe/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is beheading \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -38,7 +38,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
/obj/item/weapon/reagent_containers/food/snacks/egg = list("egg" = -5),
//Grinder stuff, but only if dry
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
@@ -983,6 +983,27 @@
drink_name = "Jack Rose"
drink_desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
/datum/reagent/consumable/ethanol/drunkenblumpkin
name = "Drunken Blumpkin"
id = "drunkenblumpkin"
description = "A weird mix of whiskey and blumpkin juice."
color = "#1EA0FF" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "drunkenblumpkin"
drink_name = "Drunken Blumpkin"
drink_desc = "A drink for the drunks"
/datum/reagent/consumable/ethanol/eggnog
name = "Eggnog"
id = "eggnog"
description = "For enjoying the most wonderful time of the year."
color = "#fcfdc6" // rgb: 252, 253, 198
nutriment_factor = 2 * REAGENTS_METABOLISM
alcohol_perc = 0.1
drink_icon = "glass_yellow"
drink_name = "Eggnog"
drink_desc = "For enjoying the most wonderful time of the year."
/datum/reagent/consumable/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans
name = "Dragon's Breath"
id = "dragonsbreath"
@@ -111,6 +111,12 @@
M.adjustToxLoss(1)
..()
/datum/reagent/consumable/applejuice
name = "Apple Juice"
id = "applejuice"
description = "The sweet juice of an apple, fit for all ages."
color = "#ECFF56" // rgb: 236, 255, 86
/datum/reagent/consumable/drink/watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
@@ -361,4 +367,82 @@
if(ishuman(M) && M.job in list("Mime"))
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
..()
..()
/datum/reagent/consumable/drink/chocolatepudding
name = "Chocolate Pudding"
id = "chocolatepudding"
description = "A great dessert for chocolate lovers."
color = "#800000"
nutriment_factor = 4 * REAGENTS_METABOLISM
drink_icon = "chocolatepudding"
drink_name = "Chocolate Pudding"
drink_desc = "Tasty"
/datum/reagent/consumable/drink/vanillapudding
name = "Vanilla Pudding"
id = "vanillapudding"
description = "A great dessert for vanilla lovers."
color = "#FAFAD2"
nutriment_factor = 4 * REAGENTS_METABOLISM
drink_icon = "vanillapudding"
drink_name = "Vanilla Pudding"
drink_desc = "Tasty."
/datum/reagent/consumable/drink/cherryshake
name = "Cherry Shake"
id = "cherryshake"
description = "A cherry flavored milkshake."
color = "#FFB6C1"
nutriment_factor = 4 * REAGENTS_METABOLISM
drink_icon = "cherryshake"
drink_name = "Cherry Shake"
drink_desc = "A cherry flavored milkshake."
/datum/reagent/consumable/drink/bluecherryshake
name = "Blue Cherry Shake"
id = "bluecherryshake"
description = "An exotic milkshake."
color = "#00F1FF"
nutriment_factor = 4 * REAGENTS_METABOLISM
drink_icon = "bluecherryshake"
drink_name = "Blue Cherry Shake"
drink_desc = "An exotic blue milkshake."
/datum/reagent/consumable/drink/pumpkin_latte
name = "Pumpkin Latte"
id = "pumpkin_latte"
description = "A mix of pumpkin juice and coffee."
color = "#F4A460"
nutriment_factor = 3 * REAGENTS_METABOLISM
drink_icon = "pumpkin_latte"
drink_name = "Pumpkin Latte"
drink_desc = "A mix of coffee and pumpkin juice."
/datum/reagent/consumable/drink/gibbfloats
name = "Gibb Floats"
id = "gibbfloats"
description = "Ice cream on top of a Dr. Gibb glass."
color = "#B22222"
nutriment_factor = 3 * REAGENTS_METABOLISM
drink_icon= "gibbfloats"
drink_name = "Gibbfloat"
drink_desc = "Dr. Gibb with ice cream on top."
/datum/reagent/consumable/drink/pumpkinjuice
name = "Pumpkin Juice"
id = "pumpkinjuice"
description = "Juiced from real pumpkin."
color = "#FFA500"
/datum/reagent/consumable/drink/blumpkinjuice
name = "Blumpkin Juice"
id = "blumpkinjuice"
description = "Juiced from real blumpkin."
color = "#00BFFF"
/datum/reagent/consumable/drink/grape_soda
name = "Grape soda"
id = "grapesoda"
description = "Beloved of children and teetotalers."
color = "#E6CDFF"
@@ -401,6 +401,13 @@
reagent_state = LIQUID
color = "#801E28" // rgb: 128, 30, 40
/datum/reagent/consumable/bluecherryjelly
name = "Blue Cherry Jelly"
id = "bluecherryjelly"
description = "Blue and tastier kind of cherry jelly."
reagent_state = LIQUID
color = "#00F0FF"
/datum/reagent/consumable/egg
name = "Egg"
id = "egg"
@@ -768,4 +768,77 @@
required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
result_amount = 3
mix_message = "The citrus juices begin to blend together."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/chocolatepudding
name = "Chocolate Pudding"
id = "chocolatepudding"
result = "chocolatepudding"
required_reagents = list("cocoa" = 5, "milk" = 5, "egg" = 5)
result_amount = 20
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/vanillapudding
name = "Vanilla Pudding"
id = "vanillapudding"
result = "vanillapudding"
required_reagents = list("vanilla" = 5, "milk" = 5, "egg" = 5)
result_amount = 20
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/cherryshake
name = "Cherry Shake"
id = "cherryshake"
result = "cherryshake"
required_reagents = list("cherryjelly" = 1, "ice" = 1, "cream" = 1)
result_amount = 3
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/bluecherryshake
name = "Blue Cherry Shake"
id = "bluecherryshake"
result = "bluecherryshake"
required_reagents = list("bluecherryjelly" = 1, "ice" = 1, "cream" = 1)
result_amount = 3
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/drunkenblumpkin
name = "Drunken Blumpkin"
id = "drunkenblumpkin"
result = "drunkenblumpkin"
required_reagents = list("blumpkinjuice" = 1, "irishcream" = 2, "ice" = 1)
result_amount = 4
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/pumpkin_latte
name = "Pumpkin space latte"
id = "pumpkin_latte"
result = "pumpkin_latte"
required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
result_amount = 15
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/gibbfloats
name = "Gibb Floats"
id = "gibbfloats"
result = "gibbfloats"
required_reagents = list("dr_gibb" = 5, "ice" = 5, "cream" = 5)
result_amount = 15
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/grape_soda
name = "grape soda"
id = "grapesoda"
result = "grapesoda"
required_reagents = list("grapejuice" = 1, "sodawater" = 1)
result_amount = 2
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/eggnog
name = "eggnog"
id = "eggnog"
result = "eggnog"
required_reagents = list("rum" = 5, "cream" = 5, "egg" = 5)
result_amount = 15
mix_message = "The eggs nog together. Pretend that \"nog\" is a verb."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'