Give_to improvement

cmss13-devs · Jun 28, 2023 · 96c03d2 · 96c03d2
1 parent f7d30c9
commit 96c03d2
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
@@ -395,18 +395,24 @@ SUBSYSTEM_DEF(minimaps)
 		owner.client.screen += map
 	minimap_displayed = !minimap_displayed
 
-/datum/action/minimap/give_to(mob/M)
+/datum/action/minimap/give_to(mob/target)
 	. = ..()
 
 	if(default_overwatch_level)
 		map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags)
 	else
-		RegisterSignal(M, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change))
-	if(!SSminimaps.minimaps_by_z["[M.z]"] || !SSminimaps.minimaps_by_z["[M.z]"].hud_image)
+		RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change))
+
+	var/turf/turf_gotten = get_turf(target)
+	if(!turf_gotten)
+		return
+	var/z_level = turf_gotten.z
+
+	if(!SSminimaps.minimaps_by_z["[z_level]"] || !SSminimaps.minimaps_by_z["[z_level]"].hud_image)
 		return
-	map = SSminimaps.fetch_minimap_object(M.z, minimap_flags)
+	map = SSminimaps.fetch_minimap_object(z_level, minimap_flags)
 
-/datum/action/minimap/remove_from(mob/M)
+/datum/action/minimap/remove_from(mob/target)
 	. = ..()
 	if(minimap_displayed)
 		owner?.client?.screen -= map