Merge pull request #2172 from Markolie/zefixes

Various fixes

code/modules/awaymissions/zlevel.dm

@@ -41,11 +41,9 @@ proc/createRandomZlevel()
 		var/file = file(map)
 		if(isfile(file))
 			maploader.load_map(file)
-			// Initialize air for the away mission's turfs
 			if(air_master)
 				air_master.setup_allturfs(block(locate(1, 1, world.maxz), locate(world.maxx, world.maxy, world.maxz)))
-			create_lighting_overlays(world.maxz)
-			log_to_dd("away mission loaded: [map]")
+			log_to_dd("Away mission loaded: [map]")
 
 		for(var/obj/effect/landmark/L in landmarks_list)
 			if (L.name != "awaystart")

code/modules/mob/living/silicon/robot/robot.dm

@@ -729,20 +729,20 @@ var/list/robot_verbs_default = list(
 	else if(istype(W, /obj/item/borg/upgrade/))
 		var/obj/item/borg/upgrade/U = W
 		if(!opened)
-			usr << "You must access the borgs internals!"
+			user << "<span class='warning'>You must access the borgs internals!</span>"
 		else if(!src.module && U.require_module)
-			usr << "The borg must choose a module before he can be upgraded!"
+			user << "<span class='warning'>The borg must choose a module before it can be upgraded!</span>"
 		else if(U.locked)
-			usr << "The upgrade is locked and cannot be used yet!"
+			user << "<span class='warning'>The upgrade is locked and cannot be used yet!</span>"
 		else
+			if(!user.drop_item())
+				return
 			if(U.action(src))
-				usr << "You apply the upgrade to [src]!"
-				usr.drop_item()
-				U.loc = src
+				user << "<span class='notice'>You apply the upgrade to [src].</span>"
+				U.forceMove(src)
 			else
-				usr << "Upgrade error!"
-
-
+				user << "<span class='danger'>Upgrade error.</span>"
+	
 	else
 		spark_system.start()
 		return ..()

code/modules/nano/modules/power_monitor.dm

@@ -42,6 +42,7 @@
 	if(href_list["selectmonitor"])
 		if(issilicon(usr))
 			powermonitor = locate(href_list["selectmonitor"])
+			powermonitor.powernet = powermonitor.find_powernet() // Refresh the powernet of the monitor
 		return 1
 		
 	if(href_list["return"])