From 88d04478eea6fca394116e0c86e3ca460d844896 Mon Sep 17 00:00:00 2001 From: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:25:07 +0300 Subject: [PATCH 1/8] weh weh --- .../Markers/Spawners/Random/posters.yml | 3 ++- .../Structures/Decoration/posters.yml | 9 --------- .../Structures/Wallmounts/Signs/posters.yml | 19 ++++++++++++++++++ .../Decoration/poster.rsi/meta.json | 14 ------------- .../Wallmounts/posters.rsi/meta.json | 17 ++++++++++++++++ .../posters.rsi/sunriseposter1_legit.png} | Bin .../posters.rsi/sunriseposter2_legit.png | Bin 0 -> 871 bytes 7 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml delete mode 100644 Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json rename Resources/Textures/_Sunrise/Structures/{Decoration/poster.rsi/poster.png => Wallmounts/posters.rsi/sunriseposter1_legit.png} (100%) create mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 90bf1475427..0d15eadc6e9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -31,6 +31,7 @@ - type: RandomSpawner offset: 0 prototypes: + - PosterContrabandAriralInSpace # Sunrise-edit - PosterContrabandFreeTonto - PosterContrabandAtmosiaDeclarationIndependence - PosterContrabandFunPolice @@ -42,7 +43,6 @@ - PosterContrabandMissingGloves - PosterContrabandHackingGuide - PosterContrabandRIPBadger - - PosterAriralInSpace # Sunrise-edit - PosterContrabandAmbrosiaVulgaris - PosterContrabandDonutCorp - PosterContrabandEAT @@ -108,6 +108,7 @@ - type: RandomSpawner offset: 0 prototypes: + - PosterLegitAIOverseer #Sunrise-edit - PosterLegitHereForYourSafety - PosterLegitNanotrasenLogo - PosterLegitCleanliness diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml deleted file mode 100644 index 9cbf2c772c2..00000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: PosterBase - id: PosterAriralInSpace - name: "Арирал в космосе" - description: "Это явно послание.. Что-то я забыл.." - components: - - type: Sprite - sprite: _Sunrise/Structures/Decoration/poster.rsi - state: poster \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml new file mode 100644 index 00000000000..6bf5775a284 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml @@ -0,0 +1,19 @@ +- type: entity + parent: PosterBase + id: PosterContrabandAriralInSpace + name: "Арирал в космосе" + description: "Это явно послание.. Что-то я забыл.." + components: + - type: Sprite + sprite: _Sunrise/Structures/Wallmounts/posters.rsi + state: sunriseposter1_legit + +- type: entity + parent: PosterBase + id: PosterLegitAIOverseer + name: "ИИ видит" + description: "Автоматизировать можно всё, даже Службу Безопасности." + components: + - type: Sprite + sprite: _Sunrise/Structures/Wallmounts/posters.rsi + state: sunriseposter2_legit diff --git a/Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/meta.json deleted file mode 100644 index 300942ec7be..00000000000 --- a/Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "Made for SUNRISE by discord: pressf6151", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "poster" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json new file mode 100644 index 00000000000..1f754951cea --- /dev/null +++ b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Made for SUNRISE sunriseposter1_legit made by discord: pressf6151. sunriseposter2_legit made by discord: rinary.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sunriseposter1_legit" + }, + { + "name": "sunriseposter2_legit" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/poster.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png similarity index 100% rename from Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/poster.png rename to Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..7ffe440ed197798042f5087b18e68754defe0f0d GIT binary patch literal 871 zcmV-t1DO1YP)Px&2T4RhR9J=OS3PLkKotH?GI5*)Zvi3C{+-Fx5r zJDq`>PK**REG+OK2*4PFs;bE4a!?cnj4?3A;QKzh-7ZvBg{rCmfb;Wn0D$lN7#|;p zqA1{;BbUn|o6W-aeJF~8gM)(spBWMrV`#NnR~za@UTp8exo)&Sdf^QGt;Fvf1pVh8QDzS1J#w+wGeKuZP!%hX8;^+W-K}s{2yI6#WkFqNqE0C#Rr2;J7FmjHmr&p!YF zZ2Ke1<+$}n*3I8y!G`i6KP zsRWNUHwAhCqLJcMwXA_@h*Er#QUjQupXX1ve~2aol>(A7CN4Xj_09jS(q{m@x*meK=D9^0tgR` zKgv&0`=ah(ZhZqa+eTi~P%%v$JC1lNrir|!iPXnWL0J!xJup2z&7bY=CYmVZWoJWl z=Hq)tYC-@!{33>5H_o}ZbVOyskYpXPX22&|0$ta|hGDmyVV96lFI#tM4_pV40K&U| zG~L$0000EWmrjOO-%qQ00008000000002eQ Date: Tue, 22 Oct 2024 12:40:25 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Наверное --- .../_sunrise/entities/structures/wallmounts/signs/posters.ftl | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl new file mode 100644 index 00000000000..6eae32247aa --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl @@ -0,0 +1,4 @@ +ent-PosterContrabandAriralInSpace = Арирал в космосе + .desc = Это явно послание.. Что-то я забыл.. +ent-PosterLegitAIOverseer = ИИ видит + .desc = Автоматизировать можно всё, даже Службу Безопасности. From b3a02103a3edacc8d44f0db215befb0038c5a477 Mon Sep 17 00:00:00 2001 From: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:49:43 +0300 Subject: [PATCH 3/8] weh weh --- .../Entities/Structures/Wallmounts/Signs/posters.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml index 6bf5775a284..7d2a81928e6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml @@ -1,8 +1,8 @@ - type: entity parent: PosterBase id: PosterContrabandAriralInSpace - name: "Арирал в космосе" - description: "Это явно послание.. Что-то я забыл.." + name: "Ariral in Space" + description: "This message..My memmory betrays me.." components: - type: Sprite sprite: _Sunrise/Structures/Wallmounts/posters.rsi @@ -11,8 +11,8 @@ - type: entity parent: PosterBase id: PosterLegitAIOverseer - name: "ИИ видит" - description: "Автоматизировать можно всё, даже Службу Безопасности." + name: "AI is watching" + description: "Anything can be automated, Security included" components: - type: Sprite sprite: _Sunrise/Structures/Wallmounts/posters.rsi From 0d355afbf4e2732ec0a8001e09889374a135bcb4 Mon Sep 17 00:00:00 2001 From: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:59:44 +0300 Subject: [PATCH 4/8] =?UTF-8?q?NN=20=D0=BD=D0=B5=20=D0=B2=D0=B8=D0=B4?= =?UTF-8?q?=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../posters.rsi/sunriseposter2_legit.png | Bin 871 -> 871 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png index 7ffe440ed197798042f5087b18e68754defe0f0d..e06789d2e50ec197661100f34e82aa8a6db9f346 100644 GIT binary patch delta 793 zcmV+!1Lpka2ImHlIe(WwXcJK!$3J%$nx-w?3YXqs1Jcqzq{XGEbCg1G>fj^@8C(>c z#YHKCi=gYRLcuJB1EB#s*+K`0*eC?y>`;=q)TT$9Jcn|x$=!R+RjW&XaO8LI_wM)m z{{Fr93tV+FREyKo)1uvOV;BaOWs%8bFijJ~Ffa^*AP8u+T7OuUg=JX)oSd8h5Cj2( zgM*l+i4cNJCPO-%CI|vd(`0*lyT@iqiOMjj*Xx(->ZxO~HS;10gb)|vW5&$5IVFG~ z2oeKHvK~^W(@6%P-EN<2+%V#$qg(GLm19Z(>2zAFL}#R*ae!8JF0qAns z?PU@^N~#nn+kddr>F|7K2Y~8c4uA=3ORHE#KifCSJHFJBcYIzgEF=RUgph{wj!$(j z$Ea=dd3Tpar6Tt&mr9Z^yRPK3g#x#)`OVueQnvc;DFF8$ zzX8DW-cl?+QOdsjIPB58c6T^tQwd;xeqKzx-X!n%(n}p})@t0Eoz=?MJ&)y5iRxZX z2|$^Gfq?7BxG3xwpX7V}<1=Lx);*7rT#f_Z*UBfC zR^e%g)W75)fx!IOF&Stp_!UMh7NArf+?sOj5M1xj!5L|5OkKMcd^`tEO{XO^xoZj z-}^hAftyZ@5-uz(@E{1l7=x;+$mMcS6a|biFvj5fKDym5RDV^4s;U5h^Ye26fbaVl zA0LOJDBzqUm&+lW&BFJ6D2jrEgM$H|84?v^Xti2b8|p=137ImA0nYhIe8QQMbVma4 zeLoe5H1a6*dcAZ2f*_C@VT_T^Wb!Ccfsp{R+3cl;7$bXEDi5jK?WO}j)#@rJH2_&E zqY+Qhm*~Q87(4 z+6D=LEWy~=7=V5Q<~2>~0L|v*di0xchtQE3SX*1;+M6%pz4iGOnT48dW6Cga>^M^W z-1>%iAAhL?k2W_2dH|x4;#9S)foX_Re3DWFn4h2LPq%-FCIsYJkWoDPqVC}B@^Zqb z^dQ=IPY1>jNcKW>_GMWZM&wa^c6J5;nC$g05OeDrs9F{}o`;U-p=w!}G7Ry=bx}a^ zK!ySc4~##`Pf`1#?qF_x12x-5Uei!9O&mLpcz-IUiM*zX)W=UjSr3stFg-oZpY84@ znkeLDXG3)6<9kMGLI6DcB8Fc#&bhdBL}kK|WF4_)z$aM(UDw5iVYi%Nmyl2|TX$&> zTnCW=!n=Mn-PZ~rlest^;w7N?_-~y5Cjhbx#Iq6pQ=;Vm1t62jBn-!!N#>N&hy2XU XOb%*bH;4WLcEo|0bnj`>lR*O}ZWDE5 From 73597a0e0fa7d1b184a41c0cac950c8a437f3ea6 Mon Sep 17 00:00:00 2001 From: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:02:05 +0300 Subject: [PATCH 5/8] weh weh --- .../_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml index 7d2a81928e6..85181212399 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml @@ -1,8 +1,8 @@ - type: entity parent: PosterBase id: PosterContrabandAriralInSpace - name: "Ariral in Space" - description: "This message..My memmory betrays me.." + name: "Арирал в космосе" + description: "Это явно послание.. Что-то я забыл.." components: - type: Sprite sprite: _Sunrise/Structures/Wallmounts/posters.rsi From 53107c9aff32603aed7ee93168caa8e2a346ec29 Mon Sep 17 00:00:00 2001 From: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:44:18 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Изменены названия по стандартам --- .../Structures/Wallmounts/Signs/posters.yml | 4 ++-- .../Wallmounts/posters.rsi/meta.json | 6 +++--- .../posters.rsi/sunriseposter1_contraband.png | Bin 0 -> 4109 bytes .../posters.rsi/sunriseposter1_legit.png | Bin 4109 -> 871 bytes .../posters.rsi/sunriseposter2_legit.png | Bin 871 -> 0 bytes 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_contraband.png delete mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml index 85181212399..6a29bafabfe 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml @@ -6,7 +6,7 @@ components: - type: Sprite sprite: _Sunrise/Structures/Wallmounts/posters.rsi - state: sunriseposter1_legit + state: sunriseposter1_contraband - type: entity parent: PosterBase @@ -16,4 +16,4 @@ components: - type: Sprite sprite: _Sunrise/Structures/Wallmounts/posters.rsi - state: sunriseposter2_legit + state: sunriseposter1_legit diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json index 1f754951cea..31f1962388f 100644 --- a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json @@ -1,17 +1,17 @@ { "version": 1, "license": "CLA", - "copyright": "Made for SUNRISE sunriseposter1_legit made by discord: pressf6151. sunriseposter2_legit made by discord: rinary.", + "copyright": "Made for SUNRISE sunriseposter1_contraband made by discord: pressf6151. sunriseposter1_legit made by discord: rinary.", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "sunriseposter1_legit" + "name": "sunriseposter1_contraband" }, { - "name": "sunriseposter2_legit" + "name": "sunriseposter1_legit" } ] } diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_contraband.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..7e7b5ae8abeb6ad4cd484c4b4ffd275a08b7369c GIT binary patch literal 4109 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png index 7e7b5ae8abeb6ad4cd484c4b4ffd275a08b7369c..e06789d2e50ec197661100f34e82aa8a6db9f346 100644 GIT binary patch delta 849 zcmV-X1FrmyAm;{Px&2T4RhR9J=Omp^C|Q5?rVcNdzbE!_&2 z-e3dL(m$ldrKoe1LU8KfBnTN?6r9CHDT0fj>#ah;EQJH10Xx}32Zz`w1mWyZlDX8T zN1Hr{a<9qVd(Bm=OMh_WcklP^_xt|-z4r@Tbuv_o)6>(U-G6Rl7zUPQk;!B*O%uZ~ zFbsnr2xzrhSeAulSpb}zoB$960fU2sn5Kykf=nhuI-Mp60!-6ndwaXbW=e_5FsRq- zm+R`OW3e^!A_{~M7vf{a%(yuvfFKAG14*(TQm4~N2B6(;pKIJO;-#Zo?Ou+!=Ad}jxM>Rt|j32RHMSVceE zH_1D`)RA|5UM(yn10aNuhVzb3buY)LZS#3|mqw)`_br!7k}tci^GYhm8hh*X2&J$hznCtbaEu750loCafmay|YND04NhS zGczL|tbS#yaRk7P>qAnu`tB(J_aDCj!1LZxEIv`nzWg}s(YtncIA&7`V19mHOuXJC z@A%S79c|WX+?t)$%GW)QnSz0V0pP3vM{QecfLiT*IcG(=&Qpdw>1oGi4OkJ&%!GjsxG<$|sjr5U+*q-q%H;A1ROGX zl^C^c8T#lcsH-7m4UCPAiANh7u_6k2-PzFH^U-fERD^&CZ^ZC+3kQzw!K3@u)a_I3 z>9MIyf#W#xgMMRHzd-L>n1OJ1R0K!>6$(;930Hji<$3rv)Dn9xf<^KqPE&|bL zgi8OERO^2QAeBnR6i16mXH+E*`SJ1b#K5i&{RVc#ftUpA3KReU01jnXNoGw=04e|g b00;m8000000Mb*F00000NkvXXu0mjfv5}N8 literal 4109 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 diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_legit.png deleted file mode 100644 index e06789d2e50ec197661100f34e82aa8a6db9f346..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 871 zcmV-t1DO1YP)Px&2T4RhR9J=Omp^C|Q5?rVcNdzbE!_&2-e3dL(m$ldrKoe1LU8KfBnTN?6r9CH zDT0fj>#ah;EQJH10Xx}32Zz`w1mWyZlDX8TN1Hr{a<9qVd(Bm=OMh_WcklP^_xt|- zz4r@Tbuv_o)6>(U-ELzT29{-!$z(816T>ht41*vDXti2cmW5?m0Gynh01yNLgM)*Z zril=OOeRA*ohAqZOw(k0d%MSGN{PxasMqV4>*}dvu{HA|3WN|B;$z0lxH%<&AP5oz zNwOYNr_)IWpxthtYuqs6rK4N#CY57K0O@pEt3+p{pK*XztCb9ZDp!|5i2>+x+3jT# zK1!+-DBG~p>F|7K2Y~8c4uA=3ORHE#KifCSJHFJBcYIzgEF=RUgph{wj!$(j$Ea=d zd3Tpar6Tt&mr9Z^yRPK3g#x#)`ORwI>K$(Jp zfdSyG07q?GYk*qqd^u-DxTcUPBe1x*DC`%X z5U+*q-q%H;A1ROGwpG7`1H~`sgXBt083#jE#+nM;jZlA_{rk+0fnd z(QhtPgn$Td#PD_t2afK+qx;s>?NjXOv8haf<2dqzeq&a@K_ryx_MKY;|AUkO!dXAb zocB)vq*ABHLo@{{KKdKw{|JCC0?}xM|CChge+3|wO2rgMi%DlxB@g-W@$tmKt`7YM xcEo|01nUYE0000EWmrjOO-%qQ00008000000002eQ Date: Wed, 23 Oct 2024 11:36:26 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=81=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit удалена лишняя локализация во избежание конфликтов --- .../_sunrise/entities/structures/wallmounts/signs/posters.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl index 6eae32247aa..e5b9074517e 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl @@ -1,4 +1,2 @@ -ent-PosterContrabandAriralInSpace = Арирал в космосе - .desc = Это явно послание.. Что-то я забыл.. ent-PosterLegitAIOverseer = ИИ видит .desc = Автоматизировать можно всё, даже Службу Безопасности. From e09ed11f5cb5aa5c3a7fbc80a7240706c19dfe78 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 30 Oct 2024 10:38:05 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Sunrise/Entities/Structures/Decoration/posters.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml deleted file mode 100644 index 8c68893e0da..00000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: PosterBase - id: PosterAriralInSpace - name: ariral in space - description: It's clearly a message.. I've forgotten something... - components: - - type: Sprite - sprite: _Sunrise/Structures/Decoration/poster.rsi - state: poster \ No newline at end of file