Skip to content

fixes minimap crash when traversing z level inside of an object #12911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cuberound wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −5
Open

fixes minimap crash when traversing z level inside of an object #12911

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7ff841
fixes munimap crash when traversing z level inside of an object
cuberound Aug 12, 2026
d9a02aa
this makes the tacmap update correctly
cuberound Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions code/controllers/subsystem/minimap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ SUBSYSTEM_DEF(minimaps)
/**
* Simple proc, updates overlay position on the map when a atom moves
*/
/image/proc/minimap_on_move(atom/movable/source, oldloc)
/image/proc/minimap_on_move(atom/movable/source, atom/oldloc)
SIGNAL_HANDLER
if(source.z)
var/datum/hud_displays/minimap = SSminimaps.minimaps_by_z["[source.z]"]
Expand All @@ -631,10 +631,11 @@ SUBSYSTEM_DEF(minimaps)
return

var/atom/movable/movable_loc = source.loc // How does none of this just crash if the loc isn't on map?
source.override_minimap_tracking()
var/datum/hud_displays/minimap = SSminimaps.minimaps_by_z["[movable_loc.z]"]
pixel_x = MINIMAP_PIXEL_FROM_WORLD(movable_loc.x) + minimap.x_offset
pixel_y = MINIMAP_PIXEL_FROM_WORLD(movable_loc.y) + minimap.y_offset
if(oldloc) //if we are not crossing z level inside of a an object
source.override_minimap_tracking()
var/datum/hud_displays/minimap = SSminimaps.minimaps_by_z["[movable_loc.z]"]
pixel_x = MINIMAP_PIXEL_FROM_WORLD(movable_loc.x) + minimap.x_offset
pixel_y = MINIMAP_PIXEL_FROM_WORLD(movable_loc.y) + minimap.y_offset

///Used to handle minimap tracking inside other movables
/atom/movable/proc/override_minimap_tracking()
Expand Down