From 6f07fd668a2dd7a6891024282313a76a564a7d4f Mon Sep 17 00:00:00 2001 From: TatsumakiMagi Date: Tue, 30 Oct 2018 23:21:57 +0000 Subject: [PATCH] Fixes adjacency issues with merch shop, arcade shop and give command --- code/game/machinery/computer/store.dm | 3 +++ code/modules/arcade/prize_datums.dm | 3 +++ code/modules/mob/living/carbon/give.dm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index bfa2820d9b3..f49d91c53b3 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -145,6 +145,9 @@ th.cost.toomuch {background:maroon;} var/itemID = text2num(href_list["buy"]) var/datum/storeitem/item = centcomm_store.items[itemID] var/sure = alert(usr,"Are you sure you wish to purchase [item.name] for $[item.cost]?","You sure?","Yes","No") in list("Yes","No") + if(!Adjacent(usr)) + to_chat(usr, "You are not close enough to do that.") + return if(sure=="No") updateUsrDialog() return diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index a2209a172ff..ef1512858d4 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -9,6 +9,9 @@ var/global/datum/prizes/global_prizes = new prizes += new itempath() /datum/prizes/proc/PlaceOrder(var/obj/machinery/prize_counter/prize_counter, var/itemID) + if(!prize_counter.Adjacent(usr)) + to_chat(usr, "You need to be closer!") + return if(!prize_counter) return 0 var/datum/prize_item/item = global_prizes.prizes[itemID] diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 55c4db791ac..473715367b4 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -29,7 +29,7 @@ if("Yes") if(!I) return - if(!Adjacent(usr)) + if(!Adjacent(target)) to_chat(usr, " You need to stay in reaching distance while giving an object.") to_chat(target, " [usr.name] moved too far away.") return