Merge pull request #432 from Tastyfish/master

ported in a bunch of the old food making stuff
This commit is contained in:
SkyMarshal
2012-02-15 19:11:30 -08:00
18 changed files with 488 additions and 293 deletions
+4 -4
View File
@@ -43,10 +43,10 @@
sleep(2)
new /obj/item/kitchen/egg_box(src)
new /obj/item/kitchen/egg_box(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src)
/obj/structure/closet/secure_closet/fridge/New()
..()
+2 -2
View File
@@ -48,11 +48,11 @@
if(src.meattype == 1)
if(src.meat > 1)
src.meat--
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey( src.loc )
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey( src.loc )
usr << "You remove some meat from the monkey."
else if(src.meat == 1)
src.meat--
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/monkey(src.loc)
usr << "You remove the last piece of meat from the monkey!"
src.icon_state = "spike"
src.occupied = 0