/obj/screen --> /atom/movable/screen

code/_onclick/hud/map_popups.dm

@@ -2,7 +2,7 @@
  * 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_view
+/atom/movable/screen/map_view
 	// Map view has to be on the lowest plane to enable proper lighting
 	layer = GAME_PLANE
 	plane = GAME_PLANE
@@ -12,7 +12,7 @@
  * It is also implicitly used to allocate a rectangle on the map, which will
  * be used for auto-scaling the map.
  */
-/obj/screen/background
+/atom/movable/screen/background
 	name = "background"
 	icon = 'icons/mob/map_backgrounds.dmi'
 	icon_state = "clear"
@@ -25,7 +25,7 @@
  *
  * If applicable, "assigned_map" has to be assigned before this proc call.
  */
-/obj/screen/proc/set_position(x, y, px = 0, py = 0)
+/atom/movable/screen/proc/set_position(x, y, px = 0, py = 0)
 	if(assigned_map)
 		screen_loc = "[assigned_map]:[x]:[px],[y]:[py]"
 	else
@@ -36,7 +36,7 @@
  *
  * If applicable, "assigned_map" has to be assigned before this proc call.
  */
-/obj/screen/proc/fill_rect(x1, y1, x2, y2)
+/atom/movable/screen/proc/fill_rect(x1, y1, x2, y2)
 	if(assigned_map)
 		screen_loc = "[assigned_map]:[x1],[y1] to [x2],[y2]"
 	else
@@ -68,7 +68,7 @@
 /client/proc/clear_map(map_name)
 	if(!map_name || !(map_name in screen_maps))
 		return FALSE
-	for(var/obj/screen/screen_obj in screen_maps[map_name])
+	for(var/atom/movable/screen/screen_obj in screen_maps[map_name])
 		screen_maps[map_name] -= screen_obj
 		if(screen_obj.del_on_map_removal)
 			qdel(screen_obj)
@@ -122,7 +122,7 @@
 	var/y_value = world.icon_size * tilesize * height
 	var/map_name = create_popup(popup_name, x_value, y_value)
 
-	var/obj/screen/background/background = new
+	var/atom/movable/screen/background/background = new
 	background.assigned_map = map_name
 	background.fill_rect(1, 1, width, height)
 	if(bg_icon)