From 5ada6ea4cc706ee33ef70b226e77ab9b7d9e94d1 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 10 Jan 2014 01:24:24 +1030 Subject: [PATCH] Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective. Conflicts: code/game/machinery/cryopod.dm --- code/game/gamemodes/objective.dm | 6 ++++++ code/game/machinery/cryopod.dm | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 1be0c2fe405..9b596da3028 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,4 +1,5 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 +var/global/list/all_objectives = list() var/list/potential_theft_objectives=typesof(/datum/theft_objective) \ - /datum/theft_objective \ @@ -14,9 +15,14 @@ datum/objective var/completed = 0 //currently only used for custom objectives. New(var/text) + all_objectives |= src if(text) explanation_text = text + Del() + all_objectives -= src + ..() + proc/check_completion() return completed diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 7eb966a3e9f..3a0de6a8006 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -96,7 +96,6 @@ obj/machinery/computer/cryopod/Topic(href, href_list) frozen_items -= I else if(href_list["crew"]) - user << "\red Functionality unavailable at this time." src.updateUsrDialog() @@ -227,7 +226,6 @@ obj/machinery/computer/cryopod/Topic(href, href_list) O.owner.objectives -= O del(O) - //Handle job slot/tater cleanup. var/job = occupant.mind.assigned_role