cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge errors, removes istype.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/bags.dm
-2
View File
@@ -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
code/modules/mining/mine_turfs.dm
+1 -2
View File
@@ -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)