cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

•Added kitchen stuff: Meatbread, Cheese wheel, Omelette Du fromage, Muffins. Kitchen knife now spawns in the chef's storage and can be used to slice the meatbread loaf or cheese wheel into wedges. Cheese wedges can be used in the microwave to make stuff. Cheese wheels made by using Milk (now spawns 8 bottles in the chef's fridge) on the food processor. Everything's got their respective icons.

Browse Source 
•Cholesterol is out, for now. Shit doesn't work.
•Raised the YOU-ARE-FAT limit to src.nutrition > 600 instead of 400. Meatbread tends to make people fat, fast.
•Included a fix for the cleaner spraying when added to the backpack. Im such an uber haxxor

Files edited: 
code/defines/obj/weapon.dm
code/game/machinery/microwave.dm
code/game/machinery/processor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/WorkInProgress/Chemistry-Reagents.dm
code/WorkInProgress/Chemistry-Tools.dm
food.dmi
kitchen.dmi•Added kitchen stuff: Meatbread, Cheese wheel, Omelette Du fromage, Muffins. Kitchen knife now spawns in the chef's storage and can be used to slice the meatbread loaf or cheese wheel into wedges. Cheese wedges can be used in the microwave to make stuff. Cheese wheels made by using Milk (now spawns 8 bottles in the chef's fridge) on the food processor. Everything's got their respective icons.
Forkloads of food half-in, not yet working. Forks dont spawn but if someone gets his hands on one, he can hit the omelette with it and the fork will change its icon to a "loaded with omelette" fork. TO DO: Actually get the loaded fork to feed the user once he hits himself with it.
◘Recipes: Meatbread: 3 cheese 3 meat 3 flour Omelette: 2 eggs 2 cheese Muffin: 1 egg 1 flour
•Cholesterol is out, for now. Shit doesn't work.
•Raised the YOU-ARE-FAT limit to src.nutrition > 600 instead of 400. Meatbread tends to make people fat, fast.
•Included a fix for the cleaner spraying when added to the backpack. Im such an uber haxxor

Files edited: 
code/defines/obj/weapon.dm
code/game/machinery/microwave.dm
code/game/machinery/processor.dm
code/game/objects/closets/kitchen.dm
code/game/objects/items/weapons/mops_cleaners.dm
code/WorkInProgress/Chemistry-Reagents.dm
code/WorkInProgress/Chemistry-Tools.dm
food.dmi
kitchen.dmi


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@59 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
polyxenitopalidou
2010-09-05 13:02:10 +00:00
parent 6041ec5c69
commit fedd53e3b9
10 changed files with 245 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/game/machinery/microwave.dm
View File

@@ -2,6 +2,7 @@
var/egg_amount = 0
var/flour_amount = 0
var/water_amount = 0
var/cheese_amount = 0
var/monkeymeat_amount = 0
var/xenomeat_amount = 0
var/humanmeat_amount = 0
@@ -65,6 +66,30 @@
xenomeat_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/xenoburger"
/datum/recipe/meatbread
flour_amount = 3
monkeymeat_amount = 3
cheese_amount = 3
creates = "/obj/item/weapon/reagent_containers/food/snacks/meatbread"
/datum/recipe/meatbreadhuman
flour_amount = 3
humanmeat_amount = 3
cheese_amount = 3
creates = "/obj/item/weapon/reagent_containers/food/snacks/meatbread"
/datum/recipe/omelette
egg_amount = 2
cheese_amount = 2
creates = "/obj/item/weapon/reagent_containers/food/snacks/omelette"
/datum/recipe/muffin
egg_amount = 1
flour_amount = 1
extra_item = /obj/item/weapon/reagent_containers/food/drinks/milk
creates = "/obj/item/weapon/reagent_containers/food/snacks/muffin"
/obj/machinery/microwave/New() // *** After making the recipe in defines\obj\food.dmi, add it in here! ***
..()
src.available_recipes += new /datum/recipe/donut(src)
@@ -78,6 +103,10 @@
src.available_recipes += new /datum/recipe/donkpocket_warm(src)
src.available_recipes += new /datum/recipe/pie(src)
src.available_recipes += new /datum/recipe/xenoburger(src)
src.available_recipes += new /datum/recipe/meatbread(src)
src.available_recipes += new /datum/recipe/meatbreadhuman(src)
src.available_recipes += new /datum/recipe/omelette (src)
src.available_recipes += new /datum/recipe/muffin (src)
/*******************
@@ -126,6 +155,12 @@ obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob)
V.show_message(text("\blue [user] adds some flour to the microwave."))
src.flour_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge)) // If cheese is used, add it
if(src.flour_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some cheese to the microwave."))
src.flour_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat))
if(src.monkeymeat_amount < 5)
for(var/mob/V in viewers(src, null))

16
code/game/machinery/processor.dm
View File

@@ -38,6 +38,22 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/ketchup(src.loc)
return
if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk))
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/cheesewheel(src.loc)
return
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans))
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src.loc)
return
user << "There doesn't appear to be anything in the processing chamber."

21
code/game/objects/closets/kitchen.dm
View File

@@ -13,6 +13,12 @@
/obj/secure_closet/meat/New()
..()
sleep(2)
new /obj/item/weapon/tray (src)
new /obj/item/weapon/tray (src)
new /obj/item/weapon/tray (src)
new /obj/item/weapon/tray (src)
new /obj/item/weapon/tray (src)
new /obj/item/weapon/tray (src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
@@ -32,6 +38,7 @@
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/kitchen/egg_box(src)
new /obj/item/kitchen/egg_box(src)
new /obj/item/weapon/kitchenknife (src)
if(rand(20))
new /obj/item/weapon/reagent_containers/food/snacks/faggot(src)
@@ -51,4 +58,16 @@
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/cola(src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)
new /obj/item/weapon/reagent_containers/food/drinks/milk (src)

4
code/game/objects/items/weapons/mops_cleaners.dm
View File

@@ -14,7 +14,9 @@ MOP
return
/obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob)
if (src.reagents.total_volume < 1)
if (istype(A, /obj/item/weapon/storage/backpack ))
return
else if (src.reagents.total_volume < 1)
user << "\blue Add more cleaner!"
return