Merges AI Branch into Master

code/modules/power/singularity/act.dm

@@ -115,6 +115,15 @@
 	ChangeTurf(get_base_turf_by_area(src))
 	return 2
 
+/turf/simulated/floor/singularity_pull(S, current_size)
+	if(flooring && current_size >= STAGE_THREE)
+		if(prob(current_size / 2))
+			var/leave_tile = TRUE
+			if(broken || burnt || flooring.flags & TURF_IS_FRAGILE)
+				leave_tile = FALSE
+			playsound(src, 'sound/items/crowbar.ogg', 50, 1)
+			make_plating(leave_tile)
+
 /turf/simulated/wall/singularity_pull(S, current_size)
 
 	if(!reinf_material)

code/modules/power/tesla/energy_ball.dm

@@ -185,7 +185,6 @@
 										/obj/machinery/atmospherics,
 										/obj/machinery/power/emitter,
 										/obj/machinery/field_generator,
-										/mob/living/simple_animal,
 										/obj/machinery/door/blast,
 										/obj/machinery/particle_accelerator/control_box,
 										/obj/structure/particle_accelerator/fuel_chamber,
@@ -290,7 +289,7 @@
 
 	else if(closest_mob)
 		var/shock_damage = Clamp(round(power/400), 10, 90) + rand(-5, 5)
-		closest_mob.electrocute_act(shock_damage, source, 1, ran_zone())
+		closest_mob.electrocute_act(shock_damage, source, 1 - closest_mob.get_shock_protection(), ran_zone())
 		log_game("TESLA([source.x],[source.y],[source.z]) Shocked [key_name(closest_mob)] for [shock_damage]dmg.")
 		message_admins("Tesla zapped [key_name_admin(closest_mob)]!")
 		if(issilicon(closest_mob))

code/modules/power/tesla/tesla_act.dm

@@ -60,6 +60,9 @@
 	..() //extend the zap
 	explode()
 
+/obj/mecha/tesla_act(power)
+	..()
+	take_damage(power / 200, "energy") // A surface lightning strike will do 100 damage.