Merge branch 'master' into overhaul-event-mob-selection

code/modules/events/mass_hallucination.dm

@@ -2,7 +2,13 @@
 	announceWhen = rand(0, 20)
 
 /datum/event/mass_hallucination/start()
-	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+	for(var/thing in GLOB.human_list)
+		var/mob/living/carbon/human/H = thing
+		if(H.stat == DEAD)
+			continue
+		var/turf/T = get_turf(H)
+		if(!is_station_level(T.z))
+			continue
 		var/armor = H.getarmor(type = "rad")
 		if((RADIMMUNE in H.dna.species.species_traits) || armor >= 75) // Leave radiation-immune species/rad armored players completely unaffected
 			continue

code/modules/events/sentience.dm

@@ -10,7 +10,7 @@
 
 	for(var/mob/living/simple_animal/L in GLOB.alive_mob_list)
 		var/turf/T = get_turf(L)
-		if (T.z != 1)
+		if (!is_station_level(T.z))
 			continue
 		if(!(L in GLOB.player_list) && !L.mind && (L.sentience_type == sentience_type))
 			potential += L

code/modules/events/slaughterevent.dm

@@ -33,7 +33,7 @@
 			spawn_locs += get_turf(player_mind.current)
 		if(!spawn_locs) //If we can't find THAT, then just retry
 			return kill()
-		var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
+		var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
 		var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
 		S.holder = holder
 		player_mind.transfer_to(S)

code/modules/events/spider_terror.dm

@@ -1,3 +1,4 @@
+#define TS_HIGHPOP_TRIGGER 80
 
 /datum/event/spider_terror
 	announceWhen = 240
@@ -22,23 +23,32 @@
 			if(temp_vent.parent.other_atmosmch.len > 50)
 				vents += temp_vent
 	var/spider_type
-	var/infestation_type = pick(1, 2, 3, 4, 5)
+	var/infestation_type
+	if((length(GLOB.clients)) < TS_HIGHPOP_TRIGGER)
+		infestation_type = pick(1, 2, 3, 4)
+	else
+		infestation_type = pick(2, 3, 4, 5)
 	switch(infestation_type)
 		if(1)
+			// Weakest, only used during lowpop.
 			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/green
 			spawncount = 5
 		if(2)
-			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white
-			spawncount = 2
-		if(3)
+			// Fairly weak. Dangerous in single combat but has little staying power. Always gets whittled down.
 			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/prince
 			spawncount = 1
+		if(3)
+			// Variable. Depends how many they infect.
+			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white
+			spawncount = 2
 		if(4)
-			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen
-			spawncount = 1
-		if(5)
+			// Pretty strong.
 			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/princess
 			spawncount = 2
+		if(5)
+			// Strongest, only used during highpop.
+			spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen
+			spawncount = 1
 	while(spawncount >= 1 && vents.len)
 		var/obj/machinery/atmospherics/unary/vent_pump/vent = pick(vents)
 
@@ -60,3 +70,6 @@
 			new spider_type(vent.loc)
 			spawncount--
 
+
+#undef TS_HIGHPOP_TRIGGER
+