From f636303b8e22754273141c6e1d69c65240682959 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 25 Apr 2020 12:10:28 +0200 Subject: [PATCH] Import proper reinforced wall sprites. --- .../IconSmoothing/IconSmoothComponent.cs | 20 ++++-- .../Components/ReinforcedWallComponent.cs | 60 ++++++++++++++++ .../Prototypes/Entities/Buildings/walls.yml | 11 +-- .../Buildings/Walls/reinforced.rsi/full.png | Bin 784 -> 0 bytes .../Buildings/Walls/reinforced.rsi/meta.json | 47 ------------- .../Walls/reinforced.rsi/reinforced0.png | Bin 1158 -> 0 bytes .../Walls/reinforced.rsi/reinforced1.png | Bin 1051 -> 0 bytes .../Walls/reinforced.rsi/reinforced2.png | Bin 1158 -> 0 bytes .../Walls/reinforced.rsi/reinforced3.png | Bin 1051 -> 0 bytes .../Walls/reinforced.rsi/reinforced4.png | Bin 1060 -> 0 bytes .../Walls/reinforced.rsi/reinforced5.png | Bin 919 -> 0 bytes .../Walls/reinforced.rsi/reinforced6.png | Bin 1060 -> 0 bytes .../Walls/reinforced.rsi/reinforced7.png | Bin 919 -> 0 bytes .../Buildings/Walls/solid.rsi/meta.json | 66 +----------------- .../Walls/solid.rsi/reinf_construct-0.png | Bin 0 -> 243 bytes .../Walls/solid.rsi/reinf_construct-1.png | Bin 0 -> 231 bytes .../Walls/solid.rsi/reinf_construct-2.png | Bin 0 -> 226 bytes .../Walls/solid.rsi/reinf_construct-3.png | Bin 0 -> 215 bytes .../Walls/solid.rsi/reinf_construct-4.png | Bin 0 -> 195 bytes .../Walls/solid.rsi/reinf_construct-5.png | Bin 0 -> 182 bytes .../Buildings/Walls/solid.rsi/reinf_cult.png | Bin 0 -> 239 bytes .../Buildings/Walls/solid.rsi/reinf_metal.png | Bin 0 -> 153 bytes .../Buildings/Walls/solid.rsi/reinf_over.png | Bin 0 -> 217 bytes .../Buildings/Walls/solid.rsi/reinf_over0.png | Bin 0 -> 339 bytes .../Buildings/Walls/solid.rsi/reinf_over1.png | Bin 0 -> 287 bytes .../Buildings/Walls/solid.rsi/reinf_over2.png | Bin 0 -> 339 bytes .../Buildings/Walls/solid.rsi/reinf_over3.png | Bin 0 -> 287 bytes .../Buildings/Walls/solid.rsi/reinf_over4.png | Bin 0 -> 282 bytes .../Buildings/Walls/solid.rsi/reinf_over5.png | Bin 0 -> 447 bytes .../Buildings/Walls/solid.rsi/reinf_over6.png | Bin 0 -> 282 bytes .../Buildings/Walls/solid.rsi/reinf_over7.png | Bin 0 -> 139 bytes .../Buildings/Walls/solid.rsi/rgeneric.png | Bin 0 -> 551 bytes 32 files changed, 81 insertions(+), 123 deletions(-) create mode 100644 Content.Client/GameObjects/Components/ReinforcedWallComponent.cs delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/full.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/meta.json delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced0.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced1.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced2.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced3.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced4.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced5.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced6.png delete mode 100644 Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced7.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-0.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-1.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-2.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-3.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-4.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-5.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_cult.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_metal.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over0.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over1.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over2.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over3.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over4.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over5.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over6.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/reinf_over7.png create mode 100644 Resources/Textures/Buildings/Walls/solid.rsi/rgeneric.png diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs index 7adc08b7af..586c91978f 100644 --- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs @@ -101,7 +101,7 @@ namespace Content.Client.GameObjects.Components.IconSmoothing switch (Mode) { case IconSmoothingMode.Corners: - CalculateNewSpriteCorers(); + CalculateNewSpriteCorners(); break; case IconSmoothingMode.CardinalFlags: @@ -129,7 +129,17 @@ namespace Content.Client.GameObjects.Components.IconSmoothing Sprite.LayerSetState(0, $"{StateBase}{(int) dirs}"); } - private void CalculateNewSpriteCorers() + private void CalculateNewSpriteCorners() + { + var (cornerNE, cornerNW, cornerSW, cornerSE) = CalculateCornerFill(); + + Sprite.LayerSetState(CornerLayers.NE, $"{StateBase}{(int) cornerNE}"); + Sprite.LayerSetState(CornerLayers.SE, $"{StateBase}{(int) cornerSE}"); + Sprite.LayerSetState(CornerLayers.SW, $"{StateBase}{(int) cornerSW}"); + Sprite.LayerSetState(CornerLayers.NW, $"{StateBase}{(int) cornerNW}"); + } + + protected (CornerFill ne, CornerFill nw, CornerFill sw, CornerFill se) CalculateCornerFill() { var n = MatchingEntity(SnapGrid.GetInDir(Direction.North)); var ne = MatchingEntity(SnapGrid.GetInDir(Direction.NorthEast)); @@ -191,10 +201,7 @@ namespace Content.Client.GameObjects.Components.IconSmoothing cornerNW |= CornerFill.Diagonal; } - Sprite.LayerSetState(CornerLayers.NE, $"{StateBase}{(int) cornerNE}"); - Sprite.LayerSetState(CornerLayers.SE, $"{StateBase}{(int) cornerSE}"); - Sprite.LayerSetState(CornerLayers.SW, $"{StateBase}{(int) cornerSW}"); - Sprite.LayerSetState(CornerLayers.NW, $"{StateBase}{(int) cornerNW}"); + return (cornerNE, cornerNW, cornerSW, cornerSE); } /// @@ -258,7 +265,6 @@ namespace Content.Client.GameObjects.Components.IconSmoothing Clockwise = 4, } - [SuppressMessage("ReSharper", "InconsistentNaming")] public enum CornerLayers { SE, diff --git a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs b/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs new file mode 100644 index 0000000000..8a7d8c90da --- /dev/null +++ b/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs @@ -0,0 +1,60 @@ +using Content.Client.GameObjects.Components.IconSmoothing; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using static Robust.Client.GameObjects.SpriteComponent; + +namespace Content.Client.GameObjects.Components +{ + [RegisterComponent] + [ComponentReference(typeof(IconSmoothComponent))] + public class ReinforcedWallComponent : IconSmoothComponent + { + public override string Name => "ReinforcedWall"; + + [ViewVariables(VVAccess.ReadWrite)] + private string _reinforcedStateBase; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + + serializer.DataField(ref _reinforcedStateBase, "reinforcedBase", null); + } + + protected override void Startup() + { + base.Startup(); + + var state0 = $"{_reinforcedStateBase}0"; + Sprite.LayerMapSet(ReinforcedCornerLayers.SE, Sprite.AddLayerState(state0)); + Sprite.LayerSetDirOffset(ReinforcedCornerLayers.SE, DirectionOffset.None); + Sprite.LayerMapSet(ReinforcedCornerLayers.NE, Sprite.AddLayerState(state0)); + Sprite.LayerSetDirOffset(ReinforcedCornerLayers.NE, DirectionOffset.CounterClockwise); + Sprite.LayerMapSet(ReinforcedCornerLayers.NW, Sprite.AddLayerState(state0)); + Sprite.LayerSetDirOffset(ReinforcedCornerLayers.NW, DirectionOffset.Flip); + Sprite.LayerMapSet(ReinforcedCornerLayers.SW, Sprite.AddLayerState(state0)); + Sprite.LayerSetDirOffset(ReinforcedCornerLayers.SW, DirectionOffset.Clockwise); + } + + internal override void CalculateNewSprite() + { + base.CalculateNewSprite(); + + var (cornerNE, cornerNW, cornerSW, cornerSE) = CalculateCornerFill(); + + Sprite.LayerSetState(ReinforcedCornerLayers.NE, $"{_reinforcedStateBase}{(int) cornerNE}"); + Sprite.LayerSetState(ReinforcedCornerLayers.SE, $"{_reinforcedStateBase}{(int) cornerSE}"); + Sprite.LayerSetState(ReinforcedCornerLayers.SW, $"{_reinforcedStateBase}{(int) cornerSW}"); + Sprite.LayerSetState(ReinforcedCornerLayers.NW, $"{_reinforcedStateBase}{(int) cornerNW}"); + } + + public enum ReinforcedCornerLayers + { + SE, + NE, + NW, + SW, + } + } +} diff --git a/Resources/Prototypes/Entities/Buildings/walls.yml b/Resources/Prototypes/Entities/Buildings/walls.yml index 5a479212bb..97bd3b62cf 100644 --- a/Resources/Prototypes/Entities/Buildings/walls.yml +++ b/Resources/Prototypes/Entities/Buildings/walls.yml @@ -220,15 +220,18 @@ parent: base_wall components: - type: Sprite - sprite: Buildings/Walls/reinforced.rsi + color: "#889192" + sprite: Buildings/Walls/solid.rsi - type: Icon - sprite: Buildings/Walls/reinforced.rsi + sprite: Buildings/Walls/solid.rsi + state: rgeneric - type: Destructible thresholdvalue: 300 spawnondestroy: Girder - - type: IconSmooth + - type: ReinforcedWall key: walls - base: reinforced + base: solid + reinforcedBase: reinf_over # Riveting - type: entity diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/full.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/full.png deleted file mode 100644 index 80afd7a640428b61749f7891641907dc136c8cee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 784 zcmV+r1MmEaP)g2b5PdcafhMGiszn?MR#lqAaz_0BV}AfWq*Rp)hp5sDHQ0r;lCy{6kPipaRcW7O zy~Or-hR1kflgVU~;0N(bKQP9QPUf70F?N*efOEbNfH8*UatTT)lv0&Oj4=d30N?j3 zdAVF3bgX^ofN6F>b5*;W&ER=nB|psP2ko;yQos5k`^(Q=7le>pqm<&t_i@(g0DzH) zjDb>GvL%Gz+;w5{mF7SeYa!rvySYBwaUg|&?KrS3%g9m)^!t5CA&hGp|B_NiMxJdP zrw!OAPP}_B^3!5bveUN3wJQUtLaW&Xq4Xf@d7nY;08WM40kn6?R+sC-n1ua)9{}Ka z-hVB6b#(;**lsoefVcN|*p7oR3`=u~F2#&7Jj~}9GKRM}P7|uQ@Z;m-LC00&!@&S8 z%fb`qxE_ttgeH^8B+(Vl^E{k&IcTTG|Zv@fdw z07xP5y4hg0TEX{yaL)4z+|6bH0L!uv$1#Xu+w^)p*tQMZw$nZ-C8U&ietxc0r`2qx z+x5?QT>cgWL4e=A-cbbrz_x8jDbvNX?{yT=-wn?BM*y62_`Y9Dfn(4?o>YND_!b4E zl%*W_HU*+6Dmev^_J3A^(k{61eZ0l-$6!H$uc!m}L6B1*tpkh20*yukl+v^kniQB$ zr$@O;fiMiAl!8(UmzS6O8~^}9NNN~{A-ax(znM>|F0XY^RH1EI$Ik;v@-v6y+8bTV zS(m>&fK#D%06LNCa$TfJ*l08We4JSI*{y9^xyi%9002tIFU@+qXs2Pia~KaKUB^MR zUg!GOLg3=!0#XRXactz4Wg!g1QbH$5f^*l!%dS`%?*&=BL=loC$u*@E?t=iYyCgI5 z6X#G$m2CBzCKxX!x>yw3pYa&0)vA)ON25wx-HOPS;$t|)<&^yN_52^lCTk_OWjh)G O0000&i_O?StN|H7mx8g4~(&#r6Pp`7-N{t zW>8fXaU5?wZaf~tah%i+heOiXQaAtrR8`H{GQN*S_+r~ROCFbe1wmwg`HpEqQIy=K zsw%!Y4i4LG07xwrX(AxYDhOa69p(1vhJi2$pc@7>O-n5mX(E7=eFQd9lx_ghNiTZ* z%q?j=@)dSOv(bQ}s!uGH+Bl#pYU6;`GKQW_}&o(eO@ z@bl&dr;On~ituYXeR6EC*TZBo$?Y4BM)gmHd4^|M7Ve`6x?$k_{2a|j1Hius7z_qz zwOTMuGd*`iOopUzfaiH|94F1}G)+SkMWwU6X`0Y=9lEXy8Cwbm@Cf)~+c<2up&JGO zltusm=(>(D426s>g#+Fa0iq#Kf>&2piLUFI&*zxW=jiwQ>EAZ%H2~oL&mRCl7zDUm zud!Gx;5ZIE&m*trsgNU}7>+zli!>XJGP8{`P!IX$Mfc#Cedi^P5P*wGbwy!7(I+jB7Dg>}P#@B38@M}jO%xvrZo{>$`x4%Y>Kc^wgEgSLzBtm zMP-h;7@s$L{+2y8ca4 zZ|xA_kDUmlaKKx7gm@pq-u4K6a~y<00MGNDL;%k-Hk*yGv88YTV+_;j6rU{%x3{ms_9IY{!T|uFDF5a%-}iB37`V+WrFnWS8fjL8MLBI(NaKK)sHzX4HV&wY z+Bl%9J_Knd!GnVX01p*oUOO!I8SwrCk>xjO9FXP6FtA*$a{E?6faBxiTtC9z{?pX& zlIMC0cppO6Qjy{jc&(_K?L!b%Pmsa^!0Xjw(R~Pi Y0d-xK$q+^l-~a#s07*qoM6N<$f;|ZskN^Mx diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced1.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced1.png deleted file mode 100644 index dd7af706423c8dec8ba58f4f4d45ceae4e63d6c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1051 zcmV+$1mydPP)b8bq;O_1YrfEj8*Xxn`&s~6WxtzM~&)Zw<>3S?u$z6c=D3wZU$7iOAmoNkX?9}T* z`pI2@W}}g+9n&-fz7M8pP*pXGRMPt|BVOO$QoR5~lU}%V0gn`N7a%QFMM0@tUW-%; zBS2OZMu6IK(o04vxle+d*xlU)u&_NK?#pgMIsq7C2z(!d;c)G}PNxIgwgDiDRHPH& zB@Dqd4d>_QYYwn&8?{;ujg?F1Epagv zqg5T}=H`Yx1`1>cB<=X#>|9k8gkgw-!$WG9LLm#_c^&}Z>FEgoKJ0+J5hef-zfLD< zA0MNts$WllZnq2Dwquc#bijB#rgkTsOs)ch!61u|&4j{ihO&Yz0JnKE7KLvIP(OfA zaLHH{giL~b&E7sf1^_4(=~me9LLO=0`v}7jf$yWLs&HKw^Laeml{}USvH;J^N$+_w zf$O@c@9dBV^_h_8fYE4#3(LZ2G{VX0DQ2_ThhBL@c7SP`a2zL!A4zt~09gQ@tVqV9 zKo+3cY;J9%R4Vwr+${pYY&OHu(UBBleJ_Oa9zfpYBEUy#0_xoEjLycxLs`8X!FCat!o*SG_r(1J_0B~VhQha$p#4WKPh$Tq3IpBFR z`C1N0QZxtTIspNT=LL8bc&pXIPQCum3K3n`V}HBr>+51aF90CArN*njw^fMnznuuA z5P&;iPuI6PfY%{>sT!eG2b`HE0^f(@IBO2z>x}7iDy(lQ1TYK(!{HFStri|1AF;o` zj|&i_O?StN|H7mx8g4~(&#r6Pp`7-N{t zW>8fXaU5?wZaf~tah%i+heOiXQaAtrR8`H{GQN*S_+r~ROCFbe1wmwg`HpEqQIy=K zsw%!Y4i4LG07xwrX(AxYDhOa69p(1vhJi2$pc@7>O-n5mX(E7=eFQd9lx_ghNiTZ* z%q?j=@)dSOv(bQ}s!uGH+Bl#pYU6;`GKQW_}&o(eO@ z@bl&dr;On~ituYXeR6EC*TZBo$?Y4BM)gmHd4^|M7Ve`6x?$k_{2a|j1Hius7z_qz zwOTMuGd*`iOopUzfaiH|94F1}G)+SkMWwU6X`0Y=9lEXy8Cwbm@Cf)~+c<2up&JGO zltusm=(>(D426s>g#+Fa0iq#Kf>&2piLUFI&*zxW=jiwQ>EAZ%H2~oL&mRCl7zDUm zud!Gx;5ZIE&m*trsgNU}7>+zli!>XJGP8{`P!IX$Mfc#Cedi^P5P*wGbwy!7(I+jB7Dg>}P#@B38@M}jO%xvrZo{>$`x4%Y>Kc^wgEgSLzBtm zMP-h;7@s$L{+2y8ca4 zZ|xA_kDUmlaKKx7gm@pq-u4K6a~y<00MGNDL;%k-Hk*yGv88YTV+_;j6rU{%x3{ms_9IY{!T|uFDF5a%-}iB37`V+WrFnWS8fjL8MLBI(NaKK)sHzX4HV&wY z+Bl%9J_Knd!GnVX01p*oUOO!I8SwrCk>xjO9FXP6FtA*$a{E?6faBxiTtC9z{?pX& zlIMC0cppO6Qjy{jc&(_K?L!b%Pmsa^!0Xjw(R~Pi Y0d-xK$q+^l-~a#s07*qoM6N<$f;|ZskN^Mx diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced3.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced3.png deleted file mode 100644 index dd7af706423c8dec8ba58f4f4d45ceae4e63d6c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1051 zcmV+$1mydPP)b8bq;O_1YrfEj8*Xxn`&s~6WxtzM~&)Zw<>3S?u$z6c=D3wZU$7iOAmoNkX?9}T* z`pI2@W}}g+9n&-fz7M8pP*pXGRMPt|BVOO$QoR5~lU}%V0gn`N7a%QFMM0@tUW-%; zBS2OZMu6IK(o04vxle+d*xlU)u&_NK?#pgMIsq7C2z(!d;c)G}PNxIgwgDiDRHPH& zB@Dqd4d>_QYYwn&8?{;ujg?F1Epagv zqg5T}=H`Yx1`1>cB<=X#>|9k8gkgw-!$WG9LLm#_c^&}Z>FEgoKJ0+J5hef-zfLD< zA0MNts$WllZnq2Dwquc#bijB#rgkTsOs)ch!61u|&4j{ihO&Yz0JnKE7KLvIP(OfA zaLHH{giL~b&E7sf1^_4(=~me9LLO=0`v}7jf$yWLs&HKw^Laeml{}USvH;J^N$+_w zf$O@c@9dBV^_h_8fYE4#3(LZ2G{VX0DQ2_ThhBL@c7SP`a2zL!A4zt~09gQ@tVqV9 zKo+3cY;J9%R4Vwr+${pYY&OHu(UBBleJ_Oa9zfpYBEUy#0_xoEjLycxLs`8X!FCat!o*SG_r(1J_0B~VhQha$p#4WKPh$Tq3IpBFR z`C1N0QZxtTIspNT=LL8bc&pXIPQCum3K3n`V}HBr>+51aF90CArN*njw^fMnznuuA z5P&;iPuI6PfY%{>sT!eG2b`HE0^f(@IBO2z>x}7iDy(lQ1TYK(!{HFStri|1AF;o` zj|jMQ#MxsZ?Sum7h*ef z?O-q<^_>X;7-ML++qihW8CjO$d0y-+U$57pC<+us5z==i1mGU9r)j8GDo|=Q0IPF= zX_^3DB0|@7h4h^X0Y2gZq9IR$r>CcZqA0L!8@6qu*XxCUn?5}O0G?+v0D$W_czk-o zWHLd!-3DU}{eC~yiJ0sG%kIeCbeVFg6o#(Hh7pFfX+svkwrv2w!@~mrY~%sM;V|@o zv=Jr%@Ul+7o`etMJ6|!p`;)Sz}-{1e& zby?U400IQyo0>)Y5&Hc;bqFNL0`R>(x0Ypz7}uvk7NF5+;9@Yqo~GgVguP3(EN(HK_;`a6yK@hC8i~B4K(9Z-H^7XFcpxJD~&FJ1g4j~63{IGL;b%jo+ zldFi390x4s>-qaU@#O;{vH(ft?LUh|4nbhD7m zwyH*Gk+LkqbsR9pRy=^m8Pn-hSbv!lz;#`ys)}R7i1mQwdITz&699-0nR$3En(y6U z+5^~>r0NiIBS2E*Mu4R15K^B6OU2EH!0Qi09>1k7!2N4rvrM57jd1@u4t95UBlQSd z{iCTM2qG`v_wj2u#N+Ga_qZ*Spzr$|zm5$9lgT7vsigi092^{M+?JQsFIp<83-HmK e;O#}F*Z%?32@0q7GQ>Cl0000uznvw5bQ=% z$TMJ56xtshX_^86q?CK33FHENl&R5rnE+Yrf7`-z0*_eXbO1|)DcAyfVZ>< z?0s1s&I!O6gWw#?`}^8!)9DmRk^sPNG{rdqUZe!;_i=G?QOkfNNzm){5SFISySqE1 zc+LrsrYV9TfRs{O<-;%pV+@QjEAgBYAdX|Oejh-+2B@@Wj6n!tC7yEv9LoUP811D2 z;QIP{%NRqJWyrD&^Z9)DTK@bD0C?GK004sX+A7ayh8EOh+0aTh-$F}gB0j6)D3S4z;3s#DtTC-2aI8wpG7R zr&BBz3+-{LFHmi2w!Sqs7z_Zsb%qv;#nH}?YgiFL{a5om|9QPZA;eyT^vCrEtF$cx zNDB}ETwPsl%a47}d)FZ{7!3AKyPKOEqwnC{wd#*JMAT_#1Lp)d<`Ggpgm3E+>IMM> z=Sb7EmH}#=k>|O!c+LqRgg_KU_%oYnGob26FvU3m0R56#Ew63!yBnnb03W3(A3|#c zXo}Vd(3B5>ya*oh4e0g^%70+<@*BAThkOIoTW8nn_3mB*%ss diff --git a/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced6.png b/Resources/Textures/Buildings/Walls/reinforced.rsi/reinforced6.png deleted file mode 100644 index 2f2c404b1913a94ccb6f4a4bb3afd3d4e2b8d404..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1060 zcmV+<1l#+GP)jMQ#MxsZ?Sum7h*ef z?O-q<^_>X;7-ML++qihW8CjO$d0y-+U$57pC<+us5z==i1mGU9r)j8GDo|=Q0IPF= zX_^3DB0|@7h4h^X0Y2gZq9IR$r>CcZqA0L!8@6qu*XxCUn?5}O0G?+v0D$W_czk-o zWHLd!-3DU}{eC~yiJ0sG%kIeCbeVFg6o#(Hh7pFfX+svkwrv2w!@~mrY~%sM;V|@o zv=Jr%@Ul+7o`etMJ6|!p`;)Sz}-{1e& zby?U400IQyo0>)Y5&Hc;bqFNL0`R>(x0Ypz7}uvk7NF5+;9@Yqo~GgVguP3(EN(HK_;`a6yK@hC8i~B4K(9Z-H^7XFcpxJD~&FJ1g4j~63{IGL;b%jo+ zldFi390x4s>-qaU@#O;{vH(ft?LUh|4nbhD7m zwyH*Gk+LkqbsR9pRy=^m8Pn-hSbv!lz;#`ys)}R7i1mQwdITz&699-0nR$3En(y6U z+5^~>r0NiIBS2E*Mu4R15K^B6OU2EH!0Qi09>1k7!2N4rvrM57jd1@u4t95UBlQSd z{iCTM2qG`v_wj2u#N+Ga_qZ*Spzr$|zm5$9lgT7vsigi092^{M+?JQsFIp<83-HmK e;O#}F*Z%?32@0q7GQ>Cl0000uznvw5bQ=% z$TMJ56xtshX_^86q?CK33FHENl&R5rnE+Yrf7`-z0*_eXbO1|)DcAyfVZ>< z?0s1s&I!O6gWw#?`}^8!)9DmRk^sPNG{rdqUZe!;_i=G?QOkfNNzm){5SFISySqE1 zc+LrsrYV9TfRs{O<-;%pV+@QjEAgBYAdX|Oejh-+2B@@Wj6n!tC7yEv9LoUP811D2 z;QIP{%NRqJWyrD&^Z9)DTK@bD0C?GK004sX+A7ayh8EOh+0aTh-$F}gB0j6)D3S4z;3s#DtTC-2aI8wpG7R zr&BBz3+-{LFHmi2w!Sqs7z_Zsb%qv;#nH}?YgiFL{a5om|9QPZA;eyT^vCrEtF$cx zNDB}ETwPsl%a47}d)FZ{7!3AKyPKOEqwnC{wd#*JMAT_#1Lp)d<`Ggpgm3E+>IMM> z=Sb7EmH}#=k>|O!c+LqRgg_KU_%oYnGob26FvU3m0R56#Ew63!yBnnb03W3(A3|#c zXo}Vd(3B5>ya*oh4e0g^%70+<@*BAThkOIoTW8nn_3mB*%ss diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/meta.json b/Resources/Textures/Buildings/Walls/solid.rsi/meta.json index 1a680b0803..59910380d4 100644 --- a/Resources/Textures/Buildings/Walls/solid.rsi/meta.json +++ b/Resources/Textures/Buildings/Walls/solid.rsi/meta.json @@ -1,65 +1 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full", - "select": [], - "flags": {}, - "directions": 1 - }, - { - "name": "solid0", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid1", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid2", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid3", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid4", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid5", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid6", - "select": [], - "flags": {}, - "directions": 4 - }, - { - "name": "solid7", - "select": [], - "flags": {}, - "directions": 4 - } - ] -} \ No newline at end of file +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.", "size": {"x": 32, "y": 32}, "states": [{"name": "full", "select": [], "flags": {}, "directions": 1}, {"name": "solid0", "select": [], "flags": {}, "directions": 4}, {"name": "solid1", "select": [], "flags": {}, "directions": 4}, {"name": "solid2", "select": [], "flags": {}, "directions": 4}, {"name": "solid3", "select": [], "flags": {}, "directions": 4}, {"name": "solid4", "select": [], "flags": {}, "directions": 4}, {"name": "solid5", "select": [], "flags": {}, "directions": 4}, {"name": "solid6", "select": [], "flags": {}, "directions": 4}, {"name": "solid7", "select": [], "flags": {}, "directions": 4}, {"name": "reinf_construct-0", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_construct-1", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_construct-2", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_construct-3", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_construct-4", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_construct-5", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_cult", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_metal", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_over", "directions": 1, "delays": [[1.0]]}, {"name": "reinf_over0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "reinf_over7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rgeneric", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-0.png new file mode 100644 index 0000000000000000000000000000000000000000..ce2e78e01e4241f06c569625eca39172ad471df0 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0HU}Ztm^vosyE$+1a^Z z!Gc4F4yCicR0T>fmIV0)GdMiEkp|@Sc)B=-Xq-<@SRk5^$T*RYuVRXXCS#+~q=qOd z0Tsm`ewhgin9PGsMR=MNmTfXH*y+&7#O&g6RDh$U@c`$dCQTQEK!ZS^0G|t?jBA{9 zkNEfqa0s==9uzZN+S>5bLGZc>Ye$2Ehy#m5)PYY;Ck1o`oEzQL4)Gk_Aa*%1!|(Vb kOP}}2Yyy&vK9UR!m)5E0?L67A59lriPgg&ebxsLQ0HRGymH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-1.png new file mode 100644 index 0000000000000000000000000000000000000000..79dfd001ce0b96ea5ba0266076df8a71b72c0d56 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0HU}Ztm^vosyE$+1a^Z z!Gc4F4yCicR0T>fmIV0)GdMiEkp|>6c)B=-Xq-<@SRk5^$T*RYuVRXXCS#+~q=qOd z0Tsm`ewhgin9PGsMR=MNmTfXH*y+&7#O&g6RDh$U@c`$dCQTQEK!ZS^0G|t?jBA{9 zkND{L>KN)8-W1Id43=_ooyFvH04Ob?*07NEasW@Zp={f;5}kR6zu2WQOcXpZg^{5n XR_l4w>kC_fZej3r^>bP0l+XkK$m~ZY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-2.png new file mode 100644 index 0000000000000000000000000000000000000000..31364cdb3cbf06bb31381e29d3c97245f63dd6d4 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0HU}Ztm^vosyE$+1a^Z z!Gc4F4yCicR0T>fmIV0)GdMiEkp|>cd%8G=Xq-<@SRk5^$T*RYuVRXXCS#+~q=qOd z0Tsm`ewhgin9PGsMR=MNmTfXH*y+&7#O&g6RDh$U@c`$dCQTOuL&HEHAD;`MjBA{9 zkLUn_sj2Br(Hy~GDJR!iOlFKcx-;66BD!B1m@H5JD6{OlA#+EM!!jNQhI2W(?Efw} R16{$u;OXk;vd$@?2>?2JLr4Gs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-3.png new file mode 100644 index 0000000000000000000000000000000000000000..40eea5344c61cb3cb1635d44235d34a58034e549 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0HU}Zl02o(%IR$V8Mcw zD_0&mbf_~UF$^fdSQ6wH%;50sMjDV);OXKRqH#VsVS#8u8rwuRwkb0b)7Y+@n=^;U z{IUlp&lJUFM#dX7XSFdoZU|sv4)KUQ%E~dP=Ydv;tRs_>V}a-@JtaN8K0U{R=__|x zaB+6-U@=tS)X-AmT#$J%O`~nA1fO%M)s12vjd{{59FB1_s7Ff|MqiG82DF>O)78&q Iol`;+0N*)5=l}o! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_construct-4.png new file mode 100644 index 0000000000000000000000000000000000000000..fdd114ee1fdcdcae9e16d51fbde44789f524f284 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0HU}Zl02o(%IR$V8Mcw zD_0&mbf_~UF$^fdSQ6wH%;50sMjDV4q#W8o^UE9XQ+Sj>Yx zIC(@Aml+vu(AwG17{tIF;&D`hXU+qy1SX3R21cI-#_0?v+mebUR$V?gFWKSa9S2sU bI0goJ2l3^)YQ_J7rZafD`njxgN@xNA=lD4G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_cult.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_cult.png new file mode 100644 index 0000000000000000000000000000000000000000..0d8922c7eef928a30088e1810a70f03755a12c94 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0HT&2A-atNl8hKjg3i> z<-I^rrjj7PV1|a-+I|v1UYDnfV~EE2trHyinhkhZ1Zx`9U0kdCn?5nR*l$Su_kXG! z*UHsiwp;gAnrz%G*Y^MFmUWij7WdV9GjjCRax+PI1a3IsxWkm?v-g3mE43FTT+}mY zWZ?P9bfJOoo!+K3mm0SO^jQ6=2pE9R{ eUu93^uQQt$7}V;siow&>&t;ucLK6T7%~jF> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_metal.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_metal.png new file mode 100644 index 0000000000000000000000000000000000000000..6e4b5179c7fbc250885c614cbd765f53c58fe570 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0LTf)3a*TstXq`ynFX< zcHyB?pb%q8kY6x^!?PP{K#ql{i(`n!`Q!uzW&>@d8%}HvO(#7Vj-`i$F-+z&U=-_^ w)4}A^aB^az$OPsK%>v333>PsfFY;hxNDyR^H}}(*2AaX(>FVdQ&MBb@0GG`x>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f7175ea7e62df5ec40488a863e198b9d67d2e60a GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0J5|l2TPw)!Es(V8Mcw zD_0&mbjX#JKN~2)SQ6wH%;50sMjDV)|_M#N1Co}QlGgJB%4lI=~6g{u}Zy0ot3mS8y? zdVr;11w$masKXBC(1sG{jg~xDU(T3!_)%>S!yyi*9*1RS3=FdCweu5FK0O55&fw|l K=d#Wzp$PyW2S;%L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over0.png new file mode 100644 index 0000000000000000000000000000000000000000..cd6fde9a30bd3665262f8a5bb25c15b5dfedd2b3 GIT binary patch literal 339 zcmV-Z0j&OsP))^YByB|9+T$L`sc!x{Ro9ZF7 zpc&xzkR(wIqdZ1qY}cc@fU(`~kAwSX%kpW*rR83M^E3cxDF@8{k&)$cBUyp9R#MyF zK+?`Az?5bQQW~TIS*@9pb_b>d!-6zGy93jK*8;r2%p3m2*iryk{udmVmer5*>9*jJ zhUu=OdTi%e0aXD5z%;=01Q3i_E!@OdYgJXnE~x}V`mVa1vyKqMfo?*`;lMN?9O$kH lh67&?002H5cz>>1_yKFJIs3{?5oiDa002ovPDHLkV1ks`lv)4) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over1.png new file mode 100644 index 0000000000000000000000000000000000000000..a6278861f03fd7c414a54cfbdc3886935228ef32 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0J65R8~>e)z~z(t83o0 znTwXK-m-k@mO}?mUb}JQ!GkBSUcdhGLZ&7XvR`Y;0f>XRN6dUg5yf-?W>% zBTzxZAw+JnfZ&5&-VTiH`;5FUxU%f`ZR%qY=@1A}=!j=r%&o}UC!#GNqVmMIiAzNz g%s}djv*`*(rL#5~4^_6*0-ej?>FVdQ&MBb@07u$sbN~PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over2.png new file mode 100644 index 0000000000000000000000000000000000000000..cd6fde9a30bd3665262f8a5bb25c15b5dfedd2b3 GIT binary patch literal 339 zcmV-Z0j&OsP))^YByB|9+T$L`sc!x{Ro9ZF7 zpc&xzkR(wIqdZ1qY}cc@fU(`~kAwSX%kpW*rR83M^E3cxDF@8{k&)$cBUyp9R#MyF zK+?`Az?5bQQW~TIS*@9pb_b>d!-6zGy93jK*8;r2%p3m2*iryk{udmVmer5*>9*jJ zhUu=OdTi%e0aXD5z%;=01Q3i_E!@OdYgJXnE~x}V`mVa1vyKqMfo?*`;lMN?9O$kH lh67&?002H5cz>>1_yKFJIs3{?5oiDa002ovPDHLkV1ks`lv)4) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over3.png new file mode 100644 index 0000000000000000000000000000000000000000..a6278861f03fd7c414a54cfbdc3886935228ef32 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0J65R8~>e)z~z(t83o0 znTwXK-m-k@mO}?mUb}JQ!GkBSUcdhGLZ&7XvR`Y;0f>XRN6dUg5yf-?W>% zBTzxZAw+JnfZ&5&-VTiH`;5FUxU%f`ZR%qY=@1A}=!j=r%&o}UC!#GNqVmMIiAzNz g%s}djv*`*(rL#5~4^_6*0-ej?>FVdQ&MBb@07u$sbN~PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over4.png new file mode 100644 index 0000000000000000000000000000000000000000..5b3dd1a524f1ec40d98a5aebeec52f979983d520 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e^#Gp`S0J65R8~>e)z~z(t83o0 znTwXK-m-k@mO}?mUb}JQ!GkBSUcdhT|G&H70ZE`z#*!evU&R%GpSV3k?Tq4B_~*}YMrj5S@%z{-s4(Z;G!W=2+p)3F?y0*WgR zOl)9sY~qUHU{_qq#loqj@Zf}7muL^$*85266WM@<;6`qd2Z05PST*XI`kTbu7c@qm} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over5.png new file mode 100644 index 0000000000000000000000000000000000000000..765dae5a0c482f8e4b27b21676ed402b86393472 GIT binary patch literal 447 zcmV;w0YLtVP)1j*g-6;X|NsBMF4sc<0004WQchCrlE(;4k#a%gquu?HJ%2)_)EQ4O!3 zUR%R}wyw_y*0pu$mewi;^xk{;pAdrHzhLkAI>raER^7)7=;`eQ0SCDW1kjhs83M9h z1py*mwg_H;M+7%8BDjGq!Vv%>T`UOzFl9?301(NN6#!teR3->0Wm?=oWsdXgJii0% ze~?&N6$BUu6aW-`RA0Iq;q43q&uu7hNBX1P;Zb#+z`ZDVh0znL_vcjAy(}Pr+~j}& z?_!^X0PzJ&k) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over6.png new file mode 100644 index 0000000000000000000000000000000000000000..5b3dd1a524f1ec40d98a5aebeec52f979983d520 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e^#Gp`S0J65R8~>e)z~z(t83o0 znTwXK-m-k@mO}?mUb}JQ!GkBSUcdhT|G&H70ZE`z#*!evU&R%GpSV3k?Tq4B_~*}YMrj5S@%z{-s4(Z;G!W=2+p)3F?y0*WgR zOl)9sY~qUHU{_qq#loqj@Zf}7muL^$*85266WM@<;6`qd2Z05PST*XI`kTbu7c@qm} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Buildings/Walls/solid.rsi/reinf_over7.png new file mode 100644 index 0000000000000000000000000000000000000000..6d2f9044ace7b6617678be38776ee0214f960469 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0Z_@Urkb9Qd(eAT47scY+PY%YH)aKad>NSd2Dide1wR7gouZa zl8BI#jFp&;mY9u}nU0s4D)EK-0004+NklXO#QswJ-vUXrmJ&(_iXl~E)&&k z8-O+L$7_F;f(*(40Iie;nVuFHlmV@jW`3&3bzPt9hWQVQGF=2}9!ce)(k)WWCK=WX z`=_*G|I4eIDrI0gqfyljb(iUG1uC~$FX+;LtCB9TF*uj(@7KKs+4h5bflcaK7Ut`V zQE0^Kt!!qvu^*EOQ`&x+`_bKsF>XaBzxS_d$|fj^+#l=S4`bf{j(1w0&l#U-3J*L$ zuu!bTLZKEv-ja}zaDJnz6o$pjz!(FCrbzg4$iTQG-F