From 093bae5dde03a514706326fe662a4105fa08feee Mon Sep 17 00:00:00 2001 From: MikeKuwait <141964539+MikeKuwait@users.noreply.github.com> Date: Sun, 27 Aug 2023 12:37:24 +0300 Subject: [PATCH] fix teleporting canister pouch to chemical dispenser (#4258) # About the pull request fixes #3262 # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: teleporting canister pouch to chemical dispenser /:cl: --- code/game/objects/items/storage/pouch.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 6397c33b76c1..b31dcc9900f1 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -906,6 +906,9 @@ update_icon() /obj/item/storage/pouch/pressurized_reagent_canister/afterattack(obj/target, mob/user, flag) //refuel at fueltanks & chem dispensers. + if(get_dist(user,target) > 1) + return ..() + if(!inner) to_chat(user, SPAN_WARNING("[src] has no internal container!")) return ..() @@ -925,8 +928,7 @@ if(!istype(target, /obj/structure/reagent_dispensers/fueltank)) return ..() - if(get_dist(user,target) > 1) - return ..() + var/obj/O = target if(!O.reagents || O.reagents.reagent_list.len < 1)