A new reactent is added called Nothing. The mime also starts with a Bottle of Nothing.

The barman can now make a drink called Silencer, which uses Nothing, Cream and Sugar. This can only make mimes drunk.

Chef has a few new recipes. Blood soup, Clowns tears, twobread, Metroid Sandwich, Metroid Burger, Chocolate Cake, Lime Cake, Orange Cake, Lemon cake, Boiled Metroid Core and Spess Law.

Captain has a new item in his office named Chain of Command.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1863 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
firecage@hotmail.com
2011-07-16 17:44:37 +00:00
parent 9eb11796f4
commit 1def6c7bc5
12 changed files with 343 additions and 4 deletions
+143 -1
View File
@@ -751,6 +751,38 @@
reagents.add_reagent("water", 10)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/metroidsoup
name = "Metroid soup"
desc = "Tasty"
icon_state = "metroidsoup"
New()
..()
reagents.add_reagent("metroid", 5)
reagents.add_reagent("water", 10)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "Meatball soup"
desc = "So very, very red."
icon_state = "meatballsoup"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("blood", 15)
reagents.add_reagent("water", 10)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "Clown's Tears"
desc = "Not very funny."
icon_state = "clownstears"
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("banana", 5)
reagents.add_reagent("water", 10)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
desc = "" //TODO
@@ -1004,6 +1036,16 @@
reagents.add_reagent("metroid", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/metroidburger
name = "Metroid Burger"
desc = "A very toxic and tasty burger."
icon_state = "metroidburger"
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("metroid", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/milosoup
name = "Milosoup"
desc = "The universes best soup! Yum!!!"
@@ -1051,6 +1093,15 @@
reagents.add_reagent("nutriment", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "Spesslaw"
desc = "A lawyers favourate"
icon_state = "spesslaw"
New()
..()
reagents.add_reagent("nutriment", 14)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "Poppy Pretzel"
desc = "A large soft pretzel full of POP!"
@@ -1097,6 +1148,34 @@
reagents.add_reagent("nutriment", 4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "Two Bread"
desc = "It is very bitter and winy."
icon_state = "twobread"
New()
..()
reagents.add_reagent("nutriment", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/metroidsandwich
name = "Metroid Sandwich"
desc = "A sandwich is green stuff."
icon_state = "metroidsandwich"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("metroid", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore
name = "Boiled Metroid Core"
desc = "A boiled red thing."
icon_state = "boiledmetroidcore"
New()
..()
reagents.add_reagent("metroid", 5)
bitesize = 3
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -1216,13 +1295,76 @@
..()
reagents.add_reagent("nutriment", 25)
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
name = "Vanilla Cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "plaincake_slice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
name = "Orange Cake"
desc = "A cake with added orange."
icon_state = "orangecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
slices_num = 5
New()
..()
reagents.add_reagent("nutriment", 27)
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
name = "Orange Cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "orangecake_slice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
name = "Lime Cake"
desc = "A cake with added lime."
icon_state = "limecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice
slices_num = 5
New()
..()
reagents.add_reagent("nutriment", 27)
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice
name = "Lime Cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "limecake_slice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
name = "Lemon Cake"
desc = "A cake with added lemon."
icon_state = "lemoncake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
slices_num = 5
New()
..()
reagents.add_reagent("nutriment", 27)
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
name = "Lemon Cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "lemoncake_slice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
name = "Chocolate Cake"
desc = "A cake with added chocolate"
icon_state = "chocolatecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
slices_num = 5
New()
..()
reagents.add_reagent("nutriment", 27)
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
name = "Chocolate Cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "chocolatecake_slice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel
name = "Cheese wheel"
desc = "A big wheel of delcious Cheddar."
+123
View File
@@ -852,6 +852,17 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
/datum/recipe/spesslaw
reagents = list("water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
)
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
/datum/recipe/superbiteburger
reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
items = list(
@@ -904,3 +915,115 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
/datum/recipe/metroidburger
reagents = list("metroid" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
)
result = /obj/item/weapon/reagent_containers/food/snacks/metroidburger
/datum/recipe/twobread
reagents = list("wine" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
)
result = /obj/item/weapon/reagent_containers/food/snacks/twobread
/datum/recipe/metroidsandwich
reagents = list("metroid" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
)
result = /obj/item/weapon/reagent_containers/food/snacks/metroidsandwich
/datum/recipe/orangecake
reagents = list("milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/orange,
/obj/item/weapon/reagent_containers/food/snacks/grown/orange,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
/datum/recipe/limecake
reagents = list("milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/lime,
/obj/item/weapon/reagent_containers/food/snacks/grown/lime,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
/datum/recipe/lemoncake
reagents = list("milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/lemon,
/obj/item/weapon/reagent_containers/food/snacks/grown/lemon,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
/datum/recipe/chocolatecake
reagents = list("milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
/datum/recipe/bloodsoup
reagents = list("blood" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato,
/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato,
)
result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup
/datum/recipe/metroidsoup
reagents = list("water" = 10, "metroid" = 5)
items = list(
)
result = /obj/item/weapon/reagent_containers/food/snacks/metroidsoup
/datum/recipe/clownstears
reagents = list("water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
/obj/item/weapon/ore/clown,
)
result = /obj/item/weapon/reagent_containers/food/snacks/clownstears
/datum/recipe/boiledmetroidcore
reagents = list("water" = 5)
items = list(
/obj/item/metroid_core,
)
result = /obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore