From eb46a5e3b5fe2bce7e03d98b8e3c50e0dab0a01c Mon Sep 17 00:00:00 2001 From: madmanmartian Date: Tue, 18 Jun 2019 06:40:25 +0100 Subject: [PATCH] Fixes bee species not being initialized properly --- __DEFINES/global.dm | 2 +- .../modules/mob/living/simple_animal/bees/bees_datums.dm | 9 ++++++++- code/world.dm | 4 ---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/__DEFINES/global.dm b/__DEFINES/global.dm index e1bda15dc28..bb5fea5a01a 100644 --- a/__DEFINES/global.dm +++ b/__DEFINES/global.dm @@ -327,7 +327,7 @@ var/nanocoins_lastchange = 0 var/minimapinit = 0 -var/bees_species = list() +var/list/bees_species = list() var/datum/stat_collector/stat_collection = new diff --git a/code/modules/mob/living/simple_animal/bees/bees_datums.dm b/code/modules/mob/living/simple_animal/bees/bees_datums.dm index d9bde60a1d4..bda331271e0 100644 --- a/code/modules/mob/living/simple_animal/bees/bees_datums.dm +++ b/code/modules/mob/living/simple_animal/bees/bees_datums.dm @@ -18,6 +18,8 @@ //When a bee leaves the hive, it takes on the hive's damage and toxic values /datum/bee/New(var/obj/machinery/apiary/spawner = null) ..() + if(!bees_species[BEESPECIES_NORMAL]) + initialize_beespecies() species = bees_species[BEESPECIES_NORMAL] if (spawner) home = spawner @@ -74,4 +76,9 @@ state = BEE_SWARM colonizing = 1 mob.destination = A - mob.updateState = 1 \ No newline at end of file + mob.updateState = 1 + +/proc/initialize_beespecies() + for(var/x in typesof(/datum/bee_species)) + var/datum/bee_species/species = new x + bees_species[species.common_name] = species diff --git a/code/world.dm b/code/world.dm index 688c67d3fd3..21faabe7cb5 100644 --- a/code/world.dm +++ b/code/world.dm @@ -99,10 +99,6 @@ var/savefile/panicfile initialize_cultwords() - for(var/x in typesof(/datum/bee_species)) - var/datum/bee_species/species = new x - bees_species[species.common_name] = species - //sun = new /datum/sun() radio_controller = new /datum/controller/radio() data_core = new /obj/effect/datacore()