From 30413d5def86ae51920bfe53c61b2d85a098665a Mon Sep 17 00:00:00 2001 From: Drulikar Date: Mon, 6 Nov 2023 08:57:57 -0800 Subject: [PATCH 1/2] Fix vending to a turf thats not adjacent to vendor --- code/game/machinery/vending/cm_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index c530da73d8e5..bd50f932f52d 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(!(user_dir in vend_dir_whitelist)) return turf var/turf/relative_turf = get_step(user, vend_dir) - if(relative_turf.Adjacent(src)) + if(relative_turf) return relative_turf return turf From c0041c8f604053114fb88a42b09e87b05fbaaff9 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Mon, 6 Nov 2023 13:44:45 -0800 Subject: [PATCH 2/2] Fira review --- code/game/machinery/vending/cm_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index bd50f932f52d..70ef402ae4e0 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(vend_dir_whitelist) var/user_dir = get_dir(loc, user) if(!(user_dir in vend_dir_whitelist)) - return turf + return get_turf(user) var/turf/relative_turf = get_step(user, vend_dir) if(relative_turf) return relative_turf