From 49d6e613bb4f59da9e5fdd9cd2b5dac77791c969 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Wed, 23 Mar 2011 06:17:34 +0000 Subject: [PATCH] The great vending machine update. Banana Bread Ice and iced drinks A certain medical reagent update Ramen Noodles! And... stuff... I don't know new updates! git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1240 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Reagents.dm | 91 ++++++++++++++++++++++- code/WorkInProgress/Chemistry-Recipes.dm | 36 +++++++++ code/WorkInProgress/Chemistry-Tools.dm | 90 ++++++++++++++++++++-- code/defines/obj/vending.dm | 46 ++++++------ code/game/machinery/autolathe.dm | 1 + code/game/machinery/microwave.dm | 7 ++ tgstation.dme | 1 - 7 files changed, 240 insertions(+), 32 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 6379fd3179e..0c773bb1bab 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -979,7 +979,7 @@ datum reagent_state = LIQUID on_mob_life(var/mob/M) if(!M) M = holder.my_atom - if(M:bruteloss && prob(40)) M:heal_organ_damage(1,0) + M:heal_organ_damage(2,0) ..() return @@ -1391,6 +1391,39 @@ datum description = "The raw essence of a banana. HONK" nutriment_factor = 1 * REAGENTS_METABOLISM + dry_ramen + name = "Dry Ramen" + id = "dry_ramen" + description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." + reagent_state = SOLID + on_mob_life(var/mob/M) + ..() + M:nutrition += 1 + return + + hot_ramen + name = "Hot Ramen" + id = "hot_ramen" + description = "The noodles are boiled, the flavors are artificial, just like being back in school." + reagent_state = LIQUID + on_mob_life(var/mob/M) + ..() + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature+10) + M:nutrition += 5 + return + + hell_ramen + name = "Hell Ramen" + id = "hell_ramen" + description = "The noodles are boiled, the flavors are artificial, just like being back in school." + reagent_state = LIQUID + on_mob_life(var/mob/M) + ..() + M:bodytemperature += 10 + M:nutrition += 5 + return + ///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum//////////////////////////////// @@ -1452,6 +1485,49 @@ datum ..() return + icecoffee + name = "Iced Coffee" + id = "icecoffee" + description = "Coffee and ice, refreshing and cool." + reagent_state = LIQUID + on_mob_life(var/mob/M) + ..() + M.dizziness = max(0,M.dizziness-5) + M:drowsyness = max(0,M:drowsyness-3) + M:sleeping = 0 + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature-5) + M.make_jittery(5) + ..() + return + + icetea + name = "Iced Tea" + id = "icetea" + description = "No relation to a certain rap artist/ actor." + reagent_state = LIQUID + on_mob_life(var/mob/M) + ..() + M.dizziness = max(0,M.dizziness-2) + M:drowsyness = max(0,M:drowsyness-1) + M:sleeping = 0 + if(M:toxloss && prob(50)) M:toxloss-- + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature-5) + return + + h_chocolate + name = "Hot Chocolate" + id = "h_chocolate" + description = "Made with love! And coco beans." + reagent_state = LIQUID + on_mob_life(var/mob/M) + ..() + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature+5) + M:nutrition += 5 + return + space_cola name = "Cola" id = "cola" @@ -1830,6 +1906,17 @@ datum ..() return + ice + name = "Ice" + id = "ice" + description = "Frozen water, your dentist wouldn't like you chewing this." + reagent_state = SOLID + on_mob_life(var/mob/M) + if(!M) M = holder.my_atom + M:bodytemperature -= 5 + ..() + return + /////////////////////////////////////////////////////////////////cocktail entities////////////////////////////////////////////// @@ -2278,4 +2365,4 @@ datum else if(data >= 125 && prob(33)) M.confused = max(M:confused+2,0) ..() - return + return \ No newline at end of file diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index 65d6cfe36e7..c4bfddcdcf4 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -469,6 +469,13 @@ datum required_reagents = list("hydrogen" = 3, "nitrogen" = 1) result_amount = 3 + diethylamine + name = "Diethylamine" + id = "diethylamine" + result = "diethylamine" + required_reagents = list ("ammonia" = 1, "ethanol" = 1) + result_amount = 2 + space_cleaner name = "Space cleaner" id = "cleaner" @@ -516,6 +523,35 @@ datum new /obj/item/weapon/reagent_containers/food/snacks/cheesewheel(location) return + icetea + name = "Iced Tea" + id = "icetea" + result = "icetea" + required_reagents = list("ice" = 1, "tea" = 3) + result_amount = 4 + + icecoffee + name = "Iced Coffee" + id = "icecoffee" + result = "icecoffee" + required_reagents = list("ice" = 1, "coffee" = 3) + result_amount = 4 + + hot_ramen + name = "Hot Ramen" + id = "hot_ramen" + result = "hot_ramen" + required_reagents = list("water" = 1, "dry_ramen" = 3) + result_amount = 3 + + hell_ramen + name = "Hell Ramen" + id = "hell_ramen" + result = "hell_ramen" + required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) + result_amount = 6 + + ////////////////////////////////////////// COCKTAILS ////////////////////////////////////// moonshine diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 42cdc93c9d5..5b77d5477be 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -763,7 +763,7 @@ icon = 'syringe.dmi' item_state = "hypo" icon_state = "hypo" - amount_per_transfer_from_this = 10 + amount_per_transfer_from_this = 5 volume = 30 possible_transfer_amounts = null flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER @@ -1278,6 +1278,26 @@ ..() reagents.add_reagent("anti_toxin", 30) +/obj/item/weapon/reagent_containers/glass/bottle/ammonia + name = "ammonia bottle" + desc = "A small bottle." + icon = 'chemical.dmi' + icon_state = "bottle20" + + New() + ..() + reagents.add_reagent("ammonia", 30) + +/obj/item/weapon/reagent_containers/glass/bottle/diethylamine + name = "diethylamine bottle" + desc = "A small bottle." + icon = 'chemical.dmi' + icon_state = "bottle17" + + New() + ..() + reagents.add_reagent("diethylamine", 30) + /obj/item/weapon/reagent_containers/glass/bottle/flu_virion name = "Flu virion culture bottle" @@ -1742,11 +1762,12 @@ /obj/item/weapon/reagent_containers/food/snacks/carrotcake name = "Carrot Cake" - desc = "A favorite desert of a certain wascally wabbit. Also not a lie." + desc = "A favorite desert of a certain wascally wabbit. Not a lie." icon_state = "carrotcake" New() ..() reagents.add_reagent("nutriment", 30) + reagents.add_reagent("imidazoline", 10) bitesize = 2 attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -1759,11 +1780,12 @@ /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice name = "Carrot Cake slice" - desc = "Carrotty slice of Carrot Cake" + desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." icon_state = "carrotcake_slice" New() ..() reagents.add_reagent("nutriment", 6) + reagents.add_reagent("imidazoline", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cheesecake @@ -1824,7 +1846,7 @@ desc = "A delicious meatpie." New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/momeatpie @@ -1833,7 +1855,7 @@ desc = "A delicious meatpie." New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/xemeatpie @@ -2076,6 +2098,40 @@ reagents.add_reagent("xenomicrobes", 6) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/bananabread + name = "banana-nut bread" + desc = "A heavenly and filling treat." + icon_state = "tofubread" //filler sprite till there is a banana bread sprite + New() + ..() + reagents.add_reagent("banana", 20) + reagents.add_reagent("nutriment", 20) + bitesize = 2 + + attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/)) + W.visible_message(" \red You slice the banana bread! ", 1) + for(var/i=0,i<5,i++) + new /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice (src.loc) + del(src) + return + if(istype(W, /obj/item/weapon/circular_saw)) + W.visible_message(" \red You inaccurately slice the banana bread with your [W]! ", 1) + for(var/i=0,i<3,i++) + new /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice (src.loc) + del(src) + return + +/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice + name = "meatbread slice" + desc = "A slice of delicious Banana bread." + icon_state = "tofubreadslice" //Filler sprite + New() + ..() + reagents.add_reagent("banana", 4) + reagents.add_reagent("nutriment", 4) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/tofubread name = "Tofubread" icon_state = "Like meatbread but for vegans. Not guaranteed to give superpowers." @@ -2357,7 +2413,7 @@ /obj/item/weapon/reagent_containers/food/drinks/tea name = "Duke Purple Tea" - desc = "For excellent taste, you can always bet on Duke Purple." + desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." icon_state = "tea" New() ..() @@ -2365,6 +2421,26 @@ src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) +/obj/item/weapon/reagent_containers/food/drinks/ice + name = "Ice Cup" + desc = "Careful, cold ice, do not chew." + icon_state = "coffee" + New() + ..() + reagents.add_reagent("ice", 30) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) + +/obj/item/weapon/reagent_containers/food/drinks/h_chocolate + name = "Dutch Hot Coco" + desc = "Made in Space South America." + icon_state = "tea" + New() + ..() + reagents.add_reagent("h_chocolate", 30) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) + /obj/item/weapon/reagent_containers/food/drinks/cola name = "Space Cola" desc = "Cola. in space." @@ -2427,7 +2503,7 @@ /obj/item/weapon/reagent_containers/food/drinks/starkist name = "Star-kist" - desc = "The taste of a star in liquid form." + desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" New() ..() diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 33ecfd94f14..fdaec71c8d1 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -33,12 +33,12 @@ name = "Booze-O-Mat" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles - product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass" - product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/weapon/reagent_containers/food/drinks/ice" + product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30;10" vend_delay = 15 product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea" product_hideamt = "10;10" - product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Quite delighted to serve you!;Is nobody thirsty on this station?" + product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" /obj/machinery/vending/assist product_amounts = "5;3;4;1;4" @@ -51,18 +51,18 @@ desc = "A vending machine which dispenses hot drinks." icon_state = "coffee" icon_vend = "coffee-vend" - product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea" - product_amounts = "25;25" + product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea;/obj/item/weapon/reagent_containers/food/drinks/h_chocolate" + product_amounts = "25;25;25" vend_delay = 34 - product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/cola" - product_hideamt = "5" + product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/ice" + product_hideamt = "10" /obj/machinery/vending/snack name = "Getmore Chocolate Corp" desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" icon_state = "snack" - product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/obj/item/weapon/reagent_containers/food/snacks/chips;/obj/item/weapon/reagent_containers/food/snacks/sosjerky;/obj/item/weapon/reagent_containers/food/snacks/no_raisin;/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie;/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers" - product_amounts = "10;10;10;10;10;10" + product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/obj/item/weapon/reagent_containers/food/drinks/dry_ramen;/obj/item/weapon/reagent_containers/food/snacks/chips;/obj/item/weapon/reagent_containers/food/snacks/sosjerky;/obj/item/weapon/reagent_containers/food/snacks/no_raisin;/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie;/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers" + product_amounts = "10;10;10;10;10;10;10" product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/syndicake" product_hideamt = "10" @@ -95,10 +95,10 @@ icon_state = "med" icon_deny = "med-deny" req_access_txt = "5" - product_paths = "/obj/item/weapon/reagent_containers/glass/bottle/antitoxin;/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline;/obj/item/weapon/reagent_containers/glass/bottle/stoxin;/obj/item/weapon/reagent_containers/glass/bottle/toxin;/obj/item/weapon/reagent_containers/syringe/antiviral;/obj/item/weapon/reagent_containers/syringe" - product_amounts = "4;4;4;4;8;12" - product_hidden = "/obj/item/weapon/reagent_containers/pill/tox;/obj/item/device/healthanalyzer" - product_hideamt = "3;10" + product_paths = "/obj/item/weapon/reagent_containers/glass/bottle/antitoxin;/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline;/obj/item/weapon/reagent_containers/glass/bottle/stoxin;/obj/item/weapon/reagent_containers/glass/bottle/toxin;/obj/item/weapon/reagent_containers/syringe/antiviral;/obj/item/weapon/reagent_containers/syringe;/obj/item/device/healthanalyzer" + product_amounts = "4;4;4;4;8;12;5" + product_hidden = "/obj/item/weapon/reagent_containers/pill/tox;/obj/item/weapon/reagent_containers/pill/stox;/obj/item/weapon/reagent_containers/pill/antitox" + product_hideamt = "3;4;6" /obj/machinery/vending/security name = "SecTech" @@ -109,17 +109,19 @@ product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash" product_amounts = "8;2;5" //product_amounts = "8;5;4" Old totals - product_hidden = "/obj/item/clothing/head/helmet" - product_hideamt = "2" + product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/weapon/reagent_containers/food/snacks/donut" + product_hideamt = "2;12" /obj/machinery/vending/hydronutrients name = "NutriMax" desc = "A plant nutrients vendor" icon_state = "nutri" icon_deny = "nutri-deny" - product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh" - product_amounts = "35;25;15" + product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh;/obj/item/weapon/pestspray;/obj/item/weapon/reagent_containers/syringe" + product_amounts = "35;25;15;20;5" product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" + product_hidden = "/obj/item/weapon/reagent_containers/glass/bottle/ammonia;/obj/item/weapon/reagent_containers/glass/bottle/diethylamine" + product_hideamt = "10;5" /obj/machinery/vending/hydroseeds name = "MegaSeed Servitor" @@ -129,16 +131,16 @@ product_amounts = "2;2;2;2;2;2;2;2;2;2" product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium" - product_hideamt = "1;2;2;2" + product_hideamt = "2;2;2;2" /obj/machinery/vending/magivend name = "MagiVend" desc = "A magic vending machine." icon_state = "MagiVend" - product_amounts = "1;1;1;2" + product_amounts = "1;1;1;1;1;2" product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" - product_paths = "/obj/item/clothing/head/wizard;/obj/item/clothing/suit/wizrobe;/obj/item/clothing/shoes/sandal;/obj/item/weapon/staff" + product_paths = "/obj/item/clothing/head/wizard;/obj/item/clothing/suit/wizrobe;/obj/item/clothing/head/wizard/red;/obj/item/clothing/suit/wizrobe/red;/obj/item/clothing/shoes/sandal;/obj/item/weapon/staff" vend_delay = 15 vend_reply = "Have an enchanted evening!" - product_hidden = "/obj/item/clothing/head/wizard/red;/obj/item/clothing/suit/wizrobe/red" - product_hideamt = "1;1" \ No newline at end of file + product_hidden = "/obj/item/weapon/reagent_containers/glass/bottle/wizarditis" //No one can get to the machine to hack it anyways + product_hideamt = "1" //Just one, for the lulz, not like anyone can get it - Microwave \ No newline at end of file diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 6e5702f8ce7..75e67fba9cc 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -238,6 +238,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/stack/sheet/rglass(), \ new /obj/item/stack/rods(), \ new /obj/item/weapon/rcd_ammo(), \ + new /obj/item/weapon/kitchenknife(),\ new /obj/item/weapon/scalpel(), \ new /obj/item/weapon/circular_saw(), \ new /obj/item/device/t_scanner(), \ diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm index e4a2c77fd14..4a74a7c0e71 100644 --- a/code/game/machinery/microwave.dm +++ b/code/game/machinery/microwave.dm @@ -98,6 +98,13 @@ cheese_amount = 3 creates = "/obj/item/weapon/reagent_containers/food/snacks/xenomeatbread" +/datum/recipe/bananabread + flour_amount = 3 + egg_amount = 3 + milk_amount = 1 + extra_item = /obj/item/weapon/reagent_containers/food/snacks/banana + creates = "/obj/item/weapon/reagent_containers/food/snacks/bananabread" + /datum/recipe/omelette egg_amount = 2 cheese_amount = 2 diff --git a/tgstation.dme b/tgstation.dme index 5425871871e..ebc3a0ed29b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -619,7 +619,6 @@ #include "code\modules\mob\login.dm" #include "code\modules\mob\logout.dm" #include "code\modules\mob\mob.dm" -#include "code\modules\mob\organs.dm" #include "code\modules\mob\say.dm" #include "code\modules\mob\transform_procs.dm" #include "code\modules\mob\dead\observer\hud.dm"