Merge pull request #3757 from Rolan7/Bugfixes_5-19-14

Fortune cookies can be made with blank or "blank" paper.
This commit is contained in:
Alex
2014-05-22 16:48:07 +01:00
+7 -14
View File
@@ -438,20 +438,13 @@
/obj/item/weapon/paper,
)
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
make_food(var/obj/container as obj)
var/obj/item/weapon/paper/paper = locate() in container
paper.loc = null //prevent deletion
var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container)
paper.loc = being_cooked
being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
return being_cooked
check_items(var/obj/container as obj)
. = ..()
if (.)
var/obj/item/weapon/paper/paper = locate() in container
if (!paper.info)
return 0
return .
/datum/recipe/fortunecookie/make_food(var/obj/container as obj)
var/obj/item/weapon/paper/paper = locate() in container
paper.loc = null //prevent deletion
var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container)
paper.loc = being_cooked
being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
return being_cooked
/datum/recipe/meatsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)