Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

code/modules/events/carp_migration.dm

@@ -1,15 +1,23 @@
 /datum/event/carp_migration
 	announceWhen	= 50
 	oneShot			= 1
+	endWhen = 900
+	var/list/spawned_carp = list()
 
 /datum/event/carp_migration/setup()
 	announceWhen = rand(40, 60)
+	endWhen = rand(600,1200)
 
 /datum/event/carp_migration/announce()
 	command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
 
-
 /datum/event/carp_migration/start()
 	for(var/obj/effect/landmark/C in landmarks_list)
 		if(C.name == "carpspawn")
-			new /mob/living/simple_animal/hostile/carp(C.loc)
+			spawned_carp.Add(new /mob/living/simple_animal/hostile/carp(C.loc))
+
+/datum/event/carp_migration/end()
+	for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp)
+		var/turf/T = get_turf(C)
+		if(istype(T, /turf/space))
+			del(C)

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

@@ -46,6 +46,13 @@
 				stance = HOSTILE_STANCE_ATTACK
 				T = M
 				break
+
+		if(istype(A, /obj/machinery/bot))
+			var/obj/machinery/bot/B = A
+			if (B.health > 0)
+				stance = HOSTILE_STANCE_ATTACK
+				T = B
+				break
 	return T
 
 
@@ -88,6 +95,9 @@
 		var/obj/mecha/M = target_mob
 		M.attack_animal(src)
 		return M
+	if(istype(target_mob,/obj/machinery/bot))
+		var/obj/machinery/bot/B = target_mob
+		B.attack_animal(src)
 
 /mob/living/simple_animal/hostile/proc/LoseTarget()
 	stance = HOSTILE_STANCE_IDLE

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -152,7 +152,7 @@
 	hostile_drone = 0
 	walk(src,0)
 
-/mob/living/simple_animal/Die()
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
 	src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
 	..()
 	del(src)

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

@@ -452,4 +452,8 @@
 		var/obj/mecha/M = target_mob
 		if (M.occupant)
 			return (0)
+	if (istype(target_mob,/obj/machinery/bot))
+		var/obj/machinery/bot/B = target_mob
+		if(B.health > 0)
+			return (0)
 	return (1)