diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm index 8e8f7cc6b88..4b562b50744 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 e7a0bdf5a62..40f4494721c 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 33322a3121a..b295e72b435 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1417,6 +1417,30 @@ reagents.add_reagent("nutriment", 28) bitesize = 3 +/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", 10) + 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", 5) + 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 b6af2806eb4..e97a5720a93 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1005,6 +1005,19 @@ ) 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 ////////////////////////////////////////// // bs12 food port stuff diff --git a/icons/obj/doors/mineral_doors.dmi b/icons/obj/doors/mineral_doors.dmi index e1b4f9e7509..81c3b0e2e25 100644 Binary files a/icons/obj/doors/mineral_doors.dmi and b/icons/obj/doors/mineral_doors.dmi differ diff --git a/sound/effects/doorcreaky.ogg b/sound/effects/doorcreaky.ogg new file mode 100644 index 00000000000..3d60aca56bf Binary files /dev/null and b/sound/effects/doorcreaky.ogg differ