Merge remote-tracking branch 'upstream/pr/5689' into dev

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm

code/modules/admin/admin_verbs.dm

@@ -127,7 +127,8 @@ var/list/admin_verbs_server = list(
 	/datum/admins/proc/toggle_aliens,
 	/datum/admins/proc/toggle_space_ninja,
 	/client/proc/toggle_random_events,
-	/client/proc/check_customitem_activity
+	/client/proc/check_customitem_activity,
+	/client/proc/nanomapgen_DumpImage
 	)
 var/list/admin_verbs_debug = list(
         /client/proc/getruntimelog,                     /*allows us to access runtime logs to somebody*/

code/modules/nano/nanomapgen.dm

@@ -0,0 +1,90 @@
+// This file is a modified version of https://raw2.github.com/Baystation12/OldCode-BS12/master/code/TakePicture.dm
+
+#define NANOMAP_ICON_SIZE 4
+#define NANOMAP_MAX_ICON_DIMENSION 1024
+
+#define NANOMAP_TILES_PER_IMAGE (NANOMAP_MAX_ICON_DIMENSION / NANOMAP_ICON_SIZE)
+
+#define NANOMAP_TERMINALERR 5
+#define NANOMAP_INPROGRESS 2
+#define NANOMAP_BADOUTPUT 2
+#define NANOMAP_SUCCESS 1
+#define NANOMAP_WATCHDOGSUCCESS 4
+#define NANOMAP_WATCHDOGTERMINATE 3
+
+
+//Call these procs to dump your world to a series of image files (!!)
+//NOTE: Does not explicitly support non 32x32 icons or stuff with large pixel_* values, so don't blame me if it doesn't work perfectly
+
+/client/proc/nanomapgen_DumpImage()
+	set name = "Generate NanoUI Map"
+	set category = "Server"
+	
+	if(holder)
+		nanomapgen_DumpTile(1, 1, text2num(input(usr,"Enter the Z level to generate")))	
+
+/client/proc/nanomapgen_DumpTile(var/startX = 1, var/startY = 1, var/currentZ = 1, var/endX = -1, var/endY = -1)
+
+	if (endX < 0 || endX > world.maxx)
+		endX = world.maxx
+		
+	if (endY < 0 || endY > world.maxy)
+		endY = world.maxy
+		
+	if (currentZ < 0 || currentZ > world.maxz)
+		usr << "NanoMapGen: <B>ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]</B>"
+		
+		sleep(3)
+		return NANOMAP_TERMINALERR
+		
+	if (startX > endX)
+		usr << "NanoMapGen: <B>ERROR: startX ([startX]) cannot be greater than endX ([endX])</B>"
+		
+		sleep(3)
+		return NANOMAP_TERMINALERR
+		
+	if (startY > endX)
+		usr << "NanoMapGen: <B>ERROR: startY ([startY]) cannot be greater than endY ([endY])</B>"
+		sleep(3)
+		return NANOMAP_TERMINALERR
+		
+	var/icon/Tile = icon(file("nano/mapbase1024.png"))
+	if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
+		world.log << "NanoMapGen: <B>ERROR: BASE IMAGE DIMENSIONS ARE NOT [NANOMAP_MAX_ICON_DIMENSION]x[NANOMAP_MAX_ICON_DIMENSION]</B>"
+		sleep(3)
+		return NANOMAP_TERMINALERR
+		
+	world.log << "NanoMapGen: <B>GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])</B>"	
+	usr << "NanoMapGen: <B>GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])</B>"
+
+	var/count = 0;
+	for(var/WorldX = startX, WorldX <= endX, WorldX++)
+		for(var/WorldY = startY, WorldY <= endY, WorldY++)
+
+			var/atom/Turf = locate(WorldX, WorldY, currentZ)
+			
+			var/icon/TurfIcon = new(Turf.icon, Turf.icon_state)
+			TurfIcon.Scale(NANOMAP_ICON_SIZE, NANOMAP_ICON_SIZE)
+			
+			Tile.Blend(TurfIcon, ICON_OVERLAY, ((WorldX - 1) * NANOMAP_ICON_SIZE), ((WorldY - 1) * NANOMAP_ICON_SIZE))
+			
+			count++
+			
+			if (count % 8000 == 0)
+				world.log << "NanoMapGen: <B>[count] tiles done</B>"
+				sleep(1)
+				
+	var/mapFilename = "nanomap_z[currentZ]-new.png"
+	
+	world.log << "NanoMapGen: <B>sending [mapFilename] to client</B>"
+
+	usr << browse(Tile, "window=picture;file=[mapFilename];display=0")
+	
+	world.log << "NanoMapGen: <B>Done.</B>"
+	
+	usr << "NanoMapGen: <B>Done. File [mapFilename] uploaded to your cache.</B>"
+
+	if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
+		return NANOMAP_BADOUTPUT
+
+	return NANOMAP_SUCCESS

code/modules/nano/nanoui.dm

@@ -40,8 +40,16 @@ nanoui is used to open and update nano browser uis
 	var/templates[0]
 	// the layout key for this ui (this is used on the frontend, leave it as "default" unless you know what you're doing)
 	var/layout_key = "default"
+	// this sets whether to re-render the ui layout with each update (default 0, turning on will break the map ui if it's in use)
+	var/auto_update_layout = 0
+	// this sets whether to re-render the ui content with each update (default 1)
+	var/auto_update_content = 1
 	// the default state to use for this ui (this is used on the frontend, leave it as "default" unless you know what you're doing)
 	var/state_key = "default"
+	// show the map ui, this is used by the default layout
+	var/show_map = 0
+	// the map z level to display
+	var/map_z_level = 1
 	// initial data, containing the full data structure, must be sent to the ui (the data structure cannot be extended later on)
 	var/list/initial_data[0]
 	// set to 1 to update the ui automatically every master_controller tick
@@ -166,8 +174,8 @@ nanoui is used to open and update nano browser uis
   *
   * @return nothing
   */
-/datum/nanoui/proc/set_auto_update(state = 1)
-	is_auto_updating = state
+/datum/nanoui/proc/set_auto_update(nstate = 1)
+	is_auto_updating = nstate
 
  /**
   * Set the initial data for the ui. This is vital as the data structure set here cannot be changed when pushing new updates.
@@ -190,6 +198,10 @@ nanoui is used to open and update nano browser uis
 			"srcObject" = list("name" = src_object.name),
 			"stateKey" = state_key,
 			"status" = status,
+			"autoUpdateLayout" = auto_update_layout,
+			"autoUpdateContent" = auto_update_content,
+			"showMap" = show_map,
+			"mapZLevel" = map_z_level,
 			"user" = list("name" = user.name)
 		)	
 	return config_data
@@ -269,6 +281,26 @@ nanoui is used to open and update nano browser uis
   */
 /datum/nanoui/proc/set_layout_key(nlayout_key)
 	layout_key = lowertext(nlayout_key)
+
+ /**
+  * Set the ui to update the layout (re-render it) on each update, turning this on will break the map ui (if it's being used)
+  *
+  * @param state int (bool) Set update to 1 or 0 (true/false) (default 0)
+  *
+  * @return nothing
+  */
+/datum/nanoui/proc/set_auto_update_layout(nstate)
+	auto_update_layout = nstate
+
+ /**
+  * Set the ui to update the main content (re-render it) on each update
+  *
+  * @param state int (bool) Set update to 1 or 0 (true/false) (default 1)
+  *
+  * @return nothing
+  */
+/datum/nanoui/proc/set_auto_update_content(nstate)
+	auto_update_content = nstate
 	
  /**
   * Set the state key for use in the frontend Javascript
@@ -278,7 +310,27 @@ nanoui is used to open and update nano browser uis
   * @return nothing
   */
 /datum/nanoui/proc/set_state_key(nstate_key)
-	state_key = nstate_key
+	state_key = nstate_key 
+	
+ /**
+  * Toggle showing the map ui
+  *
+  * @param nstate_key boolean 1 to show map, 0 to hide (default is 0)
+  *
+  * @return nothing
+  */
+/datum/nanoui/proc/set_show_map(nstate)
+	show_map = nstate
+	
+ /**
+  * Toggle showing the map ui
+  *
+  * @param nstate_key boolean 1 to show map, 0 to hide (default is 0)
+  *
+  * @return nothing
+  */
+/datum/nanoui/proc/set_map_z_level(nz)
+	map_z_level = nz
 
  /**
   * Set whether or not to use the "old" on close logic (mainly unset_machine())
@@ -416,8 +468,18 @@ nanoui is used to open and update nano browser uis
 	update_status(0) // update the status
 	if (status != STATUS_INTERACTIVE || user != usr) // If UI is not interactive or usr calling Topic is not the UI user
 		return
+	
+	// This is used to toggle the nano map ui
+	var/map_update = 0
+	if(href_list["showMap"])
+		set_show_map(text2num(href_list["showMap"]))
+		map_update = 1
+		
+	if(href_list["mapZLevel"])
+		set_map_z_level(text2num(href_list["mapZLevel"]))
+		map_update = 1
 
-	if (src_object && src_object.Topic(href, href_list))
+	if ((src_object && src_object.Topic(href, href_list)) || map_update)
 		nanomanager.update_uis(src_object) // update all UIs attached to src_object
 
  /**