From 46d5f255a2a0fd4925c29026ec3e280a4b64883e Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Wed, 26 Mar 2025 01:11:14 -0400 Subject: [PATCH] fix spray container interactions with tables (#28789) --- code/modules/reagents/reagent_containers/spray.dm | 2 +- .../attack_chain/test_attack_chain_reagent_containers.dm | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index a4fab92253d..d16799f11a4 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -30,7 +30,7 @@ . = TRUE if(isstorage(A) || ismodcontrol(A) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \ || istype(A, /obj/item/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics)) - return + return FALSE if(loc != user) return diff --git a/code/tests/attack_chain/test_attack_chain_reagent_containers.dm b/code/tests/attack_chain/test_attack_chain_reagent_containers.dm index 073a9822b59..0aac3d0bc0c 100644 --- a/code/tests/attack_chain/test_attack_chain_reagent_containers.dm +++ b/code/tests/attack_chain/test_attack_chain_reagent_containers.dm @@ -356,3 +356,10 @@ player.click_on(target) TEST_ASSERT_ANY_CHATLOG(player, "[player.puppet] drips something into [target.puppet]'s eyes") TEST_ASSERT_NOT_CHATLOG(player, "You cannot directly remove reagents from [target.puppet]") + +/datum/game_test/attack_chain_spray/Run() + var/datum/test_puppeteer/player = new(src) + var/obj/item/reagent_containers/spray/spray = player.spawn_obj_in_hand(/obj/item/reagent_containers/spray) + var/obj/structure/table = player.spawn_obj_nearby(/obj/structure/table) + player.click_on(table) + TEST_ASSERT(spray in get_turf(table), "spray bottle not placed on table")