diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 9952ce2a25d27..bce9ed3bb9375 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,5 +1,4 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list -GLOBAL_LIST_EMPTY(objectives) // BANDASTATION EDIT ADDITION /datum/objective var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code. @@ -19,13 +18,11 @@ GLOBAL_LIST_EMPTY(objectives) // BANDASTATION EDIT ADDITION var/admin_grantable = FALSE /datum/objective/New(text) - GLOB.objectives += src // BANDASTATION EDIT ADDITION if(text) explanation_text = text //Apparently objectives can be qdel'd. Learn a new thing every day /datum/objective/Destroy() - GLOB.objectives -= src // BANDASTATION EDIT ADDITION return ..() /datum/objective/proc/get_owners() // Combine owner and team into a single list. diff --git a/modular_bandastation/cryosleep/_cryosleep.dme b/modular_bandastation/cryosleep/_cryosleep.dme index 4442158aaef63..1e9a62ec0c242 100644 --- a/modular_bandastation/cryosleep/_cryosleep.dme +++ b/modular_bandastation/cryosleep/_cryosleep.dme @@ -7,5 +7,4 @@ #include "code/cryopod.dm" #include "code/job.dm" #include "code/jobs.dm" -#include "code/mind.dm" #include "code/mood.dm" diff --git a/modular_bandastation/cryosleep/code/ai.dm b/modular_bandastation/cryosleep/code/ai.dm index 354f8147ef0b7..631a8d76340ad 100644 --- a/modular_bandastation/cryosleep/code/ai.dm +++ b/modular_bandastation/cryosleep/code/ai.dm @@ -3,7 +3,7 @@ set desc = "Перемещает текущий ИИ в криогенное хранилище, освобождая место для другого." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return if(tgui_alert(usr, "Войти в криогенный стазис? Вы станете призраком.", "Войти в криогенный стазис", list("Да", "Нет")) == "Да") src.ghostize(FALSE) diff --git a/modular_bandastation/cryosleep/code/cryopod.dm b/modular_bandastation/cryosleep/code/cryopod.dm index f4692222d8b6a..0a45465723788 100644 --- a/modular_bandastation/cryosleep/code/cryopod.dm +++ b/modular_bandastation/cryosleep/code/cryopod.dm @@ -1,3 +1,14 @@ +GLOBAL_LIST_EMPTY(objectives) + +/datum/objective/New() + . = ..() + GLOB.objectives += src + +//Apparently objectives can be qdel'd. Learn a new thing every day +/datum/objective/Destroy() + GLOB.objectives -= src + return ..() + /obj/effect/mob_spawn/ghost_role /// set this to make the spawner use the outfit.name instead of its name var for things like cryo announcements and ghost records /// modifying the actual name during the game will cause issues with the GLOB.mob_spawners associative list diff --git a/modular_bandastation/cryosleep/code/mind.dm b/modular_bandastation/cryosleep/code/mind.dm deleted file mode 100644 index c71983ae4845d..0000000000000 --- a/modular_bandastation/cryosleep/code/mind.dm +++ /dev/null @@ -1,2 +0,0 @@ -/datum/mind - var/list/datum/objective/objectives = list()