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

# Conflicts:
#	paradise.dme

code/modules/modular_computers/file_system/programs/command/card.dm

@@ -137,7 +137,7 @@
 
 
 /datum/computer_file/program/card_mod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	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)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
 		assets.send(user)
@@ -255,7 +255,7 @@
 				playsound(computer.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
 				spawn(50)
 					printing = 0
-					nanomanager.update_uis(src)
+					SSnanoui.update_uis(src)
 					var/title
 					var/content
 					if(mode == 2)
@@ -326,7 +326,7 @@
 	if(modify)
 		modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
 
-	nanomanager.update_uis(src)
+	SSnanoui.update_uis(src)
 	return 1
 
 /datum/computer_file/program/card_mod/ui_data(mob/user)