TGS Test Merge (#7025)

code/_globalvars/misc.dm

@@ -135,3 +135,6 @@ GLOBAL_VAR(xeno_queue_candidate_count)
 GLOBAL_VAR(obfs_x)
 /// A number between -500 and 500.
 GLOBAL_VAR(obfs_y)
+
+/// The current amount of giant lizards that are alive.
+GLOBAL_VAR_INIT(giant_lizards_alive, 0)

code/game/objects/effects/landmarks/landmarks.dm

@@ -121,6 +121,8 @@
 	GLOB.monkey_spawns -= src
 	return ..()
 
+#define MAXIMUM_LIZARD_AMOUNT 5
+
 /obj/effect/landmark/lizard_spawn
 	name = "lizard spawn"
 	icon_state = "lizard_spawn"
@@ -129,6 +131,22 @@
 	. = ..()
 	if(prob(66))
 		new /mob/living/simple_animal/hostile/retaliate/giant_lizard(loc)
+		addtimer(CALLBACK(src, PROC_REF(latespawn_lizard)), rand(30 MINUTES, 45 MINUTES))
+
+/obj/effect/landmark/lizard_spawn/proc/latespawn_lizard()
+	//if there's already a ton of lizards alive, try again later
+	if(GLOB.giant_lizards_alive > MAXIMUM_LIZARD_AMOUNT)
+		addtimer(CALLBACK(src, PROC_REF(latespawn_lizard)), 10 MINUTES)
+		return
+	//if there's a living mob that can witness the spawn then try again later
+	for(var/mob/living/living_mob in range(7, src))
+		if(living_mob.stat != DEAD || living_mob.client)
+			continue
+		addtimer(CALLBACK(src, PROC_REF(latespawn_lizard)), 1 MINUTES)
+		return
+	new /mob/living/simple_animal/hostile/retaliate/giant_lizard(loc)
+
+#undef MAXIMUM_LIZARD_AMOUNT
 
 /obj/effect/landmark/latewhiskey
 	name = "Whiskey Outpost Late join"

code/modules/mob/death.dm

@@ -49,7 +49,7 @@
 		return 0
 
 	if(!gibbed)
-		visible_message("<b>\The [src.name]</b> [deathmessage]")
+		visible_message("<b>[src.name]</b> [deathmessage]")
 
 	if(cause_data && !istype(cause_data))
 		stack_trace("death called with string cause ([cause_data]) instead of datum")