Skip to content

Commit

Permalink
Fix req ammo vendor not dispensing to the table (#4856)
Browse files Browse the repository at this point in the history
# About the pull request

This PR fixes #4852 caused by #4803 simply because the vendor is not
adjacent to the table it is supposed to vend to.

# Explain why it's good for the game

It was unintentional for this to change.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>



https://github.com/cmss13-devs/cmss13/assets/76988376/e56607a3-7641-4c91-b585-fddeefb97098

After changing from turf to get_turf(user) per Fira:



https://github.com/cmss13-devs/cmss13/assets/76988376/a7a55df4-531c-40ea-a8a3-9b28d550f656

</details>


# Changelog
:cl: Drathek
fix: Fix the ColMarTechAutomated Munition Vendor in req not vending to
the table.
/:cl:
  • Loading branch information
Drulikar authored Nov 7, 2023
1 parent d4efa52 commit 13621bf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/game/machinery/vending/cm_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ 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.Adjacent(src))
if(relative_turf)
return relative_turf
return turf

Expand Down

0 comments on commit 13621bf

Please sign in to comment.