From f3245be21c09be56bf3259ebad4f36c1723e8b96 Mon Sep 17 00:00:00 2001 From: pacable <77161122+pxc1984@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:10:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=BE=D0=B7=D0=B0=20=D0=BE=D1=82=20Makao?= =?UTF-8?q?=20(#377)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * makao sprite security Signed-off-by: pacable * added potted rose Signed-off-by: pacable * Revert "makao sprite security" This reverts commit aa9d52447a415142003c75c81151cc720d6c4414. * resize --------- Signed-off-by: pacable --- .../structures/furniture/potted_plants.ftl | 2 ++ .../structures/furniture/potted_plants.ftl | 2 ++ .../Markers/Spawners/Random/pottedplants.yml | 1 + .../Structures/Furniture/potted_plants.yml | 8 ++++++++ .../Furniture/potted_plants.rsi/meta.json | 5 ++++- .../Furniture/potted_plants.rsi/plant-9.png | Bin 0 -> 1891 bytes 6 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/plant-9.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl index 62c7943994..5404d24376 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl @@ -16,3 +16,5 @@ ent-PottedPlantAlt7 = { ent-PottedPlantBase } .desc = { ent-PottedPlantBase.desc } ent-PottedPlantAlt8 = { ent-PottedPlantBase } .desc = { ent-PottedPlantBase.desc } +ent-PottedPlantAlt9 = { ent-PottedPlantBase } + .desc = { ent-PottedPlantBase.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl index 62c7943994..5404d24376 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/furniture/potted_plants.ftl @@ -16,3 +16,5 @@ ent-PottedPlantAlt7 = { ent-PottedPlantBase } .desc = { ent-PottedPlantBase.desc } ent-PottedPlantAlt8 = { ent-PottedPlantBase } .desc = { ent-PottedPlantBase.desc } +ent-PottedPlantAlt9 = { ent-PottedPlantBase } + .desc = { ent-PottedPlantBase.desc } diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml index 2b721dfe05..6693ebc923 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml @@ -16,6 +16,7 @@ - PottedPlantAlt2 - PottedPlantAlt3 - PottedPlantAlt4 + - PottedPlantAlt9 # Sunrise-edit - PottedPlant0 - PottedPlant1 - PottedPlant2 diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/potted_plants.yml index 98f1609d51..623809fd64 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Furniture/potted_plants.yml @@ -69,3 +69,11 @@ - type: Sprite sprite: _Sunrise/Structures/Furniture/potted_plants.rsi state: plant-8 + +- type: entity + id: PottedPlantAlt9 + parent: PottedPlantBase + components: + - type: Sprite + sprite: _Sunrise/Structures/Furniture/potted_plants.rsi + state: plant-9 diff --git a/Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/meta.json index 8ad95adb06..0dc6441a39 100644 --- a/Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/blob/692fef2ac49465fe269aa4168920a79d64ffd4ea/modular_skyrat/modules/aesthetics/plants/plants.dmi", + "copyright": "Taken from Skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/blob/692fef2ac49465fe269aa4168920a79d64ffd4ea/modular_skyrat/modules/aesthetics/plants/plants.dmi, plant-9 sprited by discord: @Makao", "size": { "x": 32, "y": 32 @@ -81,6 +81,9 @@ 0.1 ] ] + }, + { + "name": "plant-9" } ] } diff --git a/Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/plant-9.png b/Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi/plant-9.png new file mode 100644 index 0000000000000000000000000000000000000000..ed1987024b1ea9634ca754f43ea98d6b039ced20 GIT binary patch literal 1891 zcmZ{lcTm$?7RP^pN_%wa%}6nUz$TOpRm!7C?@f6Tq!R*2LT4XHla7xTKoSCo5VCZF zgeFbO69`4&Q3EPGct}wY2Bd79o!Ob4oxNwyIro0g`ONpvn{I1u%EckZ0RRA(**znB zM!)qV*={f@CMM?S$HVKMy%hk&$OAw^G60-0q=YR12!{c{UmgIURSW>ap=F(RI*h@M zM;4|=!2XZuA5Xf@P*|~MR>rJb?A(Itg4|r5Zy7rfGa~~>*TG%fFF_J6f+O)Kt0nk_ z1@TIX9*b5pQf}G^~A?BSC5+M?e^IfZr3kxMwO!Uun{GY7~5gH*UlcMIypH#kWZfY)Rofir>xpl!oQ;lfha+IlYO)8^&W#O>A?QP83H(KJNm*n};uI_uy5)s9XqGG$yCprGp8&jK= z4%p9hq}#T~njgVYujiu>!#A6E?GO839|s)>3Xaiy9~H`_1R{uw>~5T~-LIpcaf|iL zd24b*?v&cO+Z}x#$hNKtZC+W%+zs~O>!uvguXi{xnVJ>w%Gl-oTH~IXBip0#&_>1* zDv}{bQgU0+%nCFe4aPn1y*o7TWyuGphot)ZX) zfip$_OCxdOcnst_%yE--1t-0XIOsX0?sYnM*K=B%z#Y;|CSKUQ&s%%nxvk?YeGCyc z1>=fH(1G4BAgL9dp+Hs73NhOvP<8AG$@-Ki@ButmmwzyY?_4W|>pMZ`3=u^}Kjx9UskiP7cb^l>!9JE?z zY4O0N_0j!Y2Osvb0ACosF0 zE<3X?>NUVc4!H&-JkiMUt=Xq5m&cvWUY!r3UhCu?-LB)=1L4oWOe`-BTicd!1Bv)^ zxpXW|1i4ca^$-Y=p!Sg+aPj#V{GdgqOFT}=dM3DS;c95!BQ#^CknEn@sfNS6wZcol zi(K&EXW)yuCy1ROwx;hBUS)(5?+W+FoIhWW(E0KYsN4bqNfa{>K^p_}N){pqWsdo= zhaw>-q=aQKNIf-kzmP!V;(FbNrm;kwGV`ECEBO1vT=Jz4O3GG$pZnf!$413igcJb<`cOQR6L(*D-MN>btvcT{LzQJ73snRjR)AZR5*S!f%1gJ0GQqD@ z&2F+o5XbR!pqg{vW9F!{@KC`bbEA2C_e3>(|L^h`Wkq~(N(^2cgDGg7+zzci3oezF z1R>7bE(OGWIY3SBC&B@U^9XYHJ1Vji(Syugh#7ysp@k3@0^>HVI_&Z4!*TtRO31yg z7(D<8xH+vbQEscbuXul_7D?hgj(IUmq?mwrpu=%@vn#_I?|0>&iPJe1TK|k*-{OJw zHqv{djJ++-+>3|W@y(=qN9yD79AZnDX7)#1HCjBu;trA;3jliOV-|5=*Df#0qrCTX zQ#mh#)pZOTVE5|O?b%w~B0E~=z|UU#@!hT)C+v%_(W!kK%gIiXj86mL_Hi}ywXy;f z7C{x~xZ`HU)uHFm{%dt!aGyuy4K4N!rps42lTmEdZQDsU}zRV_G75eCzO!CozG zNcDL;sgif&bftiV6iY7{JWf+Ni