Merge branch 'master' into upstream-merge-29839

code/modules/mob/living/carbon/human/human.dm

@@ -643,6 +643,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	update_hair()
 
 /mob/living/carbon/human/singularity_pull(S, current_size)
+	..()
 	if(current_size >= STAGE_THREE)
 		for(var/obj/item/hand in held_items)
 			if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2)  && dropItemToGround(hand))
@@ -651,7 +652,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	rad_act(current_size * 3)
 	if(mob_negates_gravity())
 		return
-	..()
 
 /mob/living/carbon/human/proc/do_cpr(mob/living/carbon/C)
 	CHECK_DNA_AND_SPECIES(C)

code/modules/mob/living/living.dm

@@ -690,6 +690,7 @@
 						who.equip_to_slot(what, where, TRUE)
 
 /mob/living/singularity_pull(S, current_size)
+	..()
 	if(current_size >= STAGE_SIX)
 		throw_at(S,14,3, spin=1)
 	else

code/modules/mob/living/simple_animal/friendly/drone/verbs.dm

@@ -15,6 +15,10 @@
 /mob/living/simple_animal/drone/verb/toggle_light()
 	set category = "Drone"
 	set name = "Toggle drone light"
+	
+	if(stat == DEAD)
+		to_chat(src, "<span class='warning'>There's no light in your life... by that I mean you're dead.</span>")
+		return
 	if(light_on)
 		set_light(0)
 	else

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

@@ -24,11 +24,17 @@
 	butcher_results = list()
 	gold_core_spawnable = 2
 
+/mob/living/simple_animal/pet/penguin/emperor/shamebrero
+	name = "Shamebrero penguin."
+	desc = "Shameful of all he surveys."
+	icon_state = "penguin_shamebrero"
+	icon_living = "penguin_shamebrero"
+
 /mob/living/simple_animal/pet/penguin/baby
 	speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
 	name = "Penguin chick"
 	real_name = "penguin"
-	desc = "Can't fly and can barely waddles, but the prince of all chicks."
+	desc = "Can't fly and barely waddles, yet the prince of all chicks."
 	icon_state = "penguin_baby"
 	icon_living = "penguin_baby"
 	icon_dead = "penguin_baby_dead"

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

@@ -28,6 +28,9 @@
 	var/ranged_message = "fires" //Fluff text for ranged mobs
 	var/ranged_cooldown = 0 //What the current cooldown on ranged attacks is, generally world.time + ranged_cooldown_time
 	var/ranged_cooldown_time = 30 //How long, in deciseconds, the cooldown of ranged attacks is
+	var/ranged_telegraph = "prepares to fire at *TARGET*!" //A message shown when the mob prepares to fire; use *TARGET* if you want to show the target's name
+	var/ranged_telegraph_sound //A sound played when the mob prepares to fire
+	var/ranged_telegraph_time = 0 //In deciseconds, how long between the telegraph and ranged shot
 	var/ranged_ignores_vision = FALSE //if it'll fire ranged attacks even if it lacks vision on its target, only works with environment smash
 	var/check_friendly_fire = 0 // Should the ranged mob check for friendlies when shooting
 	var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
@@ -232,7 +235,14 @@
 		var/target_distance = get_dist(targets_from,target)
 		if(ranged) //We ranged? Shoot at em
 			if(!target.Adjacent(targets_from) && ranged_cooldown <= world.time) //But make sure they're not in range for a melee attack and our range attack is off cooldown
-				OpenFire(target)
+				if(!ranged_telegraph_time || client)
+					OpenFire(target)
+				else
+					if(ranged_telegraph)
+						visible_message("<span class='danger'>[src] [replacetext(ranged_telegraph, "*TARGET*", "[target]")]</span>")
+					if(ranged_telegraph_sound)
+						playsound(src, ranged_telegraph_sound, 75, FALSE)
+					addtimer(CALLBACK(src, .proc/OpenFire, target), ranged_telegraph_time)
 		if(!Process_Spacemove()) //Drifting
 			walk(src,0)
 			return 1

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

@@ -14,6 +14,9 @@
 	ranged = 1
 	ranged_message = "stares"
 	ranged_cooldown_time = 30
+	ranged_telegraph = "gathers energy and stares at *TARGET*!"
+	ranged_telegraph_sound = 'sound/magic/magic_missile.ogg'
+	ranged_telegraph_time = 7
 	throw_message = "does nothing against the hard shell of"
 	vision_range = 2
 	speed = 3
@@ -70,9 +73,11 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = "impales"
+	ranged_telegraph = "fixates on *TARGET* as its eye shines blue!"
+	ranged_telegraph_sound = 'sound/magic/tail_swing.ogg'
+	ranged_telegraph_time = 5
 	a_intent = INTENT_HARM
 	speak_emote = list("telepathically cries")
-	attack_sound = 'sound/weapons/bladeslice.ogg'
 	stat_attack = UNCONSCIOUS
 	movement_type = FLYING
 	robust_searching = 1

code/modules/mob/mob.dm

@@ -587,7 +587,7 @@
 			var/turf/T = get_turf(client.eye)
 			stat("Location:", COORD(T))
 			stat("CPU:", "[world.cpu]")
-			stat("Instances:", "[world.contents.len]")
+			stat("Instances:", "[num2text(world.contents.len, 10)]")
 			GLOB.stat_entry()
 			config.stat_entry()
 			stat(null)