Delete status_effect.dm.rej

2017-05-07 22:44:14 -07:00
parent 14a9bda61e
commit bebb9ec571
1 changed files with 0 additions and 11 deletions
@@ -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