diff --git a/code/game/atoms/atom.dm b/code/game/atoms/atom.dm index 18d89a31e4c4..a89b2c238072 100644 --- a/code/game/atoms/atom.dm +++ b/code/game/atoms/atom.dm @@ -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) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 2f5492808a77..f18af53f72a9 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -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 /** @@ -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) @@ -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) @@ -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) diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index fc4f35c65317..6e834fede39d 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -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()