Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

This commit is contained in:
Crazylemon64
2016-08-03 13:31:42 -07:00
65 changed files with 174 additions and 2702 deletions
+5 -1
View File
@@ -37,11 +37,15 @@ var/global/datum/controller/plants/plant_controller // Set in New().
/datum/controller/plants/New()
if(plant_controller && plant_controller != src)
log_debug("Rebuilding plant controller.")
del(plant_controller)
qdel(plant_controller)
plant_controller = src
setup()
process()
/datum/controller/plants/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
// Predefined/roundstart varieties use a string key to make it
// easier to grab the new variety when mutating. Post-roundstart
// and mutant varieties use their uid converted to a string instead.