compile fixes

2017-06-12 16:12:00 -05:00
parent 55d30f865b
commit 2a5be91970
4 changed files with 30 additions and 12 deletions
@@ -17,14 +17,6 @@
 	alert_type = null
 	var/total_damage = 0

-/datum/status_effect/syphon_mark
-	id = "syphon_mark"
-	duration = 50
-	status_type = STATUS_EFFECT_MULTIPLE
-	alert_type = null
-	on_remove_on_mob_delete = TRUE
-	var/obj/item/borg/upgrade/modkit/bounty/reward_target
-
 /datum/status_effect/syphon_mark/on_apply()
 	if(owner.stat == DEAD)
 		return FALSE
@@ -42,3 +34,25 @@
 /datum/status_effect/syphon_mark/on_remove()
 	get_kill()
 	. = ..()
+
+/datum/status_effect/syphon_mark
+	id = "syphon_mark"
+	duration = 50
+	status_type = STATUS_EFFECT_MULTIPLE
+	alert_type = null
+	on_remove_on_mob_delete = TRUE
+	var/obj/item/borg/upgrade/modkit/bounty/reward_target
+
+/datum/status_effect/syphon_mark/on_apply()
+	if(owner.stat == DEAD)
+		return FALSE
+	return ..()
+
+/datum/status_effect/syphon_mark/tick()
+	if(owner.stat == DEAD)
+		get_kill()
+		qdel(src)
+
+/datum/status_effect/syphon_mark/on_remove()
+	get_kill()
+	. = ..()