Skip to content

Commit

Permalink
modular + fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Ros_Sample committed Sep 20, 2024
1 parent 33a59e2 commit 81fdee6
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
3 changes: 0 additions & 3 deletions code/game/gamemodes/objective.dm
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion modular_bandastation/cryosleep/_cryosleep.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
#include "code/cryopod.dm"
#include "code/job.dm"
#include "code/jobs.dm"
#include "code/mind.dm"
#include "code/mood.dm"
2 changes: 1 addition & 1 deletion modular_bandastation/cryosleep/code/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set desc = "Перемещает текущий ИИ в криогенное хранилище, освобождая место для другого."
set category = "AI Commands"

if(incapacitated())
if(incapacitated)
return
if(tgui_alert(usr, "Войти в криогенный стазис? Вы станете призраком.", "Войти в криогенный стазис", list("Да", "Нет")) == "Да")
src.ghostize(FALSE)
Expand Down
11 changes: 11 additions & 0 deletions modular_bandastation/cryosleep/code/cryopod.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions modular_bandastation/cryosleep/code/mind.dm

This file was deleted.

0 comments on commit 81fdee6

Please sign in to comment.