From ef2efe392b05e3dcf9f497d2ad874964efc42d82 Mon Sep 17 00:00:00 2001 From: TechnoAlchemist Date: Mon, 10 Oct 2016 18:34:36 -0700 Subject: [PATCH] Merge errors, removes istype. --- code/game/objects/items/weapons/storage/bags.dm | 2 -- code/modules/mining/mine_turfs.dm | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 92da0c435aa..7bf1b3e476c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -112,8 +112,6 @@ 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,/obj/item/weapon/reagent_containers/food/snacks/ash_flora) - resistance_flags = 0 can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown) resistance_flags = FLAMMABLE diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 07d85335fbd..ef5da5bb2af 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -392,8 +392,7 @@ if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored)) return for(var/obj/structure/flora/ash/F in urange(3,T)) //Allows for growing patches, but not ridiculous stacks of flora - if(istype(F, /obj/structure/flora/ash)) - return + return var/randumb = pickweight(flora_spawn_list) new randumb(T)