From bebb9ec5719107f5f5bf942cda767e3e12b40414 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 7 May 2017 22:44:14 -0700 Subject: [PATCH] Delete status_effect.dm.rej --- code/datums/status_effects/status_effect.dm.rej | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 code/datums/status_effects/status_effect.dm.rej diff --git a/code/datums/status_effects/status_effect.dm.rej b/code/datums/status_effects/status_effect.dm.rej deleted file mode 100644 index a174c87f7b..0000000000 --- a/code/datums/status_effects/status_effect.dm.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm (rejected hunks) -@@ -54,7 +53,8 @@ var/global/list/all_status_effects = list() //a list of all status effects, if f - if(duration != -1 && duration < world.time) - qdel(src) - --/datum/status_effect/proc/on_apply() //Called whenever the buff is applied. -+/datum/status_effect/proc/on_apply() //Called whenever the buff is applied; returning FALSE will cause it to autoremove itself. -+ return TRUE - /datum/status_effect/proc/tick() //Called every tick. - /datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed. - /datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself