Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

code/modules/modular_computers/NTNet/NTNet_relay.dm

@@ -5,8 +5,7 @@
 	use_power = USE_POWER_ACTIVE
 	active_power_usage = 20000 //20kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational.
 	idle_power_usage = 100
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Add
-	icon_state = "ntnet" //VOREStation Edit
+	icon_state = "ntnet"
 	anchored = 1
 	density = 1
 	circuit = /obj/item/weapon/circuitboard/ntnet_relay
@@ -32,12 +31,10 @@
 	return 1
 
 /obj/machinery/ntnet_relay/update_icon()
-	//VOREStation Edit
 	if(operable())
 		icon_state = initial(icon_state)
 	else
 		icon_state = "[initial(icon_state)]_off"
-	//VOREStation Edit End
 
 /obj/machinery/ntnet_relay/process()
 	if(operable())

code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm

@@ -126,7 +126,7 @@
 	var/z = get_z(nano_host())
 	var/list/map_levels = using_map.get_map_levels(z)
 
-	for(var/obj/machinery/power/smes/buildable/SMES in machines)
+	for(var/obj/machinery/power/smes/buildable/SMES in GLOB.smeses)
 		if(!(SMES.z in map_levels))
 			continue
 		if(SMES.RCon_tag && (SMES.RCon_tag != "NO_TAG") && SMES.RCon)