Merge pull request #6006 from VOREStation/upstream-merge-6469

[MIRROR] Fixes runtime cascade on advanced locator circuit
This commit is contained in:
Novacat
2019-10-01 02:50:54 -04:00
committed by GitHub
@@ -308,11 +308,12 @@
var/list/valid_things = list()
if(isweakref(I.data))
var/atom/A = I.data.resolve()
var/desired_type = A.type
if(desired_type)
for(var/atom/thing in nearby_things)
if(thing.type == desired_type)
valid_things.Add(thing)
if(A)
var/desired_type = A.type
if(desired_type)
for(var/atom/thing in nearby_things)
if(thing.type == desired_type)
valid_things.Add(thing)
else if(istext(I.data))
var/DT = I.data
for(var/atom/thing in nearby_things)