diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 63af791578..46879d6c90 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1191,7 +1191,7 @@ potency = 10 New() ..() - reagents.add_reagent("nutriment", 1+round((potency / 5), 1)) + reagents.add_reagent("nutriment", 1+round((potency / 6), 1)) bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin @@ -1202,7 +1202,7 @@ potency = 10 New() ..() - reagents.add_reagent("nutriment", 1+round((potency / 5), 1)) + reagents.add_reagent("nutriment", 1+round((potency / 6), 1)) bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/lime diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 0af8f0c0db..95245be037 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -92,9 +92,12 @@ dat += "10 milk (20)
" dat += "Slab of meat (50)
" dat += "Nutrient
" - dat += "E-Z-Nutrient (10)
" - dat += "Left 4 Zed (20)
" - dat += "Robust Harvest (25)
" + dat += "E-Z-Nutrient (10) | x5
" + dat += "Left 4 Zed (20) | x5
" + dat += "Robust Harvest (25) | x5
" + dat += "Leather
" + dat += "Botanical gloves (350)
" + dat += "Utility belt (400)
" //dat += "Other
" //dat += "Monkey (500)
" else @@ -163,6 +166,28 @@ new/obj/item/nutrient/l4z(src.loc) if("rh") new/obj/item/nutrient/rh(src.loc) + if("ez5") //It's not an elegant method, but it's safe and easy. -Cheridan + new/obj/item/nutrient/ez(src.loc) + new/obj/item/nutrient/ez(src.loc) + new/obj/item/nutrient/ez(src.loc) + new/obj/item/nutrient/ez(src.loc) + new/obj/item/nutrient/ez(src.loc) + if("l4z5") + new/obj/item/nutrient/l4z(src.loc) + new/obj/item/nutrient/l4z(src.loc) + new/obj/item/nutrient/l4z(src.loc) + new/obj/item/nutrient/l4z(src.loc) + new/obj/item/nutrient/l4z(src.loc) + if("rh5") + new/obj/item/nutrient/rh(src.loc) + new/obj/item/nutrient/rh(src.loc) + new/obj/item/nutrient/rh(src.loc) + new/obj/item/nutrient/rh(src.loc) + new/obj/item/nutrient/rh(src.loc) + if("gloves") + new/obj/item/clothing/gloves/botanic_leather(src.loc) + if("tbelt") + new/obj/item/weapon/storage/belt/utility(src.loc) if("monkey") new/mob/living/carbon/monkey(src.loc) processing = 0 diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm index 8e8f7cc6b8..4b562b5074 100644 --- a/code/game/objects/mineral_doors.dm +++ b/code/game/objects/mineral_doors.dm @@ -243,4 +243,36 @@ /obj/structure/mineral_door/transparent/diamond mineralType = "diamond" - hardness = 10 \ No newline at end of file + hardness = 10 + +/obj/structure/mineral_door/wood + mineralType = "wood" + hardness = 1 + + Open() + isSwitchingStates = 1 + playsound(loc, 'doorcreaky.ogg', 100, 1) + flick("[mineralType]opening",src) + sleep(10) + density = 0 + opacity = 0 + state = 1 + update_icon() + isSwitchingStates = 0 + + Close() + isSwitchingStates = 1 + playsound(loc, 'doorcreaky.ogg', 100, 1) + flick("[mineralType]closing",src) + sleep(10) + density = 1 + opacity = 1 + state = 0 + update_icon() + isSwitchingStates = 0 + + Dismantle(devastated = 0) + if(!devastated) + for(var/i = 1, i <= oreAmount, i++) + new/obj/item/stack/sheet/wood(get_turf(src)) + del(src) \ No newline at end of file diff --git a/code/game/objects/stacks/wood.dm b/code/game/objects/stacks/wood.dm index e7a0bdf5a6..40f4494721 100644 --- a/code/game/objects/stacks/wood.dm +++ b/code/game/objects/stacks/wood.dm @@ -4,8 +4,10 @@ WOOD PLANKS */ var/global/list/datum/stack_recipe/wood_recipes = list ( \ + new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \ new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \ - new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 30, one_per_turf = 1, on_floor = 1),\ + new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 30, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/wood diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index acd2dcc96f..57a9a09259 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1369,6 +1369,31 @@ reagents.add_reagent("minttoxin", 1) bitesize = 1 +/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup + name = "chantrelle soup" + desc = "A delicious and hearty mushroom soup." + icon_state = "mushroomsoup" + trash = "snack_bowl" + New() + ..() + reagents.add_reagent("nutriment", 15) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit + name = "plump helmet biscuit" + desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." + icon_state = "phelmbiscuit" + New() + ..() + if(prob(10)) + name = "exceptional plump helmet biscuit" + desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" + reagents.add_reagent("nutriment", 15) + bitesize = 2 + else + reagents.add_reagent("nutriment", 10) + bitesize = 2 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index e7e2003a30..61c05cdab7 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -29,7 +29,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg -/* +/*p /datum/recipe/bananaphone reagents = list("psilocybin" = 5) //Trippin' balls, man. items = list( @@ -663,6 +663,7 @@ /datum/recipe/plump_pie items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet, ) @@ -1095,4 +1096,18 @@ /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/egg, ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie + +/datum/recipe/plumphelmetbiscuit + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet + ) + result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit + +/datum/recipe/mushroomsoup + reagents = list("water" = 5, "milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle + ) + result = /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup \ No newline at end of file diff --git a/icons/obj/doors/mineral_doors.dmi b/icons/obj/doors/mineral_doors.dmi index e1b4f9e750..81c3b0e2e2 100644 Binary files a/icons/obj/doors/mineral_doors.dmi and b/icons/obj/doors/mineral_doors.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index ffa40931d8..b1bfdc3bd6 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/sound/effects/doorcreaky.ogg b/sound/effects/doorcreaky.ogg new file mode 100644 index 0000000000..3d60aca56b Binary files /dev/null and b/sound/effects/doorcreaky.ogg differ