Merge remote-tracking branch 'upstream/master' into bucklieng

This commit is contained in:
Tigercat2000
2015-09-24 15:53:53 -07:00
7 changed files with 151 additions and 162 deletions
@@ -70,11 +70,14 @@
var/movable = 0
/obj/effect/plant/Destroy()
if(buckled_mob)
unbuckle()
if(plant_controller)
plant_controller.remove_plant(src)
for(var/obj/effect/plant/neighbor in range(1,src))
plant_controller.add_plant(neighbor)
return ..()
/obj/effect/plant/single
spread_chance = 0