Merge remote-tracking branch 'upstream/master' into night_shift

# Conflicts:
#	paradise.dme

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

@@ -295,7 +295,7 @@
 	medicalActive1 = null
 	medicalActive2 = null
 	medical_cannotfind = 0
-	nanomanager.update_uis(src)
+	SSnanoui.update_uis(src)
 	to_chat(usr, "<span class='notice'>You reset your record-viewing software.</span>")
 
 /mob/living/silicon/pai/cancel_camera()

code/modules/mob/living/silicon/pai/software.dm

@@ -41,7 +41,7 @@ var/global/list/default_pai_software = list()
 	if(ui_key != "main")
 		var/datum/pai_software/S = software[ui_key]
 		if(S && !S.toggle)
-			ui = nanomanager.try_update_ui(user, src, S.id, ui, force_open)
+			ui = SSnanoui.try_update_ui(user, src, S.id, ui, force_open)
 			if(!ui)
 				ui = new(user, src, S.id, S.template_file, S.ui_title, S.ui_width, S.ui_height, state = state)
 				ui.open()
@@ -52,7 +52,7 @@ var/global/list/default_pai_software = list()
 				ui.set_status(STATUS_CLOSE, 0)
 		return
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "pai_interface.tmpl", "pAI Software Interface", 450, 600, state = state)
 		ui.open()
@@ -132,4 +132,4 @@ var/global/list/default_pai_software = list()
 		var/img = text2num(href_list["image"])
 		if(1 <= img && img <= 9)
 			card.setEmotion(img)
-		return 1
+		return 1

code/modules/mob/logout.dm

@@ -1,5 +1,5 @@
 /mob/Logout()
-	nanomanager.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
+	SSnanoui.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
 	unset_machine()
 	player_list -= src
 	log_access("Logout: [key_name(src)]")