Merge branch 'master' into development

This commit is contained in:
skull132
2017-09-14 22:59:07 +03:00
10 changed files with 38 additions and 12 deletions
+7 -1
View File
@@ -15,6 +15,7 @@
var/list/plant_product_sprites = list() // List of all growth sprites plus number of growth stages.
var/list/processing = list()
var/list/current = list()
/datum/controller/subsystem/plants/New()
NEW_SS_GLOBAL(SSplants)
@@ -78,7 +79,12 @@
src.plant_product_sprites = SSplants.plant_product_sprites
/datum/controller/subsystem/plants/fire(resumed = 0)
var/list/queue = processing
if (!resumed)
var/list/old = current // This should be empty, so might as well just reuse it.
current = processing
processing = old
var/list/queue = current
while (queue.len)
var/obj/effect/plant/P = queue[queue.len]
queue.len--