Update spreading.dm

This commit is contained in:
Novacat
2021-05-25 23:25:28 -04:00
committed by GitHub
parent 726c90fac9
commit 408b0f366d
@@ -74,13 +74,8 @@
/obj/effect/plant/Destroy()
neighbors.Cut()
if(seed.get_trait(TRAIT_SPREAD)==2)
<<<<<<< HEAD
unsense_proximity(callback = .HasProximity, center = get_turf(src))
SSplants.remove_plant(src)
=======
unsense_proximity(callback = /atom/proc/HasProximity, center = get_turf(src))
plant_controller.remove_plant(src)
>>>>>>> fdabe51... Linter Introduction + Cleanup (#8085)
SSplants.remove_plant(src)
for(var/obj/effect/plant/neighbor in range(1,src))
SSplants.add_plant(neighbor)
return ..()