From c60bceba41a9721bf3fda1a21e21ddc69aba40ab Mon Sep 17 00:00:00 2001 From: Kylerace Date: Thu, 15 Jul 2021 19:54:20 -0700 Subject: [PATCH] fixes hyperspace connect_loc_behalf bug (#60231) turns out my move_stacks var doesnt work asynchronously since this bug made things with connect_loc_behalf runtime on every movement unless you somehow moved it back to the transit turf and off without it doing the runtime special. (The sleep and hell the whole bit of code in space/Entered was unneeded, since it just happens normally as a part of move. Life is pain) -Lemon also does misc code improvements i found while investigating ANOTHER c_l_b bug with stacks i found while testing this one, which i did NOT manage to fix unfortunately --- code/datums/components/slippery.dm | 5 +++-- code/datums/materials/_material.dm | 2 +- code/game/turfs/open/space/space.dm | 5 ----- code/game/turfs/open/space/transit.dm | 1 - code/modules/mob/inventory.dm | 2 +- code/modules/mob/living/carbon/carbon_update_icons.dm | 5 ++--- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 27ef90ceca8..32443d63d90 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -96,8 +96,9 @@ SIGNAL_HANDLER UnregisterSignal(user, COMSIG_PARENT_PREQDELETED) - RemoveElement(/datum/element/connect_loc_behalf, holder, holder_connections) - holder = null + if(holder) + RemoveElement(/datum/element/connect_loc_behalf, holder, holder_connections) + holder = null /* * The slip proc, but for equipped items. diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm index 690fe3224a4..8d8605202f1 100644 --- a/code/datums/materials/_material.dm +++ b/code/datums/materials/_material.dm @@ -89,7 +89,7 @@ Simple datum which is instanced once per type and is used for every object of sa if(istype(source, /obj)) //objs on_applied_obj(source, amount, material_flags) - if(istype(source, /turf)) //turfs + else if(istype(source, /turf)) //turfs on_applied_turf(source, amount, material_flags) source.mat_update_desc(src) diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index 4b965b29f60..2c0b6de19d4 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -198,11 +198,6 @@ puller = pulling pulling = next_pulling - //now we're on the new z_level, proceed the space drifting - stoplag()//Let a diagonal move finish, if necessary - arrived.newtonian_move(arrived.inertia_dir) - arrived.inertia_moving = TRUE - /turf/open/space/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return diff --git a/code/game/turfs/open/space/transit.dm b/code/game/turfs/open/space/transit.dm index cbe7377d9a3..2c631350795 100644 --- a/code/game/turfs/open/space/transit.dm +++ b/code/game/turfs/open/space/transit.dm @@ -32,7 +32,6 @@ throw_atom(arrived) /turf/open/space/transit/proc/throw_atom(atom/movable/AM) - set waitfor = FALSE if(!AM || istype(AM, /obj/docking_port) || istype(AM, /obj/effect/abstract)) return if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement. diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index f16fb82eb6a..c4ea5ddd4f4 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -158,7 +158,7 @@ if(isturf(I.loc) && !ignore_anim) I.do_pickup_animation(src) - if(get_item_for_held_index(hand_index) != null) + if(get_item_for_held_index(hand_index)) dropItemToGround(get_item_for_held_index(hand_index), force = TRUE) I.forceMove(src) held_items[hand_index] = I diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index bd9787203d6..6c95b8de6a4 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -57,9 +57,8 @@ if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) I.screen_loc = ui_hand_position(get_held_index_of_item(I)) client.screen += I - if(observers?.len) - for(var/M in observers) - var/mob/dead/observe = M + if(length(observers)) + for(var/mob/dead/observe as anything in observers) if(observe.client && observe.client.eye == src) observe.client.screen += I else