diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index cee68ee330a..a436ab5dcd0 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -79,8 +79,8 @@ scanned_id = null get_user_id(user) else - var/turf/id_turf = get_turf(ID) - if(!id_turf.Adjacent(loc)) + var/turf/id_turf = get_turf(user) + if(id_turf && !id_turf.Adjacent(loc)) scanned_id = null get_user_id(user) interact(user) diff --git a/html/changelogs/fluffyghost-fixoreredemptionconsole.yml b/html/changelogs/fluffyghost-fixoreredemptionconsole.yml new file mode 100644 index 00000000000..4cb7189dace --- /dev/null +++ b/html/changelogs/fluffyghost-fixoreredemptionconsole.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed ore redemption console interaction with borgs, since their ID is in nullspace (0,0,0) it was runtiming on interaction."