From 065413cb7051201cd7fcc1e34016532e126ac90a Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Wed, 7 Sep 2016 19:18:06 -0700 Subject: [PATCH] Removes rogue icon file Fixes issues with silicons trying to use tablets Fixes ghosts not being able to view programs --- .../modular_computers/computers/item/computer.dm | 3 +++ .../modular_computers/computers/status_icons.dmi | Bin 818 -> 0 bytes code/modules/tgui/states.dm | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 code/modules/modular_computers/computers/status_icons.dmi diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index ecfbb77e79a..516293bfc27 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -148,6 +148,9 @@ return attack_self(M) return +/obj/item/device/modular_computer/attack_ai(mob/user) + return attack_self(user) + /obj/item/device/modular_computer/attack_ghost(mob/dead/observer/user) if(enabled) ui_interact(user) diff --git a/code/modules/modular_computers/computers/status_icons.dmi b/code/modules/modular_computers/computers/status_icons.dmi deleted file mode 100644 index 52127ec484268b00240fbde8364073fadaa39b92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 818 zcmV-21I_%2P)vOM0000OP)t-sz`(!& zJOBXy0RR60{{R3y002BZ0KmY&jE4BJ00001bW%=J06^y0W&i*HdU{k?bVOxyV{&P5 zbZKvH004NLQ&w0eu$DM)Bz1|bJL-!NX?I*#`0DBdr zzW*a!zMMEEK#~FnI*e3NtH1o?_=5_7S2ghwS&io+ZI877IX%~3pX>R9o1YpO6EG%Ve8V?@Q>of5 zDUy4^*PCE>wlUt*^G+rJT79Xqt`!I_yf3RZ{660kU5B>PQdyHnUV#%bB@BjNoM z!JZ=zLRdYBwCi$MAR^SlDybpjVwgvK2l#BNZUWngD`ATgoY@#jIJYH} zaK0^q!Gt7Q^Ld8BJq0uOsY!WudP<+E!Q7`NCHYqFe&4mSuu4GoG;H8wK9AQ$b zBQzPxwoU9B7H*WdoN{1`xh3Re;KA%U2R5AB{G_(4VcBQG8g#;-HVg)q0p^pEEcg^j zjiyKo_k)M|qzuyDw?AwlhWUZ^x<67Y7}isfT9dMFR7JePI(zVk!UKVZy!s>xte~ij{RoVBIFH zvY9ZVFIU!brhF=*H-T!nLfEZ<3yxjEmBRMGI;4yhshU)Ykg*c$Y>}vI`NqSqQcbD| wsW~wZ*QAQzs#Jyd=yH|@TXk_7d+6)rFFs{kYNr;VkN^Mx07*qoM6N<$g8D9fdH?_b diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index ee21dfd1206..50b73da7bc2 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -26,7 +26,7 @@ . = max(., UI_INTERACTIVE) // Regular ghosts can always at least view if in range. - if(get_dist(src_object, src) < user.client.view) + if(get_dist(src_object, user) < user.client.view) . = max(., UI_UPDATE) // Check if the state allows interaction