shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6389 from Citadel-Station-13/upstream-merge-36942

Browse Source 
[MIRROR] Fixes tile analyzer
This commit is contained in:
LetterJay
2018-04-14 07:39:35 -05:00
committed by GitHub
parent a01d37560c 73c3ac7d81
commit 47c2bfd13c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/subtypes/input.dm
+6 -7
View File
@@ -394,21 +394,20 @@
cooldown_per_use = 10
/obj/item/integrated_circuit/input/turfscan/do_work()
var/atom/movable/H = get_pin_data_as_type(IC_INPUT, 1, /atom)
var/turf/H = get_pin_data_as_type(IC_INPUT, 1, /turf)
var/turf/T = get_turf(src)
var/turf/E = get_turf(H)
if(!istype(H)) //Invalid input
return
if(H in view(T)) // This is a camera. It can't examine thngs,that it can't see.
var/list/cont = new()
if(E.contents.len)
for(var/i = 1 to E.contents.len)
var/atom/U = E.contents[i]
cont += WEAKREF(U)
for(var/obj/U in H)
cont += WEAKREF(U)
for(var/mob/U in H)
cont += WEAKREF(U)
set_pin_data(IC_OUTPUT, 1, cont)
var/list/St = new()
for(var/obj/effect/decal/cleanable/crayon/I in E.contents)
for(var/obj/effect/decal/cleanable/crayon/I in H)
St.Add(I.icon_state)
if(St.len)
set_pin_data(IC_OUTPUT, 2, jointext(St, ",", 1, 0))