diff --git a/code/datums/datum.dm b/code/datums/datum.dm index cb87734376..7d054ad64c 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -49,11 +49,6 @@ /// A weak reference to another datum var/datum/weakref/weak_reference -//ambition start - ///Lazy associative list of currently active cooldowns. - var/list/cooldowns -//ambition end - /* * Lazy associative list of currently active cooldowns. * @@ -236,38 +231,6 @@ else return returned -//ambition start -/** - * Callback called by a timer to end an associative-list-indexed cooldown. - * - * Arguments: - * * source - datum storing the cooldown - * * index - string index storing the cooldown on the cooldowns associative list - * - * This sends a signal reporting the cooldown end. - */ -/proc/end_cooldown(datum/source, index) - if(QDELETED(source)) - return - SEND_SIGNAL(source, COMSIG_CD_STOP(index)) - TIMER_COOLDOWN_END(source, index) - - -/** - * Proc used by stoppable timers to end a cooldown before the time has ran out. - * - * Arguments: - * * source - datum storing the cooldown - * * index - string index storing the cooldown on the cooldowns associative list - * - * This sends a signal reporting the cooldown end, passing the time left as an argument. - */ -/proc/reset_cooldown(datum/source, index) - if(QDELETED(source)) - return - SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index)) - TIMER_COOLDOWN_END(source, index) -//ambition end /** * Callback called by a timer to end an associative-list-indexed cooldown. diff --git a/code/datums/mind.dm b/code/datums/mind.dm index eb1c47e0aa..87bd5b4dfd 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -554,7 +554,6 @@ GLOBAL_LIST(objective_player_choices) /datum/objective/martyr, /datum/objective/steal, /datum/objective/download, - /datum/objective/blackmail_implant //SKYRAT ADDITION ) for(var/t in allowed_types) @@ -582,7 +581,6 @@ GLOBAL_LIST(objective_choices) /datum/objective/download, /datum/objective/nuclear, /datum/objective/absorb, - /datum/objective/blackmail_implant //SKYRAT ADDITION ) for(var/t in allowed_types)