Merge remote-tracking branch 'upstream/dev' into faxmachine

code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm

@@ -61,7 +61,6 @@ max volume of phoron storeable by the field = the total volume of a number of ti
 	idle_power_usage = 50
 	active_power_usage = 500	//multiplied by field strength
 	var/cached_power_avail = 0
-	directwired = 1
 	anchored = 0
 
 	var/state = 0
@@ -120,7 +119,6 @@ max volume of phoron storeable by the field = the total volume of a number of ti
 						state = 2
 						user << "You weld the [src] to the floor."
 						connect_to_network()
-						src.directwired = 1
 				else
 					user << "\red You need more welding fuel to complete this task."
 			if(2)
@@ -134,7 +132,6 @@ max volume of phoron storeable by the field = the total volume of a number of ti
 						state = 1
 						user << "You cut the [src] free from the floor."
 						disconnect_from_network()
-						src.directwired = 0
 				else
 					user << "\red You need more welding fuel to complete this task."
 		return

code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm

@@ -19,7 +19,6 @@
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 500
-	directwired = 0
 	var/remote_access_enabled = 1
 	var/cached_power_avail = 0
 	var/emergency_insert_ready = 0

code/WorkInProgress/autopsy.dm

@@ -170,9 +170,10 @@
 			usr.l_hand = P
 			P.layer = 20
 
-	if(istype(usr,/mob/living/carbon/human))
-		usr:update_inv_l_hand()
-		usr:update_inv_r_hand()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_l_hand()
+		M.update_inv_r_hand()
 
 /obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M as mob, mob/living/carbon/user as mob)
 	if(!istype(M))

code/WorkInProgress/computer3/computers/communications.dm

@@ -214,7 +214,7 @@
 					return
 				Syndicate_announce(input, usr)
 				usr << "Message transmitted."
-				log_say("[key_name(usr)] has made a Syndicate announcement: [input]")
+				log_say("[key_name(usr)] has made an illegal announcement: [input]")
 				centcomm_message_cooldown = 1
 				spawn(600)//10 minute cooldown
 					centcomm_message_cooldown = 0

code/WorkInProgress/computer3/computers/crew.dm

@@ -35,10 +35,7 @@
 					var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
 					var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
 
-					if(H.wear_id)
-						log += "<tr><td width='40%'>[H.wear_id.name]</td>"
-					else
-						log += "<tr><td width='40%'>Unknown</td>"
+					log += "<tr><td width='40%'>[H.get_id_name()]</td>"
 
 					switch(C.sensor_mode)
 						if(1)

code/WorkInProgress/computer3/computers/prisoner.dm

@@ -43,7 +43,7 @@
 				if(!T.implanted) continue
 				var/loc_display = "Unknown"
 				var/mob/living/carbon/M = T.imp_in
-				if(M.z == 1 && !istype(M.loc, /turf/space))
+				if(M.z in config.station_levels && !istype(M.loc, /turf/space))
 					var/turf/mob_loc = get_turf(M)
 					loc_display = mob_loc.loc
 				if(T.malfunction)

code/WorkInProgress/periodic_news.dm

@@ -149,7 +149,4 @@ proc/announce_newscaster_news(datum/news_announcement/news)
 	newMsg.body = news.message
 	newMsg.message_type = news.message_type
 
-	sendto.messages += newMsg
-
-	for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
-		NEWSCASTER.newsAlert(news.channel_name)
+	news_network.insert_message_in_channel(sendto, newMsg)