From 2b796efe5481e419a70cac34ba60f1eb1fde8caa Mon Sep 17 00:00:00 2001 From: TechnoAlchemist Date: Mon, 10 Oct 2016 21:12:58 -0700 Subject: [PATCH] Fixes plant bags and cacti. --- .../objects/items/weapons/storage/bags.dm | 2 +- code/modules/mining/lavaland/ash_flora.dm | 21 ++----------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 7bf1b3e476c..65f21292b6a 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -112,7 +112,7 @@ max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class max_w_class = 3 w_class = 1 - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown) + can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown,/obj/item/weapon/reagent_containers/food/snacks/ash_flora) resistance_flags = FLAMMABLE //////// diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 36e52dfa54a..ee16487ab20 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -172,10 +172,7 @@ desc = "A leaf, from a mushroom." list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2) icon_state = "mushroom_leaf" -/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_leaf/prepared - name = "washed mushroom leaf" - desc = "A greenish leaflike structure from a mushroom. Kind of like lettuce?" - icon_state = "mushroom_leaf_p" + /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap @@ -184,10 +181,6 @@ list_reagents = list("mindbreaker" = 2, "entpoly" = 4, "mushroomhallucinogen" = 2) icon_state = "mushroom_cap" -/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap/prepared - name = "sliced mushroom cap" - desc = "A sliced-up mushroom cap, revealing pale yellow innards. It smells faintly salty." - icon_state = "mushroom_cap_p" /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem name = "mushroom stem" @@ -196,22 +189,12 @@ icon_state = "mushroom_stem" luminosity = 1 -/obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem/prepared - name = "sliced mushroom stem" - desc = "A mushroom stem, cut in half to reveal orange flesh. Smells almost like potatos, but with a sour undertone." - icon_state = "mushroom_stem_p" - -/obj/item/weapon/reagent_containers/food/cactus_fruit +/obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit name = "cactus fruit" list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 4) desc = "A cactus fruit covered in a thick, reddish skin. And some ash." icon_state = "cactus_fruit" -/obj/item/weapon/reagent_containers/food/snacks/ash_flora/cactus_fruit/prepared - name = "peeled cactus fruit" - desc = "A cactus fruit with the skin and ash carefully scraped off, revealing a faintly sweet-smelling yellow center." - icon_state = "cactus_fruit_p" - /obj/item/mushroom_bowl name = "mushroom bowl"