Merge pull request #6752 from phil235/PotatoParmigianaFixes

Fixes potato cell construction and eggplant parmigiana recipe
This commit is contained in:
Ergovisavi
2015-01-03 09:58:38 -08:00
5 changed files with 6 additions and 6 deletions
@@ -3,7 +3,7 @@
////////////////////////////////////////////////BREAD////////////////////////////////////////////////
/datum/recipe/bread
/datum/recipe/bread/plain
reagents = list("flour" = 15)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bread
@@ -3,7 +3,7 @@
////////////////////////////////////////////////PIES////////////////////////////////////////////////
/datum/recipe/pie
/datum/recipe/pie/banana
reagents = list("flour" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
@@ -3,7 +3,7 @@
////////////////////////////////////////////////SANDWICHES////////////////////////////////////////////////
/datum/recipe/sandwich
/datum/recipe/sandwich/plain
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
@@ -3,7 +3,7 @@
////////////////////////////////////////////////SPAGHETTI////////////////////////////////////////////////
/datum/recipe/spaghetti
/datum/recipe/spaghetti/plain
reagents = list("flour" = 5)
result= /obj/item/weapon/reagent_containers/food/snacks/spaghetti
@@ -54,6 +54,6 @@
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
)
result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm
+1 -1
View File
@@ -163,7 +163,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C
var/obj/item/stack/cable_coil/C = W
if (C.use(5))
user << "<span class='notice'>You add some cable to the potato and slide it inside the battery encasing.</span>"
var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(user.loc)