Merge pull request #2593 from Neerti/10/4/2016_technomancer_changes

Technomancer Bug Fixes & Tweaks

code/modules/mob/living/silicon/robot/life.dm

@@ -11,6 +11,7 @@
 	clamp_values()
 	handle_regular_status_updates()
 	handle_actions()
+	handle_instability()
 
 	if(client)
 		handle_regular_hud_updates()

code/modules/mob/living/silicon/silicon.dm

@@ -76,17 +76,16 @@
 	return	//immune
 
 /mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
-
-	if (istype(source, /obj/machinery/containment_field))
+	if(shock_damage > 0)
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(5, 1, loc)
 		s.start()
 
 		shock_damage *= 0.75	//take reduced damage
 		take_overall_damage(0, shock_damage)
-		visible_message("\red [src] was shocked by \the [source]!", \
-			"\red <B>Energy pulse detected, system damaged!</B>", \
-			"\red You hear an electrical crack")
+		visible_message("<span class='warning'>[src] was shocked by \the [source]!</span>", \
+			"<span class='danger'>Energy pulse detected, system damaged!</span>", \
+			"<span class='warning'>You hear an electrical crack.</span>")
 		if(prob(20))
 			Stun(2)
 		return

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -398,6 +398,9 @@
 /mob/living/simple_animal/adjustBruteLoss(damage)
 	health = Clamp(health - damage, 0, maxHealth)
 
+/mob/living/simple_animal/adjustFireLoss(damage)
+	health = Clamp(health - damage, 0, maxHealth)
+
 /mob/living/simple_animal/proc/SA_attackable(target_mob)
 	if (isliving(target_mob))
 		var/mob/living/L = target_mob
@@ -636,4 +639,16 @@
 	if(!target_mob || enroute)
 		spawn(10)
 			if(!src.stat)
-				horde()
+				horde()
+
+/mob/living/simple_animal/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null)
+	shock_damage *= siemens_coeff
+	if (shock_damage < 1)
+		return 0
+
+	adjustFireLoss(shock_damage)
+	playsound(loc, "sparks", 50, 1, -1)
+
+	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	s.set_up(5, 1, loc)
+	s.start()