cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bee species not being initialized properly

Browse Source
This commit is contained in:
madmanmartian
2019-06-18 06:40:25 +01:00
parent cc0cdaf46c
commit eb46a5e3b5
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__DEFINES/global.dm
View File

@@ -327,7 +327,7 @@ var/nanocoins_lastchange = 0
var/minimapinit = 0 var/minimapinit = 0
var/bees_species = list() var/list/bees_species = list()
var/datum/stat_collector/stat_collection = new var/datum/stat_collector/stat_collection = new

9
code/modules/mob/living/simple_animal/bees/bees_datums.dm
View File

@@ -18,6 +18,8 @@
//When a bee leaves the hive, it takes on the hive's damage and toxic values //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) /datum/bee/New(var/obj/machinery/apiary/spawner = null)
..() ..()
if(!bees_species[BEESPECIES_NORMAL])
initialize_beespecies()
species = bees_species[BEESPECIES_NORMAL] species = bees_species[BEESPECIES_NORMAL]
if (spawner) if (spawner)
home = spawner home = spawner
@@ -74,4 +76,9 @@
state = BEE_SWARM state = BEE_SWARM
colonizing = 1 colonizing = 1
mob.destination = A mob.destination = A
mob.updateState = 1 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

4
code/world.dm
View File

@@ -99,10 +99,6 @@ var/savefile/panicfile
initialize_cultwords() 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() //sun = new /datum/sun()
radio_controller = new /datum/controller/radio() radio_controller = new /datum/controller/radio()
data_core = new /obj/effect/datacore() data_core = new /obj/effect/datacore()