diff --git a/code/modules/pve/boss/boss.dm b/code/modules/pve/boss/boss.dm index 3d59dc78bf..e1e640a6ae 100644 --- a/code/modules/pve/boss/boss.dm +++ b/code/modules/pve/boss/boss.dm @@ -9,8 +9,8 @@ var/boss_type = "default" //below should be safely disregarded if type is not set to 1 var/boss_stage = 1 - var/datum/boss_action/boss_ability - var/datum/bossclicking/boss_click_intercept + var/datum/boss_action/boss_ability = /datum/boss_action/ + var/datum/bossclicking/boss_click_intercept = /datum/bossclicking/ var/list/boss_abilities = list() var/list/ability_cooldowns = list() var/explosion_damage = 30 @@ -21,16 +21,12 @@ var/list/action_cooldowns = list() var/list/action_last_use_time = list() -/mob/living/pve_boss/proc/setup_boss() +/mob/living/pve_boss/Initialize() + . = ..() boss_ability.set_owner(src) boss_click_intercept.AssignMob(src) click_intercept = boss_click_intercept -/mob/living/pve_boss/Initialize() - . = ..() - INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living/pve_boss/, setup_boss)) - - /datum/boss_action/ var/mob/owner = null diff --git a/colonialmarines.dme b/colonialmarines.dme index c8c14dfbba..ca25d67c7e 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2264,8 +2264,8 @@ #include "code\modules\projectiles\magazines\specialist.dm" #include "code\modules\pve\spawner.dm" #include "code\modules\pve\boss\boss.dm" -#include "code\modules\pve\boss\abilities\boss_click_actions.dm" #include "code\modules\pve\boss\abilities\boss_abilities.dm" +#include "code\modules\pve\boss\abilities\boss_click_actions.dm" #include "code\modules\pve\boss\ammo\boss_ammo.dm" #include "code\modules\pve\boss\mobs\boss_bot.dm" #include "code\modules\reagents\Chemistry-Colours.dm"