From ec366d5d741fcc6f69be758be8ab96834e97325b Mon Sep 17 00:00:00 2001
From: Neerti <neerti01@gmail.com>
Date: Fri, 28 Apr 2017 16:27:51 -0400
Subject: [PATCH] Makes Technomancer use modifiers, fixes a few bugs

---
 code/game/gamemodes/technomancer/equipment.dm |   1 +
 .../gamemodes/technomancer/instability.dm     |   2 +-
 .../gamemodes/technomancer/spells/dispel.dm   |   1 +
 .../gamemodes/technomancer/spells/illusion.dm |   3 ++
 .../technomancer/spells/insert/corona.dm      |  42 ------------------
 .../technomancer/spells/insert/haste.dm       |  36 ---------------
 .../spells/insert/repel_missiles.dm           |  39 ----------------
 .../technomancer/spells/modifier/corona.dm    |  33 ++++++++++++++
 .../technomancer/spells/modifier/haste.dm     |  28 ++++++++++++
 .../technomancer/spells/modifier/modifier.dm  |  31 +++++++++++++
 .../spells/modifier/repel_missiles.dm         |  28 ++++++++++++
 .../technomancer/spells/spawner/darkness.dm   |   4 +-
 .../mob/living/carbon/human/human_movement.dm |   4 +-
 .../mob/living/carbon/human/update_icons.dm   |  21 +++++++--
 code/modules/mob/living/living.dm             |   5 +++
 code/modules/mob/living/living_defense.dm     |   8 ++++
 code/modules/mob/modifiers.dm                 |  31 +++++++++++--
 code/modules/projectiles/projectile.dm        |   2 +-
 icons/mob/modifier_effects.dmi                | Bin 0 -> 9725 bytes
 polaris.dme                                   |   7 +--
 20 files changed, 194 insertions(+), 132 deletions(-)
 delete mode 100644 code/game/gamemodes/technomancer/spells/insert/corona.dm
 delete mode 100644 code/game/gamemodes/technomancer/spells/insert/haste.dm
 delete mode 100644 code/game/gamemodes/technomancer/spells/insert/repel_missiles.dm
 create mode 100644 code/game/gamemodes/technomancer/spells/modifier/corona.dm
 create mode 100644 code/game/gamemodes/technomancer/spells/modifier/haste.dm
 create mode 100644 code/game/gamemodes/technomancer/spells/modifier/modifier.dm
 create mode 100644 code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm
 create mode 100644 icons/mob/modifier_effects.dmi

diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm
index 5c440d0dcd..8d1fb4c6ad 100644
--- a/code/game/gamemodes/technomancer/equipment.dm
+++ b/code/game/gamemodes/technomancer/equipment.dm
@@ -191,6 +191,7 @@
 	icon_state = "scepter"
 	force = 15
 	slot_flags = SLOT_BELT
+	attack_verb = list("beaten", "smashed", "struck", "whacked")
 
 /obj/item/weapon/scepter/attack_self(mob/living/carbon/human/user)
 	var/obj/item/item_to_test = user.get_other_hand(src)
diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm
index fa9985b1b6..453469619c 100644
--- a/code/game/gamemodes/technomancer/instability.dm
+++ b/code/game/gamemodes/technomancer/instability.dm
@@ -285,4 +285,4 @@
 				to_chat(H, "<span class='warning'>The purple glow makes you feel strange...</span>")
 			H.adjust_instability(outgoing_instability)
 
-	set_light(distance, distance * 2, l_color = "#C26DDE")
+	set_light(distance, distance * 4, l_color = "#C26DDE")
diff --git a/code/game/gamemodes/technomancer/spells/dispel.dm b/code/game/gamemodes/technomancer/spells/dispel.dm
index 87edf6a621..10f258bf58 100644
--- a/code/game/gamemodes/technomancer/spells/dispel.dm
+++ b/code/game/gamemodes/technomancer/spells/dispel.dm
@@ -21,5 +21,6 @@
 		for(var/obj/item/weapon/inserted_spell/I in target)
 			I.on_expire(dispelled = 1)
 			log_and_message_admins("dispelled [I] on [target].")
+		target.remove_modifiers_of_type(/datum/modifier/technomancer)
 	user.adjust_instability(10)
 	qdel(src)
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm
index 12f04db48c..50a9bf5da7 100644
--- a/code/game/gamemodes/technomancer/spells/illusion.dm
+++ b/code/game/gamemodes/technomancer/spells/illusion.dm
@@ -93,6 +93,9 @@
 	var/walking = 0
 	var/step_delay = 10
 
+/mob/living/simple_animal/illusion/update_icon() // We don't want the appearance changing AT ALL unless by copy_appearance().
+	return
+
 /mob/living/simple_animal/illusion/proc/copy_appearance(var/atom/movable/thing_to_copy)
 	if(!thing_to_copy)
 		return 0
diff --git a/code/game/gamemodes/technomancer/spells/insert/corona.dm b/code/game/gamemodes/technomancer/spells/insert/corona.dm
deleted file mode 100644
index 0ecd700732..0000000000
--- a/code/game/gamemodes/technomancer/spells/insert/corona.dm
+++ /dev/null
@@ -1,42 +0,0 @@
-/datum/technomancer/spell/corona
-	name = "Corona"
-	desc = "Causes the victim to glow very brightly, which while harmless in itself, makes it easier for them to be hit.  The \
-	bright glow also makes it very difficult to be stealthy.  The effect lasts for one minute."
-	spell_power_desc = "Enemies become even easier to hit."
-	cost = 50
-	obj_path = /obj/item/weapon/spell/insert/corona
-	ability_icon_state = "tech_corona"
-	category = SUPPORT_SPELLS
-
-/obj/item/weapon/spell/insert/corona
-	name = "corona"
-	desc = "How brillient!"
-	icon_state = "radiance"
-	cast_methods = CAST_RANGED
-	aspect = ASPECT_LIGHT
-	light_color = "#D9D900"
-	spell_light_intensity = 5
-	spell_light_range = 3
-	inserting = /obj/item/weapon/inserted_spell/corona
-
-
-/obj/item/weapon/inserted_spell/corona
-	var/evasion_reduction = 2 // We store this here because spell power may change when the spell expires.
-
-/obj/item/weapon/inserted_spell/corona/on_insert()
-	spawn(1)
-		if(isliving(host))
-			var/mob/living/L = host
-			evasion_reduction = round(2 * spell_power_at_creation, 1)
-			L.evasion -= evasion_reduction
-			L.visible_message("<span class='warning'>You start to glow very brightly!</span>")
-			spawn(1 MINUTE)
-				if(src)
-					on_expire()
-
-/obj/item/weapon/inserted_spell/corona/on_expire()
-	if(isliving(host))
-		var/mob/living/L = host
-		L.evasion += evasion_reduction
-		L << "<span class='notice'>Your glow has ended.</span>"
-		..()
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/insert/haste.dm b/code/game/gamemodes/technomancer/spells/insert/haste.dm
deleted file mode 100644
index 30422cef3f..0000000000
--- a/code/game/gamemodes/technomancer/spells/insert/haste.dm
+++ /dev/null
@@ -1,36 +0,0 @@
-/datum/technomancer/spell/haste
-	name = "Haste"
-	desc = "Allows the target to run at speeds that should not be possible for an ordinary being.  For five seconds, the target \
-	runs extremly fast, and cannot be slowed by any means."
-	spell_power_desc = "Duration is scaled up."
-	cost = 100
-	obj_path = /obj/item/weapon/spell/insert/haste
-	ability_icon_state = "tech_haste"
-	category = SUPPORT_SPELLS
-
-/obj/item/weapon/spell/insert/haste
-	name = "haste"
-	desc = "Now you can outrun a Teshari!"
-	icon_state = "haste"
-	cast_methods = CAST_RANGED
-	aspect = ASPECT_FORCE
-	light_color = "#FF5C5C"
-	inserting = /obj/item/weapon/inserted_spell/haste
-
-/obj/item/weapon/inserted_spell/haste/on_insert()
-	spawn(1)
-		if(isliving(host))
-			var/mob/living/L = host
-			L.force_max_speed = 1
-			L << "<span class='notice'>You suddenly find it much easier to move.</span>"
-			L.adjust_instability(10)
-			spawn(round(5 SECONDS * spell_power_at_creation, 1))
-				if(src)
-					on_expire()
-
-/obj/item/weapon/inserted_spell/haste/on_expire()
-	if(isliving(host))
-		var/mob/living/L = host
-		L.force_max_speed = 0
-		L << "<span class='warning'>You feel slow again.</span>"
-		..()
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/insert/repel_missiles.dm b/code/game/gamemodes/technomancer/spells/insert/repel_missiles.dm
deleted file mode 100644
index 38e4ef4720..0000000000
--- a/code/game/gamemodes/technomancer/spells/insert/repel_missiles.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/datum/technomancer/spell/repel_missiles
-	name = "Repel Missiles"
-	desc = "Places a repulsion field around you, which attempts to deflect incoming bullets and lasers, making them 30% less likely \
-	to hit you.  The field lasts for five minutes and can be granted to yourself or an ally."
-	spell_power_desc = "Projectiles will be more likely to be deflected."
-	cost = 25
-	obj_path = /obj/item/weapon/spell/insert/repel_missiles
-	ability_icon_state = "tech_repelmissiles"
-	category = SUPPORT_SPELLS
-
-/obj/item/weapon/spell/insert/repel_missiles
-	name = "repel missiles"
-	desc = "Use it before they start shooting at you!"
-	icon_state = "generic"
-	cast_methods = CAST_RANGED
-	aspect = ASPECT_FORCE
-	light_color = "#FF5C5C"
-	inserting = /obj/item/weapon/inserted_spell/repel_missiles
-
-/obj/item/weapon/inserted_spell/repel_missiles
-	var/evasion_increased = 2 // We store this here because spell power may change when the spell expires.
-
-/obj/item/weapon/inserted_spell/repel_missiles/on_insert()
-	spawn(1)
-		if(isliving(host))
-			var/mob/living/L = host
-			evasion_increased = round(2 * spell_power_at_creation, 1)
-			L.evasion += evasion_increased
-			L << "<span class='notice'>You have a repulsion field around you, which will attempt to deflect projectiles.</span>"
-			spawn(5 MINUTES)
-				if(src)
-					on_expire()
-
-/obj/item/weapon/inserted_spell/repel_missiles/on_expire()
-	if(isliving(host))
-		var/mob/living/L = host
-		L.evasion -= evasion_increased
-		L << "<span class='warning'>Your repulsion field has expired.</span>"
-		..()
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/modifier/corona.dm b/code/game/gamemodes/technomancer/spells/modifier/corona.dm
new file mode 100644
index 0000000000..74a06855d9
--- /dev/null
+++ b/code/game/gamemodes/technomancer/spells/modifier/corona.dm
@@ -0,0 +1,33 @@
+/datum/technomancer/spell/corona
+	name = "Corona"
+	desc = "Causes the victim to glow very brightly, which while harmless in itself, makes it easier for them to be hit.  The \
+	bright glow also makes it very difficult to be stealthy.  The effect lasts for one minute."
+	cost = 50
+	obj_path = /obj/item/weapon/spell/modifier/corona
+	ability_icon_state = "tech_corona"
+	category = SUPPORT_SPELLS
+
+/obj/item/weapon/spell/modifier/corona
+	name = "corona"
+	desc = "How brillient!"
+	icon_state = "radiance"
+	cast_methods = CAST_RANGED
+	aspect = ASPECT_LIGHT
+	light_color = "#D9D900"
+	spell_light_intensity = 5
+	spell_light_range = 3
+	modifier_type = /datum/modifier/technomancer/corona
+	modifier_duration = 1 MINUTE
+
+/datum/modifier/technomancer/corona
+	name = "corona"
+	desc = "You appear to be glowing really bright.  It doesn't seem to hurt, however hiding will be impossible."
+	mob_overlay_state = "corona"
+
+	on_created_text = "<span class='warning'>You start to glow very brightly!</span>"
+	on_expired_text = "<span class='notice'>Your glow has ended.</span>"
+	evasion = -2
+	stacks = MODIFIER_STACK_EXTEND
+
+/datum/modifier/technomancer/corona/tick()
+	holder.break_cloak()
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/modifier/haste.dm b/code/game/gamemodes/technomancer/spells/modifier/haste.dm
new file mode 100644
index 0000000000..7f7c1045b3
--- /dev/null
+++ b/code/game/gamemodes/technomancer/spells/modifier/haste.dm
@@ -0,0 +1,28 @@
+/datum/technomancer/spell/haste
+	name = "Haste"
+	desc = "Allows the target to run at speeds that should not be possible for an ordinary being.  For five seconds, the target \
+	runs extremly fast, and cannot be slowed by any means."
+	cost = 100
+	obj_path = /obj/item/weapon/spell/modifier/haste
+	ability_icon_state = "tech_haste"
+	category = SUPPORT_SPELLS
+
+/obj/item/weapon/spell/modifier/haste
+	name = "haste"
+	desc = "Now you can outrun a Teshari!"
+	icon_state = "haste"
+	cast_methods = CAST_RANGED
+	aspect = ASPECT_FORCE
+	light_color = "#FF5C5C"
+	modifier_type = /datum/modifier/technomancer/haste
+	modifier_duration = 5 SECONDS
+
+/datum/modifier/technomancer/haste
+	name = "haste"
+	desc = "Moving is almost effortless!"
+	mob_overlay_state = "haste"
+
+	on_created_text = "<span class='notice'>You suddenly find it much easier to move.</span>"
+	on_expired_text = "<span class='warning'>You feel slow again.</span>"
+	haste = TRUE
+	stacks = MODIFIER_STACK_EXTEND
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm
new file mode 100644
index 0000000000..b0a5c93747
--- /dev/null
+++ b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm
@@ -0,0 +1,31 @@
+/obj/item/weapon/spell/modifier
+	name = "modifier template"
+	desc = "Tell a coder if you can read this in-game."
+	icon_state = "purify"
+	cast_methods = CAST_MELEE
+	var/modifier_type = null
+	var/modifier_duration = null // Will last forever by default.  Final duration may differ due to 'spell power'
+//	var/spell_color = "#03A728"
+	var/spell_light_intensity = 2
+	var/spell_light_range = 3
+
+/obj/item/weapon/spell/modifier/New()
+	..()
+	set_light(spell_light_range, spell_light_intensity, l_color = light_color)
+
+/obj/item/weapon/spell/modifier/on_melee_cast(atom/hit_atom, mob/user)
+	if(istype(hit_atom, /mob/living))
+		on_add_modifier(hit_atom)
+
+/obj/item/weapon/spell/modifier/on_ranged_cast(atom/hit_atom, mob/user)
+	if(istype(hit_atom, /mob/living))
+		on_add_modifier(hit_atom)
+
+
+/obj/item/weapon/spell/modifier/proc/on_add_modifier(var/mob/living/L)
+	var/duration = modifier_duration
+	if(duration)
+		duration = round(duration * calculate_spell_power(1.0), 1)
+	L.add_modifier(modifier_type, duration)
+	log_and_message_admins("has casted [src] on [L].")
+	qdel(src)
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm b/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm
new file mode 100644
index 0000000000..d267ecce88
--- /dev/null
+++ b/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm
@@ -0,0 +1,28 @@
+/datum/technomancer/spell/repel_missiles
+	name = "Repel Missiles"
+	desc = "Places a repulsion field around you, which attempts to deflect incoming bullets and lasers, making them 30% less likely \
+	to hit you.  The field lasts for 10 minutes and can be granted to yourself or an ally."
+	cost = 25
+	obj_path = /obj/item/weapon/spell/modifier/repel_missiles
+	ability_icon_state = "tech_repelmissiles"
+	category = SUPPORT_SPELLS
+
+/obj/item/weapon/spell/modifier/repel_missiles
+	name = "repel missiles"
+	desc = "Use it before they start shooting at you!"
+	icon_state = "generic"
+	cast_methods = CAST_RANGED
+	aspect = ASPECT_FORCE
+	light_color = "#FF5C5C"
+	modifier_type = /datum/modifier/technomancer/repel_missiles
+	modifier_duration = 10 MINUTES
+
+/datum/modifier/technomancer/repel_missiles
+	name = "repel_missiles"
+	desc = "A repulsion field can always be useful to have."
+	mob_overlay_state = "repel_missiles"
+
+	on_created_text = "<span class='notice'>You have a repulsion field around you, which will attempt to deflect projectiles.</span>"
+	on_expired_text = "<span class='warning'>Your repulsion field has expired.</span>"
+	evasion = 3
+	stacks = MODIFIER_STACK_EXTEND
\ No newline at end of file
diff --git a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm
index eafb167dd4..be978e7ee4 100644
--- a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm
+++ b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm
@@ -20,10 +20,10 @@
 
 /obj/item/weapon/spell/spawner/darkness/New()
 	..()
-	set_light(6, -5, l_color = "#FFFFFF")
+	set_light(6, -20, l_color = "#FFFFFF")
 
 /obj/effect/temporary_effect/darkness
 	name = "darkness"
 	time_to_die = 2 MINUTES
 	new_light_range = 6
-	new_light_power = -5
\ No newline at end of file
+	new_light_power = -20
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index ba590f92bc..e856f4ea73 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -13,9 +13,11 @@
 		handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
 
 	if(force_max_speed)
-		return -3 // Returning -1 will actually result in a slowdown for Teshari.
+		return -3
 
 	for(var/datum/modifier/M in modifiers)
+		if(!isnull(M.haste) && M.haste == TRUE)
+			return -3 // Returning -1 will actually result in a slowdown for Teshari.
 		if(!isnull(M.slowdown))
 			tally += M.slowdown
 
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index a84a2889dc..1924bd5e78 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -131,10 +131,11 @@ Please contact me on #coderbus IRC. ~Carn x
 #define LEGCUFF_LAYER			23
 #define L_HAND_LAYER			24
 #define R_HAND_LAYER			25
-#define FIRE_LAYER				26		//If you're on fire
-#define WATER_LAYER				27		//If you're submerged in water.
-#define TARGETED_LAYER			28		//BS12: Layer for the target overlay from weapon targeting system
-#define TOTAL_LAYERS			29
+#define MODIFIER_EFFECTS_LAYER	26
+#define FIRE_LAYER				27		//If you're on fire
+#define WATER_LAYER				28		//If you're submerged in water.
+#define TARGETED_LAYER			29		//BS12: Layer for the target overlay from weapon targeting system
+#define TOTAL_LAYERS			30
 //////////////////////////////////
 
 /mob/living/carbon/human
@@ -1118,6 +1119,18 @@ var/global/list/damage_icon_parts = list()
 
 	if(update_icons)   update_icons()
 
+/mob/living/carbon/human/update_modifier_visuals(var/update_icons=1)
+	overlays_standing[MODIFIER_EFFECTS_LAYER] = null
+	var/image/effects = new()
+	for(var/datum/modifier/M in modifiers)
+		if(M.mob_overlay_state)
+			var/image/I = image("icon" = 'icons/mob/modifier_effects.dmi', "icon_state" = M.mob_overlay_state)
+			effects.overlays += I
+
+	overlays_standing[MODIFIER_EFFECTS_LAYER] = effects
+
+	if(update_icons)
+		update_icons()
 
 /mob/living/carbon/human/update_fire(var/update_icons=1)
 	overlays_standing[FIRE_LAYER] = null
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 8f6f94918b..0b47ba7870 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -958,6 +958,11 @@ default behaviour is:
 		update_icons()
 	return canmove
 
+// Adds overlays for specific modifiers.
+// You'll have to add your own implementation for non-humans currently, just override this proc.
+/mob/living/proc/update_modifier_visuals()
+	return
+
 /mob/living/proc/update_water() // Involves overlays for humans.  Maybe we'll get submerged sprites for borgs in the future?
 	return
 
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index b60ff078a3..66e1278e22 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -439,3 +439,11 @@
 			hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
 			//hud_used.SetButtonCoords(hud_used.hide_actions_toggle,button_number+1)
 		client.screen += hud_used.hide_actions_toggle
+
+// Returns a number to determine if something is harder or easier to hit than normal.
+/mob/living/proc/get_evasion()
+	var/result = evasion // First we get the 'base' evasion.  Generally this is zero.
+	for(var/datum/modifier/M in modifiers)
+		if(!isnull(M.evasion))
+			result += M.evasion
+	return result
diff --git a/code/modules/mob/modifiers.dm b/code/modules/mob/modifiers.dm
index 6ba148916e..8e1f9e2f6f 100644
--- a/code/modules/mob/modifiers.dm
+++ b/code/modules/mob/modifiers.dm
@@ -14,6 +14,11 @@
 	var/stacks = MODIFIER_STACK_FORBID	// If true, attempts to add a second instance of this type will refresh expire_at instead.
 	var/flags = 0						// Flags for the modifier, see mobs.dm defines for more details.
 
+	var/light_color = null				// If set, the mob possessing the modifier will glow in this color.  Not implemented yet.
+	var/light_range = null				// How far the light for the above var goes. Not implemented yet.
+	var/light_intensity = null			// Ditto. Not implemented yet.
+	var/mob_overlay_state = null		// Icon_state for an overlay to apply to a (human) mob while this exists.  This is actually implemented.
+
 	// Now for all the different effects.
 	// Percentage modifiers are expressed as a multipler. (e.g. +25% damage should be written as 1.25)
 	var/max_health_flat					// Adjusts max health by a flat (e.g. +20) amount.  Note this is added to base health.
@@ -29,6 +34,8 @@
 	var/incoming_healing_percent		// Adjusts amount of healing received.
 	var/outgoing_melee_damage_percent	// Adjusts melee damage inflicted by holder by a percentage.  Affects attacks by melee weapons and hand-to-hand.
 	var/slowdown						// Negative numbers speed up, positive numbers slow down movement.
+	var/haste							// If set to 1, the mob will be 'hasted', which makes it ignore slowdown and go really fast.
+	var/evasion							// Positive numbers reduce the odds of being hit by 15% each.  Negative numbers increase the odds.
 
 /datum/modifier/New(var/new_holder)
 	holder = new_holder
@@ -44,12 +51,18 @@
 		to_chat(holder, on_expired_text)
 	on_expire()
 	holder.modifiers.Remove(src)
+	if(mob_overlay_state) // We do this after removing ourselves from the list so that the overlay won't remain.
+		holder.update_modifier_visuals()
 	qdel(src)
 
 // Override this for special effects when it gets removed.
 /datum/modifier/proc/on_expire()
 	return
 
+// Called every Life() tick.  Override for special behaviour.
+/datum/modifier/proc/tick()
+	return
+
 /mob/living
 	var/list/modifiers = list() // A list of modifier datums, which can adjust certain mob numbers.
 
@@ -64,13 +77,16 @@
 	// Get rid of anything we shouldn't have.
 	for(var/datum/modifier/M in modifiers)
 		M.check_if_valid()
+	// Remaining modifiers will now receive a tick().  This is in a second loop for safety in order to not tick() an expired modifier.
+	for(var/datum/modifier/M in modifiers)
+		M.tick()
 
 // Call this to add a modifier to a mob. First argument is the modifier type you want, second is how long it should last, in ticks.
 // The SECONDS/MINUTES macro is very helpful for this.  E.g. M.add_modifier(/datum/modifier/example, 5 MINUTES)
 /mob/living/proc/add_modifier(var/modifier_type, var/expire_at = null)
 	// First, check if the mob already has this modifier.
 	for(var/datum/modifier/M in modifiers)
-		if(ispath(modifier_type, M.type))
+		if(istype(modifier_type, M))
 			switch(M.stacks)
 				if(MODIFIER_STACK_FORBID)
 					return // Stop here.
@@ -89,6 +105,8 @@
 	if(mod.on_created_text)
 		to_chat(src, mod.on_created_text)
 	modifiers.Add(mod)
+	if(mod.mob_overlay_state)
+		update_modifier_visuals()
 
 // Removes a specific instance of modifier
 /mob/living/proc/remove_specific_modifier(var/datum/modifier/M, var/silent = FALSE)
@@ -97,10 +115,17 @@
 // Removes all modifiers of a type
 /mob/living/proc/remove_modifiers_of_type(var/modifier_type, var/silent = FALSE)
 	for(var/datum/modifier/M in modifiers)
-		if(ispath(modifier_type, M.type))
+		if(istype(M, modifier_type))
 			M.expire(silent)
 
 // Removes all modifiers, useful if the mob's being deleted
 /mob/living/proc/remove_all_modifiers(var/silent = FALSE)
 	for(var/datum/modifier/M in modifiers)
-		M.expire(silent)
\ No newline at end of file
+		M.expire(silent)
+
+// Checks if the mob has a modifier type.
+/mob/living/proc/has_modifier_of_type(var/modifier_type)
+	for(var/datum/modifier/M in modifiers)
+		if(istype(M, modifier_type))
+			return TRUE
+	return FALSE
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 750164a260..f5a7460cc3 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -173,7 +173,7 @@
 		return
 
 	//roll to-hit
-	miss_modifier = max(15*(distance-2) - round(15*accuracy) + miss_modifier + round(15*target_mob.evasion), 0)
+	miss_modifier = max(15*(distance-2) - round(15*accuracy) + miss_modifier + round(15*target_mob.get_evasion()), 0)
 	var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
 
 	var/result = PROJECTILE_FORCE_MISS
diff --git a/icons/mob/modifier_effects.dmi b/icons/mob/modifier_effects.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..ecb575c673bb3ca33505313dae6e0a81e0ffc743
GIT binary patch
literal 9725
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

literal 0
HcmV?d00001

diff --git a/polaris.dme b/polaris.dme
index f259635324..23fc2fc0c4 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -471,8 +471,6 @@
 #include "code\game\gamemodes\technomancer\spells\aura\frost_aura.dm"
 #include "code\game\gamemodes\technomancer\spells\aura\shock_aura.dm"
 #include "code\game\gamemodes\technomancer\spells\aura\unstable_aura.dm"
-#include "code\game\gamemodes\technomancer\spells\insert\corona.dm"
-#include "code\game\gamemodes\technomancer\spells\insert\haste.dm"
 #include "code\game\gamemodes\technomancer\spells\insert\insert.dm"
 #include "code\game\gamemodes\technomancer\spells\insert\mend_burns.dm"
 #include "code\game\gamemodes\technomancer\spells\insert\mend_metal.dm"
@@ -480,7 +478,10 @@
 #include "code\game\gamemodes\technomancer\spells\insert\mend_wires.dm"
 #include "code\game\gamemodes\technomancer\spells\insert\mend_wounds.dm"
 #include "code\game\gamemodes\technomancer\spells\insert\purify.dm"
-#include "code\game\gamemodes\technomancer\spells\insert\repel_missiles.dm"
+#include "code\game\gamemodes\technomancer\spells\modifier\corona.dm"
+#include "code\game\gamemodes\technomancer\spells\modifier\haste.dm"
+#include "code\game\gamemodes\technomancer\spells\modifier\modifier.dm"
+#include "code\game\gamemodes\technomancer\spells\modifier\repel_missiles.dm"
 #include "code\game\gamemodes\technomancer\spells\projectile\beam.dm"
 #include "code\game\gamemodes\technomancer\spells\projectile\chain_lightning.dm"
 #include "code\game\gamemodes\technomancer\spells\projectile\force_missile.dm"