mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-13 10:23:15 +00:00
e25784537d
* Fixes checking a person's inventory requiring a do_after and causing a buckle notification. (#56153) `/atom/movable/proc/mouse_buckle_handling(mob/living/M, mob/living/user)` has functionality that is too generic for `/mob/living/carbon/human/` `/mob/living/carbon/human/MouseDrop_T(mob/living/target, mob/living/user)` contains code that is better suited for `mouse_buckle_handling()` `/mob/living/carbon/human/MouseDrop_T()` results in a call stack that calls the generic `/atom/movable/proc/mouse_buckle_handling()` when the prerequisites for piggybacking or fireman carrying are not satisfied. But this makes no sense and means that when the game state is such that you should be inspecting the inventory, the game state is ALSO such that you are attempting to erroneously buckle a player to yourself. In addition, `MouseDrop_T()` should really not be holding mouse buckling logic in this scenario. As a result, this proc override has been removed from /living/carbon/human entirely. All functionality has been shifted into an overriden `mouse_buckle_handling()` at the /living/carbon/human level. Piggybacking and fireman carrying now actually return a value on success. Finally, if we have successfully handled the MouseDrop_T event through a parent proc call chain, we no longer go on to show the mob's inventory. All these tweaks combined mean that you can now click-drag to view inventories without a do_after and without attempting buckling, /mob/living/carbon/human buckling logic is now appropriately in `mouse_buckle_handling()` and no longer falls through to generic buckling checks, which is not relevant when trying to air quotes "buckle" a mob to a /mob/living/carbon/human. Successfully buckling a player to yourself (in this scenario through fireman carrying) no longer opens the inventory window. I have tested the following behaviours and they work as intended. - [x] Piggybacking - [x] Fireman carrying - [x] Inspecting inventory of /mob/living/carbon/human - [x] Inspecting inventory of /mob/living/simple_animal/pet/dog/corgi/ian - [x] Buckling /mob/living/carbon/human to a chair. - [x] Buckling /mob/living/simple_animal/pet/dog/corgi/ian to a dog bed. * Fixes checking a person's inventory requiring a do_after and causing a buckle notification. Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>