Merge remote-tracking branch 'upstream/master' into dev-freeze

code/modules/assembly/signaler.dm

@@ -169,4 +169,5 @@
 		set desc = "BOOOOM!"
 		deadman = 1
 		processing_objects.Add(src)
+		log_and_message_admins("is threatening to trigger a signaler deadman's switch")
 		usr.visible_message("\red [usr] moves their finger over [src]'s signal button...")

code/modules/events/viral_infection.dm

@@ -4,12 +4,12 @@ datum/event/viral_infection
 datum/event/viral_infection/setup()
 	announceWhen = rand(0, 3000)
 	endWhen = announceWhen + 1
-	
+
 	//generate 1-3 viruses. This way there's an upper limit on how many individual diseases need to be cured if many people are initially infected
 	var/num_diseases = rand(1,3)
 	for (var/i=0, i < num_diseases, i++)
 		var/datum/disease2/disease/D = new /datum/disease2/disease
-		
+
 		var/strength = 1 //whether the disease is of the greater or lesser variety
 		if (severity >= EVENT_LEVEL_MAJOR && prob(75))
 			strength = 2
@@ -24,7 +24,7 @@ datum/event/viral_infection/announce()
 		level = pick("one", "two", "three", "four")
 	else
 		level = "five"
-	
+
 	if (severity == EVENT_LEVEL_MAJOR || prob(60))
 		command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg')
 
@@ -33,8 +33,10 @@ datum/event/viral_infection/start()
 
 	var/list/candidates = list()	//list of candidate keys
 	for(var/mob/living/carbon/human/G in player_list)
-		if(G.client && G.stat != DEAD)
-			candidates += G
+		if(G.stat != DEAD && G.is_client_active(5))
+			var/turf/T = get_turf(G)
+			if(T.z in config.station_levels)
+				candidates += G
 	if(!candidates.len)	return
 	candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
 

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

@@ -65,7 +65,7 @@
 
 	if(speech_problem_flag)
 		if(!speaking || !(speaking.flags & NO_STUTTER))
-			var/list/handle_r = handle_speech_problems(message)
+			var/list/handle_r = handle_speech_problems(message, verb)
 			message = handle_r[1]
 			verb = handle_r[2]
 			speech_problem_flag = handle_r[3]
@@ -271,10 +271,9 @@
 
 	return verb
 
-/mob/living/carbon/human/proc/handle_speech_problems(var/message)
+/mob/living/carbon/human/proc/handle_speech_problems(var/message, var/verb = "says")
 
 	var/list/returns[3]
-	var/verb = "says"
 	var/handled = 0
 	if(silent || (sdisabilities & MUTE))
 		message = ""

code/modules/mob/living/living_defense.dm

@@ -52,6 +52,7 @@
 	if(istype(equipped(),/obj/item/device/assembly/signaler))
 		var/obj/item/device/assembly/signaler/signaler = equipped()
 		if(signaler.deadman && prob(80))
+			log_and_message_admins("has triggered a signaler deadman's switch")
 			src.visible_message("\red [src] triggers their deadman's switch!")
 			signaler.signal()
 

code/modules/mob/mob.dm

@@ -823,6 +823,8 @@ note dizziness decrements automatically in the mob's Life() proc.
 		else
 			statpanel(listed_turf.name, null, listed_turf)
 			for(var/atom/A in listed_turf)
+				if(!A.mouse_opacity)
+					continue
 				if(A.invisibility > see_invisible)
 					continue
 				if(is_type_in_list(A, shouldnt_see))

code/modules/mob/mob_helpers.dm

@@ -587,3 +587,7 @@ proc/is_blind(A)
 
 	eyeobj.setLoc(C)
 	return 1
+
+// Returns true if the mob has a client which has been active in the last given X minutes.
+/mob/proc/is_client_active(var/active = 1)
+	return client && client.inactivity < active MINUTES

code/modules/nano/modules/power_monitor.dm

@@ -54,5 +54,7 @@
 		return
 	if( href_list["clear"] )
 		active_sensor = null
+	if( href_list["refresh"] )
+		refresh_sensors()
 	else if( href_list["setsensor"] )
 		active_sensor = href_list["setsensor"]

code/modules/power/apc.dm

@@ -1272,10 +1272,12 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
 	equipment = 0
 	environ = 0
 	update()
+	update_icon()
 
 	spawn(600)
 		update_channels()
 		update()
+		update_icon()
 	..()
 
 /obj/machinery/power/apc/ex_act(severity)

code/modules/reagents/reagent_containers/food/cans.dm

@@ -173,8 +173,7 @@
 	center_of_mass = list("x"=16, "y"=10)
 	New()
 		..()
-		reagents.add_reagent("cola", 15)
-		reagents.add_reagent("orangejuice", 15)
+		reagents.add_reagent("brownstar", 30)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/space_up
 	name = "Space-Up"