From ad576eb0c5b3c6b83353388d39cbf47407a4fb4c Mon Sep 17 00:00:00 2001
From: ChilbroBaggins <107660393+ChilbroBaggins@users.noreply.github.com>
Date: Sat, 28 Jan 2023 19:58:06 -0600
Subject: [PATCH] Fixes telescreen sprites (#13779)

Co-authored-by: Jeff <velcroboy333@hotmail.com>
---
 .../Wallmounts/monitors_televisions.yml         |   2 +-
 .../Recipes/Construction/utilities.yml          |   3 ++-
 .../Structures/Machines/computers.rsi/meta.json |   4 ++++
 .../Machines/computers.rsi/telescreen.png       | Bin 723 -> 630 bytes
 .../Machines/computers.rsi/telescreen_frame.png | Bin 0 -> 1356 bytes
 5 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/telescreen_frame.png

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
index ff835bb67e..a953371a5f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
@@ -42,7 +42,7 @@
     sprite: Structures/Machines/computers.rsi
     layers:
       - map: ["computerLayerBody"]
-        state: television
+        state: telescreen_frame
       - map: ["computerLayerScreen"]
         state: telescreen
   - type: Fixtures
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 7ecbcaaed1..2209fab79e 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -23,9 +23,10 @@
   description: "A surveillance camera monitor for the wall."
   icon:
     sprite: Structures/Machines/computers.rsi
-    state: telescreen
+    state: telescreen_frame
   objectType: Structure
   placementMode: SnapgridCenter
+  canBuildInImpassable: true
 
 # POWER
 - type: construction
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index dca1a0bc1a..2fb8dcee28 100644
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -1606,6 +1606,10 @@
       "name": "telescreen",
       "directions": 4
     },
+    {
+      "name": "telescreen_frame",
+      "directions": 4
+    },
     {
       "name": "telescreen_broken",
       "directions": 4
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/telescreen.png b/Resources/Textures/Structures/Machines/computers.rsi/telescreen.png
index 6659b1736adae5b9dadb30da6b01643d2fc7af81..dd0312de333a8765db4ad59dd1b28926e04a4b5e 100644
GIT binary patch
delta 616
zcmV-u0+;>M1@;7x8Gi-<0063Kaozv`0zFAYK~#8N?V7QU0zn9d*UlIp&C<f!2eY=Y
z^wEs5(_n5c8?z(dC~R1ltFD+Z@bQC_g+({>zs1bs?-D>NVCDp}1ZFOPY=T(=SptB-
z;c&Q@W2@Eb`R{tY?ryhRw_Gl}%jMEtuh)M|{WF`*CbY_sbAJUuYw!YSyWOHYKptF<
zAm;?YC&7z4enJ7q<MCMnRQCPS*zI-*vP*h_QRJKe_#}9_|62g0|HwVBJxKf|>O%m|
z=kuL3y#ATu)PBE5chr)l^`BbswErOIPN&md>-Iyzi*ptLYW?S3@U;IR0HT0*KXtX>
zEdbQ|j~2Z6OMl7_0RX+k?Z{C7A;HuB6CS{8|DnN4QzYdV9zehUv;<GfFFb(Ke_Dh8
z831n0<<D?<1tb7x0;vFJz~RlO0>Y=r*}+tRGvM&%Qvu;q<m_N7z!`9O^QnOFDROo&
z72pgwy!liBO_BC-l6-)qca3=tD?s}^JvIQVgfsz=%zwPj2+POHu>n{m1Os?CBBw(L
zOKBH>zD-CI012Qrrz2x1YXHTcAqdo;W&kw^WEAZIpa#JlfYe-V4~UMUEddPq(^mpb
z2v&eLA*L5vK`2w>p~Z-ngkS*LjsTUM6##8yMiYVoXj>v<1JH)1)E^8$+Y=i59T4Ur
zRBCW+0AZmXLUb9ys{X}}wmL%-f=fW#)}l3M1;OfN+6*AtL+IO=DF$GbIV(Hb0;T!S
zpq1m%>`YbxRv;6A70IdENd-(bb5?$*0<1_*)y@Mw*Jxif+qzu<0000<MNUMnLSTYZ
CG9h9B

delta 710
zcmV;%0y+Km1k(kO8Gi!+005o0f$RVP069=hR7JqRz!n-OA|fU%EHE@QI9gg^JV8iE
zNKa5uR&Q^4czA`Lo}Q?vsI;`StgNib$;(1QNZH)qfB*mnHAOi90004WQchC<K<3zH
z0001QdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OMfjY&dkqKuvIY8GvMMZ
z&rB)F0CJ3txHvOXGt)ClAe`co#FA7XQ>i31C$%`aC^a=tiHkEOv#1!PlZ!L0C^0t`
z#5UwoR&e!m0h<i~;6NNW|G95c0005aNkl<ZScUDE-ExB<5QRnliw4R2KWqUNSQap8
zrZ=s76K7yQfqyJ#kJEI=9}0rwz5IC($~b2<KC+T<$tSZ2A(hrj#z)1ADdY<WsR72A
zWmzBVvOj1DuywQmW&T4m2-w`VIk!3CLOfdlkiRPW?h0W3B4+}I%OeWE90Nf9A}T;0
z2~R87VVFTB%r_WN=08*oU<&4A0LWh@tpOV5BLK{YJAVu_cs`z^k|03Bd<+=>PlPI%
zZyJDStPtTsx%jGq0H$Gn3ou*(*D${U7~U4bRejm!`Z^BpD`E9zpKHKHe5yBh-0_d%
z)2l*?n~GcK3vVEE)(YIXrbBW#>&k%_?xa?BYXUqsy#onS>TN+Ut!o3GR`(<kw2tly
zoK-zh27k?K0Fb@55L!oSpR%_FXGO0ug}+fIYcT{E>>l=Uu9CSKY~gG!ief-&&$_n)
z;Scd3)c)e^evzR3%+3l@gR31*>c3&Mdx)D&EmmQ`;Q-8_kbE7Sg(UG7vP~NRlFbnK
z5VKJnY(X?FSOOe`ZXI|)(*$O~KCCS=vQtrsO+Sy7ylAu#9X*IEI0!Ak`N6<=Q<0(`
sWSfHh#g!&TMJm2ZexRDSLHV`#21~IoDdPo(_5c6?07*qoM6N<$f-(Xy0ssI2

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/telescreen_frame.png b/Resources/Textures/Structures/Machines/computers.rsi/telescreen_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc7b7f0cee14e58fa1423b052b9fa99cf1979da2
GIT binary patch
literal 1356
zcmV-S1+)5zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000FONkl<ZcwX(B
zT}TvB6vwY1Xq%XAtA)r)B}xzyNCf(l5>b!#AmoE#Um!h3kdTNN7(|aD^d<RV;6pwZ
z5!#DFgb)&hVui9ushNpwE(kUMkt5gHnYs6lbBA@E`?BlK?9M&Ed(OG%o^#A$yL{yA
za`{;ZAk=_eP9QXaU9JG`POzl3>YrbL=I16eQrjFS1>p<wo#l^2A}l{YpH)^KGZ{@y
zeP(NGYb=>erZI~~qilBW7gK={6nr6o(()r|0u|)t8N%nW^75nRwV9bOhVUu2no6bJ
z8{1dNB9Xo9?Yl8)01*CiON(F1$DZ}~J3d<qz{L2N=gG9T-e3z0-#r0nY&`4vx%9=M
zp*Q{j$TL=5b)*c90D#fa5hW8K4FG`l_72wjsF$@}Z!;f{_Zava@2^~IV^1G%e8!I#
z6^GgR_aB%q046_;v)tTVCHdFa*UkIu>gw6_^c0(4`m1aL8KVINKvoN|@)&?nQ&Vd?
z$knwRB>-^1Ui^>MKZ(pw$_J<dfbf6-09D6p*xbxl&j8?mWWn<)Dr<hO07{~JSXo&)
z8#g8a6DTY!lrn>rm6c5m*e(FT$51gr-ux1YSy%t#3Lsv(-vAIdotW22_yK@~mstQF
zKFlwXm~r(#LI7}LeSHr-t6{Y<iS3wxZu4^maOQL^D=t1{uD&(cQ3-~;0zi~W=7%}R
z_yXPm%V?h~07PR!Y(-Ybf;a&Fr=p@#yZK20cy;O|yEy$V%>hynLO}@yD0rpdrKhJ`
z7>w8ffdBDoexwC5<|hR}%JsY4B#OrD0Fe2?|9Bm~0Py;7>-XFaBu)U5$v<rI_r{jW
z4?q2n>lr<$BdL=KEG;di39oVtr!Tujp&6N^z{G=spRoY^GCk4ngaAZ@vi*9f0olI7
zBKblM5E07u>!Ai@`wENX3pGGQDBG`x8X#KX?Ho!}ilL%;=(;XE4kI%oQvt>Vo0=|d
znWst)z)e7%iy#Dm3QcwO38_l(gL~bZa;Rp3oB-HWif3o1&1w^dQ%PPX7l3=D0H8!g
z6=J*0EOKy2KLG%WnO^dMA^?1Hc3|M8dAnO#9@k~E(MkYFc)m(QRT!k80iftWj4l6M
zR8EA-06=mU6<+{ws#T~YM3prF07!Vex8~q=YXHIR>AAm|E{6~_Ct3{BNG%$Ghmj`W
z6{RRDf(8Ykv-9qjf(frZn2WCfP@pI>szX$zbpn7oTvyi}ttLPkaPxKtqmmiwg`|m8
zk@gh;w!v8JAR8MSF<0IR0E!sx?YA-pKy7WkR9}M738FxO{QU6nYgYix%~x4-^98ND
z0BHbk0!|vx&~Q$wGersj3Z&$9oiu;|=-dUM`tUR41gU4i&IDw8lY{`QH9C<A&?Nm1
zgb)W1Tx^2_15Y-aHk<&6+GC`)L8{V<Odtp+NI{ki0GNPGf1*$W5DMcgAaa611VYw0
zz|92U1Q!>72;1|d08l9GwhIIaK*k9oG+#CvG)3)so&dmhtdU@lCJ<;GK>d1ryPDlu
zAc#1Cd;kx?ZZUifgm?h-FzdmEdh!ql(1AtgE<gbIa{%6JJqy^K)~t;R06;?r0A2%}
z8Ys1#2Az(o)U1H(*eT-iiY>SLkrCn>r|HL`0oGyHH8L^rQP`m>Op5AEM>&DzKex*W
z4GuoH{i<E}i0B_RgaBkFsrw$Ci?AaA=mZ=B&`EbE{C21TJ7JY{&hbC+qj8M!WQK?U
O0000<MNUMnLSTXtvRwlJ

literal 0
HcmV?d00001