diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 7c6692bc61..91377d8fbf 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -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 [M.name] 's face turns blue as he suffers a major cardiac arrest! He's not walking out of this one for sure...", 1) + M:toxloss +=200 + data++ + ..() + return*/ + inaprovaline name = "Inaprovaline" id = "inaprovaline" diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 3b8eb7306a..f50e2ca6bc 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -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************* ///////////////////////////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file + +/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 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index eb26900bdf..983fe69103 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1240,6 +1240,32 @@ Total SMES charging rate should not exceed total power generation rate, or an ov throw_range = 7 w_class = 3.0 +/obj/item/weapon/kitchenknife + name = "Kitchen knife" + icon = 'kitchen.dmi' + icon_state = "knife" + desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." + flags = FPRINT | TABLEPASS | CONDUCT + force = 10.0 + w_class = 3.0 + throwforce = 6.0 + throw_speed = 3 + throw_range = 6 + m_amt = 12000 + +/obj/item/weapon/tray + name = "Tray" + icon = 'food.dmi' + icon_state = "tray" + desc = "A metal tray to lay food on." + throwforce = 12.0 + throwforce = 10.0 + throw_speed = 1 + throw_range = 5 + w_class = 3.0 + flags = FPRINT | TABLEPASS | CONDUCT + m_amt = 3000 + /obj/item/weapon/kitchen/utensil force = 5.0 w_class = 1.0 @@ -1248,7 +1274,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov throw_range = 5 flags = FPRINT | TABLEPASS | CONDUCT - /obj/item/weapon/kitchen/utensil/fork name = "fork" icon_state = "fork" diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm index 1cd96362b5..2f7b338da8 100644 --- a/code/game/machinery/microwave.dm +++ b/code/game/machinery/microwave.dm @@ -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)) diff --git a/code/game/machinery/processor.dm b/code/game/machinery/processor.dm index ac3a9bdae4..8a7f23f62b 100644 --- a/code/game/machinery/processor.dm +++ b/code/game/machinery/processor.dm @@ -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." diff --git a/code/game/objects/closets/kitchen.dm b/code/game/objects/closets/kitchen.dm index 7c7cdac6b1..9edbf8fa13 100644 --- a/code/game/objects/closets/kitchen.dm +++ b/code/game/objects/closets/kitchen.dm @@ -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) \ No newline at end of file + 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) \ No newline at end of file diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index 728df4d7fc..65f6cdaec5 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -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 diff --git a/config/admins.txt b/config/admins.txt index 888078d16c..06051502e4 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -1,3 +1,4 @@ tle - Host -mport2004 - Coder \ No newline at end of file +mport2004 - Coder +agouri - Coder \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index ae176f12d3..b383ff10f2 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 7ec4010871..bb72c7b405 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ