Merge errors, removes istype.

This commit is contained in:
TechnoAlchemist
2016-10-10 18:34:36 -07:00
parent cd60b5c3dd
commit ef2efe392b
2 changed files with 1 additions and 4 deletions
@@ -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