mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
•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.
•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
@@ -150,6 +150,8 @@ datum
|
||||
holder.remove_reagent("toxin", 2)
|
||||
if(holder.has_reagent("stoxin"))
|
||||
holder.remove_reagent("stoxin", 2)
|
||||
if(holder.has_reagent("cholesterol"))
|
||||
holder.remove_reagent("cholesterol", 4)
|
||||
if(holder.has_reagent("plasma"))
|
||||
holder.remove_reagent("plasma", 1)
|
||||
if(holder.has_reagent("acid"))
|
||||
@@ -205,6 +207,32 @@ datum
|
||||
..()
|
||||
return
|
||||
|
||||
/*cholesterol /////////////////////////////////It's cholesterol. IN SPACE. Remains out till it's fucking fixed ///////////////////
|
||||
name = "Cholesterol"
|
||||
id = "cholesterol"
|
||||
description = "A certain steroid fat that is known to cause trouble to humans in large doses. Obtained through fatty diets."
|
||||
reagent_state = LIQUID
|
||||
|
||||
on_mob_life(var/mob/M)
|
||||
if(!M) M = holder.my_atom
|
||||
if(!data) data = 1
|
||||
switch(data)
|
||||
if(30 to 30)
|
||||
M << "\red Your blood feels... sluggish..."
|
||||
if(75 to 99)
|
||||
for(M in viewers(src, null))
|
||||
M.show_message(text("\red Oh no! [M.name] seems to be having a minor cardiac arrest!"), 1)
|
||||
M:toxloss += 35
|
||||
M:drowsyness = max(M:drowsyness, 25)
|
||||
if(120 to INFINITY)
|
||||
usr << "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNGGGGGGGGGGGGGGGGGGGGGG"
|
||||
for(M in viewers(src, null))
|
||||
M.show_message("\red <B>[M.name] 's face turns blue as he suffers a major cardiac arrest! He's not walking out of this one for sure...</B>", 1)
|
||||
M:toxloss +=200
|
||||
data++
|
||||
..()
|
||||
return*/
|
||||
|
||||
inaprovaline
|
||||
name = "Inaprovaline"
|
||||
id = "inaprovaline"
|
||||
|
||||
@@ -1179,6 +1179,85 @@
|
||||
amount = 5
|
||||
heal_amt = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meatbread
|
||||
name = "meatbread loaf"
|
||||
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
|
||||
icon_state = "meatbread"
|
||||
amount = 30
|
||||
heal_amt = 5
|
||||
/* New()
|
||||
var/datum/reagents/R = new/datum/reagents(20)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
R.add_reagent("cholesterol", 20)*/
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
|
||||
name = "meatbread slice"
|
||||
desc = "A slice of delicious meatbread."
|
||||
icon_state = "meatbreadslice"
|
||||
amount = 5
|
||||
heal_amt = 6
|
||||
New()
|
||||
/* var/datum/reagents/R = new/datum/reagents(10)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
R.add_reagent("cholesterol", 10)*/
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewheel
|
||||
name = "Cheese wheel"
|
||||
desc = "A big wheel of delcious Cheddar."
|
||||
icon_state = "cheesewheel"
|
||||
amount = 25
|
||||
heal_amt = 3
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
|
||||
name = "Cheese wedge"
|
||||
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
|
||||
icon_state = "cheesewedge"
|
||||
amount = 4
|
||||
heal_amt = 4
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/omelette
|
||||
name = "Omelette Du Fromage"
|
||||
desc = "That's all you can say!"
|
||||
icon_state = "omelette"
|
||||
amount = 15
|
||||
heal_amt = 3
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
|
||||
W.icon = 'kitchen.dmi'
|
||||
W.icon_state = "forkloaded"
|
||||
world << "[user] takes a piece of omelette with his fork!"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/omeletteforkload
|
||||
name = "Omelette Du Fromage"
|
||||
desc = "That's all you can say!"
|
||||
amount = 1
|
||||
heal_amt = 4
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/muffin
|
||||
name = "Muffin"
|
||||
desc = "A delicious and spongy little cake"
|
||||
icon_state = "muffin"
|
||||
amount = 4
|
||||
heal_amt = 6
|
||||
heal(var/mob/M)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/roburger
|
||||
name = "roburger"
|
||||
desc = "The lettuce is the only organic component. Beep."
|
||||
@@ -1258,6 +1337,17 @@
|
||||
R.my_atom = src
|
||||
R.add_reagent("beer", 30)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/milk
|
||||
name = "Space Milk"
|
||||
desc = "Milk. By Cows. Cows in space."
|
||||
icon_state = "milk"
|
||||
heal_amt = 1
|
||||
New()
|
||||
var/datum/reagents/R = new/datum/reagents(50)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
R.add_reagent("milk", 50)
|
||||
|
||||
//Pills
|
||||
/obj/item/weapon/reagent_containers/pill/antitox
|
||||
name = "Anti-toxins pill"
|
||||
@@ -1348,5 +1438,29 @@
|
||||
..()
|
||||
reagents.add_reagent("beer",1000)
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////// Meatbread slicing RIGHT BELOW*************
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meatbread/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
|
||||
world << "[usr] slices the meatbread!"
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
|
||||
del(src)
|
||||
return
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewheel/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/kitchenknife /* || /obj/item/weapon/scalpel*/))
|
||||
world << "[usr] slices the cheese wheel!"
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
|
||||
del(src)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user