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

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

code/game/objects/items/devices/radio/radio.dm

@@ -242,7 +242,6 @@ var/global/list/default_medbay_channels = list(
 	var/datum/radio_frequency/connection = null
 	if(channel && channels && channels.len > 0)
 		if(channel == "department")
-//			to_chat(world, "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"")
 			channel = channels[1]
 		connection = secure_radio_connections[channel]
 	else
@@ -259,9 +258,8 @@ var/global/list/default_medbay_channels = list(
 	Broadcast_Message(connection, A,
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",
-						4, 0, zlevel, connection.frequency, follow_target=follow_target)
+						4, 0, zlevel, connection.frequency, follow_target = follow_target)
 	qdel(A)
-	return
 
 // Just a dummy mob used for making announcements, so we don't create AIs to do this
 // I'm not sure who thought that was a good idea. -- Crazylemon
@@ -403,6 +401,7 @@ var/global/list/default_medbay_channels = list(
 		  // Identity-associated tags:
 			"mob" = M, // store a reference to the mob
 			"mobtype" = M.type, 	// the mob's type
+			"race" = signal.get_race(M),
 			"realname" = real_name, // the mob's real name
 			"name" = displayname,	// the mob's display name
 			"job" = jobname,		// the mob's job
@@ -464,6 +463,7 @@ var/global/list/default_medbay_channels = list(
 
 		"mob" = M, // store a reference to the mob
 		"mobtype" = M.type, 	// the mob's type
+		"race" = signal.get_race(M), // text to show next to mob in comms log console
 		"realname" = real_name, // the mob's real name
 		"name" = displayname,	// the mob's display name
 		"job" = jobname,		// the mob's job
@@ -562,7 +562,7 @@ var/global/list/default_medbay_channels = list(
 	var/range = receive_range(freq, level)
 	if(range > -1)
 		return get_mobs_in_view(canhear_range, src)
-		
+
 /obj/item/device/radio/proc/is_listening()
 	var/is_listening = TRUE
 	if(!on)
@@ -573,11 +573,11 @@ var/global/list/default_medbay_channels = list(
 		is_listening = FALSE
 
 	return is_listening
-		
+
 /obj/item/device/radio/proc/send_announcement()
 	if(is_listening())
 		return get_mobs_in_view(canhear_range, src)
-		
+
 	return null
 
 /obj/item/device/radio/examine(mob/user, var/distance = -1)

code/game/objects/items/weapons/extinguisher.dm

@@ -80,8 +80,7 @@
 	//TODO; Add support for reagents in water.
 	if(target.loc == user)//No more spraying yourself when putting your extinguisher away
 		return
-	var/Refill = AttemptRefill(target, user)
-	if(Refill)
+	if(AttemptRefill(target, user))
 		return
 	if(!safety)
 		if(src.reagents.total_volume < 1)
@@ -164,4 +163,4 @@
 					if(W.loc == my_target) break
 					sleep(2)
 	else
-		return ..()
+		return ..()

code/game/objects/items/weapons/implants/implant_death_alarm.dm

@@ -3,6 +3,7 @@
 	desc = "An alarm which monitors host vital signs and transmits a radio message upon death."
 	var/mobname = "Will Robinson"
 	activated = 0
+	var/static/list/stealth_areas = typecacheof(list(/area/syndicate_station, /area/syndicate_mothership, /area/shuttle/syndicate_elite))
 
 /obj/item/weapon/implant/death_alarm/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>
@@ -33,26 +34,26 @@
 /obj/item/weapon/implant/death_alarm/activate(var/cause)
 	var/mob/M = imp_in
 	var/area/t = get_area(M)
+
+	var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+	a.follow_target = M
+
 	switch(cause)
 		if("death")
-			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
-			if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
+			if(is_type_in_typecache(t, stealth_areas))
 				//give the syndies a bit of stealth
 				a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm")
 			else
 				a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
-			qdel(a)
 			qdel(src)
 		if("emp")
-			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			var/name = prob(50) ? t.name : pick(teleportlocs)
 			a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
-			qdel(a)
 		else
-			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
-			qdel(a)
 			qdel(src)
+			
+	qdel(a)
 
 /obj/item/weapon/implant/death_alarm/emp_act(severity)			//for some reason alarms stop going off in case they are emp'd, even without this
 	activate("emp")	//let's shout that this dude is dead

code/game/objects/items/weapons/tanks/tanks.dm

@@ -45,7 +45,7 @@
 /obj/item/weapon/tank/ui_action_click(mob/user)
 	toggle_internals(user)
 
-/obj/item/weapon/tank/proc/toggle_internals(mob/user)
+/obj/item/weapon/tank/proc/toggle_internals(mob/user, silent = FALSE)
 	var/mob/living/carbon/C = user
 	if(!istype(C))
 		return 0
@@ -65,13 +65,16 @@
 
 		if(can_open_valve)
 			if(C.internal)
-				to_chat(C, "<span class='notice'>You switch your internals to [src].</span>")
+				if(!silent)
+					to_chat(C, "<span class='notice'>You switch your internals to [src].</span>")
 			else
-				to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
+				if(!silent)
+					to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
 			C.internal = src
 			C.update_internals_hud_icon(1)
 		else
-			to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")
+			if(!silent)
+				to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")
 			return 0
 
 	C.update_action_buttons_icon()