From d760ec7df0e0870cd031bedbfcd17e95bb7f893c Mon Sep 17 00:00:00 2001 From: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:38:41 +0300 Subject: [PATCH] =?UTF-8?q?"=D0=98=D0=98=20=D0=B2=D0=B8=D0=B4=D0=B8=D1=82"?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D1=82=D0=B5=D1=80=20(#533)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * weh weh * Локализация вроде Наверное * weh weh * NN не видит * weh weh * Названия файлов Изменены названия по стандартам * лишний текст удалена лишняя локализация во избежание конфликтов * ы --------- Co-authored-by: Vigers Ray --- .../structures/wallmounts/signs/posters.ftl | 2 ++ .../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 ++++++++++++++++ .../sunriseposter1_contraband.png} | Bin .../posters.rsi/sunriseposter1_legit.png | Bin 0 -> 871 bytes 8 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl 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_contraband.png} (100%) create mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png 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 0000000000..e5b9074517 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl @@ -0,0 +1,2 @@ +ent-PosterLegitAIOverseer = ИИ видит + .desc = Автоматизировать можно всё, даже Службу Безопасности. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 90bf147542..0d15eadc6e 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 8c68893e0d..0000000000 --- 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 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 0000000000..6a29bafabf --- /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_contraband + +- type: entity + parent: PosterBase + id: PosterLegitAIOverseer + name: "AI is watching" + description: "Anything can be automated, Security included" + components: + - type: Sprite + sprite: _Sunrise/Structures/Wallmounts/posters.rsi + state: sunriseposter1_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 300942ec7b..0000000000 --- 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 0000000000..31f1962388 --- /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_contraband made by discord: pressf6151. sunriseposter1_legit made by discord: rinary.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sunriseposter1_contraband" + }, + { + "name": "sunriseposter1_legit" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Structures/Decoration/poster.rsi/poster.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_contraband.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_contraband.png diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter1_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..e06789d2e50ec197661100f34e82aa8a6db9f346 GIT binary patch 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