Skip to content

Commit

Permalink
gps fix
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Nov 11, 2023
1 parent 5195b3f commit a547cae
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion code/game/atoms/atom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@
msg = lang.scramble(msg)
M.show_message(msg, 2, deaf_message, 1)
heard_to_floating_message += M
if(!no_runechat)
if(!no_runechat && ismovable(src))
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, animate_chat), (message ? message : deaf_message), null, FALSE, heard_to_floating_message, 30)

/atom/movable/proc/dropInto(var/atom/destination)
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/devices/gps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
hud_bound?.add_screen(hud_arrow)
hud_arrow.set_disabled(FALSE)
update_tracking()
START_PROCESSING(SSprocessing, src)
START_PROCESSING(SSfastprocess, src)
return TRUE

/**
Expand All @@ -224,7 +224,7 @@
tracking = null
// just kick it out
hud_arrow?.set_disabled(TRUE)
STOP_PROCESSING(SSprocessing, src)
STOP_PROCESSING(SSfastprocess, src)
return TRUE

/obj/item/gps/process(delta_time)
Expand All @@ -238,7 +238,7 @@
return
var/angle
var/valid = TRUE
var/curr_l_id = SSmapping.fluff_level_id(get_z(src))
var/curr_l_id = SSmapping.level_id(get_z(src))
var/turf/T = get_turf(src)
if(!T)
hud_arrow?.set_disabled(TRUE)
Expand All @@ -253,7 +253,7 @@
var/datum/component/gps_signal/sig = tracking
var/atom/A = sig.parent
var/turf/AT = get_turf(A)
if(SSmapping.fluff_level_id(get_z(A)) != curr_l_id)
if(SSmapping.level_id(get_z(A)) != curr_l_id)
valid = FALSE
else
angle = arctan(AT.x - T.x, AT.y - T.y)
Expand Down
4 changes: 0 additions & 4 deletions code/modules/multiz/movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,9 @@
else
to_chat(src, SPAN_WARNING("Gravity stops you from moving upward."))
return FALSE
var/old_z = get_z(src)
// todo: this should not use Move()
if(!Move(destination))
return FALSE
var/new_z = get_z(src)
if(old_z != new_z)
on_changed_z_level(old_z, new_z)
return TRUE

/mob/proc/can_overcome_gravity()
Expand Down

0 comments on commit a547cae

Please sign in to comment.