Merge remote-tracking branch 'remotes/upstream/master' into events

# Conflicts:
#	code/modules/events/immovable_rod.dm

code/modules/events/alien_infestation.dm

@@ -29,6 +29,8 @@
 				respawnable_list -= C.client
 				var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
 				new_xeno.key = C.key
+				if(ticker && ticker.mode)
+					ticker.mode.xenos += new_xeno.mind
 
 				spawncount--
 				successSpawn = 1

code/modules/events/immovable_rod.dm

@@ -11,7 +11,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	announceWhen = 5
 
 /datum/event/immovable_rod/announce()
-	event_announcement.Announce("Immovable object inbound. Brace for impact.", "Collision Alert")
+	event_announcement.Announce("Unidentified object inbound. Brace for impact.", "Collision Alert")
 
 /datum/event/immovable_rod/start()
 	var/startside = pick(cardinal)
@@ -34,17 +34,24 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	loc = start
 	z_original = z
 	destination = end
-	notify_ghosts("\A [src] is inbound!", source = src)
+	notify_ghosts("\A [src] is inbound!",
+			enter_link="<a href=?src=[UID()];orbit=1>(Click to follow)</a>",
+			source=src, action=NOTIFY_FOLLOW)
+	poi_list |= src
 	if(end && end.z==z_original)
 		walk_towards(src, destination, 1)
 
+/obj/effect/immovablerod/Destroy()
+	poi_list.Remove(src)
+	return ..()
+
 /obj/effect/immovablerod/Move()
 	if(z != z_original || loc == destination)
 		qdel(src)
 	return ..()
 
 /obj/effect/immovablerod/ex_act(test)
-	return FALSE
+	return 0
 
 /obj/effect/immovablerod/Bump(atom/clong)
 	if(prob(10))
@@ -55,15 +62,15 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 		x = clong.x
 		y = clong.y
 
-	if(isturf(clong) || isobj(clong))
+	if(istype(clong, /turf) || istype(clong, /obj))
 		if(clong.density)
 			clong.ex_act(2)
 
-	else if(ismob(clong))
-		if(ishuman(clong))
+	else if(istype(clong, /mob))
+		if(istype(clong, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = clong
 			H.visible_message("<span class='danger'>[H.name] is penetrated by an immovable rod!</span>" , "<span class='userdanger'>The rod penetrates you!</span>" , "<span class ='danger'>You hear a CLANG!</span>")
 			H.adjustBruteLoss(160)
 		if(clong.density || prob(10))
 			clong.ex_act(2)
-	return
+	return