Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

code/_onclick/hud/map_popups.dm

@@ -1,30 +1,11 @@
-/client
-	/**
-	 * Assoc list with all the active maps - when a screen obj is added to
-	 * a map, it's put in here as well.
-	 *
-	 * Format: list(<mapname> = list(/obj/screen))
-	 */
-	var/list/screen_maps = list()
-
 /**
  * A screen object, which acts as a container for turfs and other things
  * you want to show on the map, which you usually attach to "vis_contents".
  */
-/obj/screen
-	/**
-	 * Map name assigned to this object.
-	 * Automatically set by /client/proc/add_obj_to_map.
-	 */
-	var/assigned_map
-	/**
-	 * Mark this object as garbage-collectible after you clean the map
-	 * it was registered on.
-	 *
-	 * This could probably be changed to be a proc, for conditional removal.
-	 * But for now, this works.
-	 */
-	var/del_on_map_removal = TRUE
+/obj/screen/map_view
+	// Map view has to be on the lowest plane to enable proper lighting
+	layer = GAME_PLANE
+	plane = GAME_PLANE
 
 /**
  * A generic background object.

code/_onclick/hud/radial.dm

@@ -318,4 +318,4 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	if(istype(custom_check))
 		if(!custom_check.Invoke())
 			return
-	return answer
+	return answer

code/_onclick/hud/screen_objects.dm

@@ -15,6 +15,19 @@
 	appearance_flags = APPEARANCE_UI
 	var/obj/master = null	//A reference to the object in the slot. Grabs or items, generally.
 	var/datum/hud/hud = null // A reference to the owner HUD, if any.
+	/**
+	 * Map name assigned to this object.
+	 * Automatically set by /client/proc/add_obj_to_map.
+	 */
+	var/assigned_map
+	/**
+	 * Mark this object as garbage-collectible after you clean the map
+	 * it was registered on.
+	 *
+	 * This could probably be changed to be a proc, for conditional removal.
+	 * But for now, this works.
+	 */
+	var/del_on_map_removal = TRUE
 
 /obj/screen/take_damage()
 	return