Merge pull request #2599 from Fox-McCloud/thanksgiving-food

Thanksgiving Update
This commit is contained in:
TheDZD
2015-11-20 19:46:47 -05:00
12 changed files with 180 additions and 40 deletions
+4
View File
@@ -648,6 +648,10 @@ datum/recipe/microwave/slimesandwich
)
result = /obj/item/weapon/ruinedvirusdish
/datum/recipe/microwave/mashedtaters
fruit = list("potato" = 1)
reagents = list("gravy" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/mashed_potatoes
//////////////////////////////////////////
// bs12 food port stuff
+10
View File
@@ -393,3 +393,13 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/flatbread
/datum/recipe/oven/turkey // Magic
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/stuffing,
/obj/item/weapon/reagent_containers/food/snacks/stuffing
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
@@ -298,6 +298,27 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 50
/mob/living/simple_animal/turkey
name = "turkey"
desc = "Benjamin Franklin would be proud."
icon_state = "turkey"
icon_living = "turkey"
icon_dead = "turkey_dead"
icon_resting = "turkey_rest"
speak = list("gobble?","gobble","GOBBLE")
speak_emote = list("gobble")
emote_see = list("struts around")
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat //enough to make one turkey
meat_amount = 4
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
attacktext = "pecks"
health = 50
/mob/living/simple_animal/goose
name = "goose"
desc = "A pretty goose. Would make a nice comforter."
@@ -799,6 +799,7 @@
New()
..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("porktonium", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -3114,6 +3115,41 @@
reagents.add_reagent("toxin", 3)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
name = "Turkey"
desc = "A traditional turkey served with stuffing."
icon_state = "turkey"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/turkeyslice
slices_num = 6
New()
..()
reagents.add_reagent("protein", 24)
reagents.add_reagent("nutriment", 18)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/turkeyslice
name = "turkey serving"
desc = "A serving of some tender and delicious turkey."
icon_state = "turkeyslice"
trash = /obj/item/trash/plate
filling_color = "#B97A57"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mashed_potatoes //mashed taters
name = "mashed potatoes"
desc = "Some sot creamy, and irresistible mashed potatoes."
icon_state = "mashedtaters"
trash = /obj/item/trash/plate
filling_color = "#D6D9C1"
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("gravy", 5)
reagents.add_reagent("mashedpotatoes", 10)
bitesize = 2
////////////////////////////////ICE CREAM///////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/icecream
name = "ice cream"