From 073f234ae6825cbdf95a3d8d21dd04fc5ec71527 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Tue, 7 May 2024 21:25:52 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B9=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BB=20=D1=81=D0=B5=D0=BC=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=BC=D1=8F=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/newchems.yml | 108 ++++++++++++++++++ .../Andromeda/Evil Prototype's/newseeds.yml | 59 +++++++++- .../Textures/Andromeda/Evil/mint.rsi/dead.png | Bin 0 -> 343 bytes .../Andromeda/Evil/mint.rsi/harvest.png | Bin 0 -> 446 bytes .../Andromeda/Evil/mint.rsi/meta.json | 38 ++++++ .../Andromeda/Evil/mint.rsi/produce.png | Bin 0 -> 432 bytes .../Textures/Andromeda/Evil/mint.rsi/seed.png | Bin 0 -> 289 bytes .../Andromeda/Evil/mint.rsi/stage-1.png | Bin 0 -> 172 bytes .../Andromeda/Evil/mint.rsi/stage-2.png | Bin 0 -> 229 bytes .../Andromeda/Evil/mint.rsi/stage-3.png | Bin 0 -> 277 bytes .../Andromeda/Evil/mint.rsi/stage-4.png | Bin 0 -> 361 bytes .../Andromeda/Evil/mint.rsi/stage-5.png | Bin 0 -> 378 bytes 12 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/dead.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/harvest.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/meta.json create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/produce.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/seed.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/stage-1.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/stage-2.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/stage-3.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/stage-4.png create mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/stage-5.png diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml new file mode 100644 index 00000000000..182ae1a11b8 --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml @@ -0,0 +1,108 @@ +- type: reagent + id: MintExtract + name: Экстракт мяты + parent: BaseJuice + desc: Приятно пахнущий мятный экстракт + physicalDesc: мятное + flavor: мятно + color: "#18ad45" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + - !type:MovespeedModifier + walkSpeedModifier: 1.1 + sprintSpeedModifier: 1.1 + +- type: reagent + id: CatNipExtract + name: Экстракт котовика + parent: BaseJuice + desc: Подозрительно муррчащий экстракт котовика + physicalDesc: котомятное + flavor: котомятно + color: "#18ad45" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + conditions: + - !type:OrganType + type: Felinid #Разобраться с метаболизмом и прописать другой тип + - !type:MovespeedModifier + walkSpeedModifier: 1.25 + sprintSpeedModifier: 1.25 + conditions: + - !type:OrganType + type: Felinid #Разобраться с метаболизмом и прописать другой тип + - !type:Emote + emote: Meow + showInChat: true + probability: 0.5 + conditions: + - !type:OrganType + type: Felinid #Разобраться с метаболизмом и прописать другой тип + +- type: reagent + id: MilkThatMakesYouMurr + name: Милоко + group: Special + desc: Чистая сущность фелинидов. Заставляет вас Муррчать! + physicalDesc: муррчащее + flavor: муррчащее + color: "#dcf0ea" + metabolisms: + Poison: + metabolismRate: 0.5 + effects: + - !type:Emote + emote: CatMeow #Разобраться со звуками Молей + showInChat: true + probability: 0.25 + - !type:Polymorph + prototype: CatPoly + conditions: + - !type:ReagentThreshold + min: 30 + - !type:AdjustReagent + reagent: MilkThatMakesYouMurr + amount: -20 + conditions: + - !type:ReagentThreshold + min: 30 + +- type: polymorph + id: CatPoly + configuration: + entity: MobCat + forced: true + transferName: true + transferHumanoidAppearance: true + inventory: None + revertOnDeath: true + revertOnCrit: true + duration: 30 + +- type: reaction + id: MilkThatMakesYouMurr + reactants: + MintExtract: + amount: 1 + Milk: + amount: 1 + products: + MilkThatMakesYouMurr: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml index 9ce8d3c742a..94071eab80b 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml @@ -1,5 +1,5 @@ - type: seed - id: meatwheat + id: meatwheat # Мясная пшеница name: мясная пшеница noun: seeds-noun-seeds displayName: стебли мясной пшеницы @@ -53,4 +53,59 @@ trash: FoodMeat - type: Tag tags: - - Wheat \ No newline at end of file + - Wheat + +- type: seed + id: mintplant # Мята + name: мята + noun: seeds-noun-seeds + displayName: куст мяты + suffix: Андромеда + plantRsi: Andromeda/Evil/mint.rsi + packetPrototype: MintPlantSeeds + productPrototypes: + - MintPlantLeaves + lifespan: 50 + maturation: 6 + production: 6 + yield: 2 + potency: 5 + idealLight: 9 + chemicals: + MintExtract: + Min: 1 + Max: 20 + PotencyDivisor: 20 + +- type: entity + parent: SeedBase + name: пакет семян (мята) + suffix: Андромеда + id: MintPlantSeeds + components: + - type: Seed + seedId: mintplant + - type: Sprite + sprite: Andromeda/Evil/mint.rsi + +- type: entity + name: листы мяты + description: Приятно пахнущие мятные листы. + suffix: Андромеда + id: MintPlantLeaves + parent: FoodProduceBase + components: + - type: Sprite + sprite: Andromeda/Evil/mint.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: MintExtract + Quantity: 20 + - type: Produce + seedId: mintplant + - type: Tag + tags: + - Fruit # Для ботанической сумки ЭТО фрукт \ No newline at end of file diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/dead.png b/Resources/Textures/Andromeda/Evil/mint.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..25d398c8f90d43fbf2f7c181dfe0a968a43a8ac0 GIT binary patch literal 343 zcmV-d0jU0oP)fy+D^PJr0W(Zomb&0W${*lTqqAw$mViM4nVt`MhVxp9G-d zmw||39{aGBKaYJt#DIuNjV5In0AQM?W*+-+IG%yVmeJVQ^KpmE_14h5hrdD`0qrCj zH<$M|Mk&Yp<8lk pY&yXOhOQ0tSwbb;ii(Q=#tRV9dO^_nQ9}R#002ovPDHLkV1goimk8eR=R!QY-Pjv*HQ zPXpghYBCUrj*dDPeB$^1wVvB#Iv!X2=e_K=$@lwW7P|-k+se<~Es#|CSoLwrLlONI z=i6fWg48A@3m(1g7O>0X^;VCCQCaF48cXK7?Ea{}+(hGQPsV4DQ)|s7bz+-lG(Wel z>dDD`u|`%Sm*x1;M>Ua6Z(E}ZJC+#6EqCU0-^TJok<&*r^}(N^<7M zPNZZ*iX>;O)xTm$Ao@3!9t@6oOY)!JDk;fYC@V0qRuN{uAX=SWnNc?3Y U>*u!E3K$Fwp00i_>zopr0BL@%{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/meta.json b/Resources/Textures/Andromeda/Evil/mint.rsi/meta.json new file mode 100644 index 00000000000..c7cd76b21a0 --- /dev/null +++ b/Resources/Textures/Andromeda/Evil/mint.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites and code by EvilBug for Andromeda-13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + } + ] +} diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/produce.png b/Resources/Textures/Andromeda/Evil/mint.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..99921c6272a51ccaf8167e2ae7eb319ffc69ca73 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUIV0u8>W$PaZ8;;2)J$yEx5tP~b`q=iQr~VRGFipqWU&273!vKO zwhiZj6mLn8U+{kS>O>_%)r2R1cVu$fl z*Uj<>7gR9G2sza8enqOlyITiM+77n$7Ac;-(0ssx!*+9$*`}=wp^2qVD;Biwo7yAI z@L5seP$P4j;4N>#{%33#6*Bm=A9}b-9T9!V&`?+Cu65~xGb8(kF6|$>Wz4q%6x`B9 zXT5m5$mESB6T8W^#qtU>Rw?`0xVs!XCedWmn$a}#vssIh@u3Sg$=7&uB&9oaA2Y=i zraoB~eT>^;d(WBZW6}jFsYmL+r`&1KINx!7@<-m9>-G%iKC@r-S2-(g$khQ11O`u6 KKbLh*2~7ZUjis&t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/seed.png b/Resources/Textures/Andromeda/Evil/mint.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..f79b8d20667f51d470794d92d71e5ed8efcb14c2 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUxiejPHWo2lY}5a=TyR1>L$W@Dmoh`I5m5g0^k;EEinAohFZe$c zFa-No2!R9(JR*x382Ao@Fyrz36)8Z$Do+>35DWje=L3Zr6gXG{raA5X-^sjW5!-U^ zE&nWjgt<$}|2*i!)KaXdHjPJOw*EOKd&l2A=^t4>%;>nt-4Hn|V?Uc!_=V`_q968g z?>qkeoZg1umr5Fq-)_J8%;i$g$dMkuKag4B*A49lNosS`4PJQh=v2l(W1nWoXCokE VzCvK-X`m|@JYD@<);T3K0RTA`WRCy< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-1.png b/Resources/Textures/Andromeda/Evil/mint.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc5a07e6a12a2a71baf4c12dc60662c53342bd5 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}X`U{QArY-_ zFB$SRD2Om$IM%Y;V8bTsO6IWhk9sZUDXy4*v-5}jv4i{e`nEH<0DbP0l+XkKQlddn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-2.png b/Resources/Textures/Andromeda/Evil/mint.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..bed4a03ad4db98697851ce3f7531977bec9342ad GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2y} z6C_v{Cy4Yk1sZU<9ZX<|Unlq30W+^lZ? zsDD_0lkWf1AG#UmKV^|U00bX?pOz^WMGx` VedERv+YEFngQu&X%Q~loCICxGRnPzc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-3.png b/Resources/Textures/Andromeda/Evil/mint.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..4b4e0af49723c492211c7055b4e70c5024e18687 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?ST-HSDR8#GfoJmXtj!>er_G+0ATL6Qghk17Buj*=k1;QtW7aIbl9 zBv6dAz$3Dlfr0NZ2s0kfUy%Y7Eb?@546*Qk+aJi+pupqI-m&|C@7guDFU10qt1Z3Dwe3=s95h%% zO+h*$KStaFQv4-Be!>4y0K=6#GZq4+I14-?iy0XB4ude`@%$AjK*3d>E{-7<{!jZO zg$^5VI8S!CtE%_iK2MON`jVge|FxSGEcxH)lr55HzIWpM*WiTIrD3-(iEQ8$4>IoK zJml3Y!H^+QwveG?hOo`9m3lqjXH+o#JIlZFWxoyM*3*CbG)(&&GFS6D?FwNL*k9t> zmHYhWgQ7!c*ZiCv`{?VreYYMh^qs5KX%Y}HH!B51A#zSGkCiCxvXO>_%)r2R2!t6$HM|;tf~P%Q978Ppp9Y-fJFLLNePQc_|NkG{ z^m~y#OYQB3(=mcK4?YR}%>QHQ!)G;T>ytGm?+BmNBrzd{C1u4ApTHd_bgtgjec#-3JDDfUivt*p|3?@t1izr{zU2;bCr1v1;5Mdx>FIv_|KI z=zv2Ff?hcb*Uj>X_Hg5lnPk$t^j%Gbkxt*NH-ZZm{&2S8*|%ofAyFp2Ee{wRq-r+n z&Mf#n`QF}gnZgG;sS7&%U)X(OFbU{s6kfS{j`5zO@e+6D2Sg|vPPxeX7U(SoPgg&e IbxsLQ06?0O%>V!Z literal 0 HcmV?d00001 From 706f989bb6c2384e986ae8b7c99651cb60bb4ac5 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Tue, 7 May 2024 23:26:45 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9A=D0=B0=D0=BA=D0=B8=D0=B5=20=D1=82?= =?UTF-8?q?=D0=BE=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Andromeda/Evil Prototype's/newchems.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml index 182ae1a11b8..0a4b1a9f2f0 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml @@ -42,20 +42,20 @@ refresh: false conditions: - !type:OrganType - type: Felinid #Разобраться с метаболизмом и прописать другой тип + type: Human #Разобраться с метаболизмом и прописать другой тип - !type:MovespeedModifier walkSpeedModifier: 1.25 sprintSpeedModifier: 1.25 conditions: - !type:OrganType - type: Felinid #Разобраться с метаболизмом и прописать другой тип + type: Human #Разобраться с метаболизмом и прописать другой тип - !type:Emote emote: Meow showInChat: true probability: 0.5 conditions: - !type:OrganType - type: Felinid #Разобраться с метаболизмом и прописать другой тип + type: Human #Разобраться с метаболизмом и прописать другой тип - type: reagent id: MilkThatMakesYouMurr From a91351a0344e117ba95b3db20e6fa99eb9be34dd Mon Sep 17 00:00:00 2001 From: EvilBug Date: Thu, 9 May 2024 01:20:22 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BC=D1=8F=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml index 94071eab80b..72fa85e4d79 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml @@ -65,9 +65,11 @@ packetPrototype: MintPlantSeeds productPrototypes: - MintPlantLeaves + harvestRepeat: Repeat lifespan: 50 maturation: 6 production: 6 + growthStages: 5 yield: 2 potency: 5 idealLight: 9 @@ -75,7 +77,7 @@ MintExtract: Min: 1 Max: 20 - PotencyDivisor: 20 + PotencyDivisor: 5 - type: entity parent: SeedBase From a61924cc8af1b3bed3b09829221c0eb5fd091ad3 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Fri, 10 May 2024 23:11:24 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=90=D0=BB=D1=8C=D1=84=D0=B0-=D1=80=D0=B5?= =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/newchems.yml | 80 +++++-- .../Andromeda/Evil Prototype's/newfood.yml | 219 ++++++++++++++++++ .../Andromeda/Evil Prototype's/newseeds.yml | 94 ++++++-- .../Evil/food/salads.rsi/bowl-trash.png | Bin 0 -> 688 bytes .../Andromeda/Evil/food/salads.rsi/bowl.png | Bin 0 -> 401 bytes .../Evil/food/salads.rsi/bowlmime.png | Bin 0 -> 400 bytes .../Andromeda/Evil/food/salads.rsi/meta.json | 29 +++ .../Evil/food/salads.rsi/salcoat.png | Bin 0 -> 954 bytes .../Evil/food/salads.rsi/salcrab.png | Bin 0 -> 863 bytes .../Evil/food/salads.rsi/salmime.png | Bin 0 -> 509 bytes .../Evil/food/tincondmilk.rsi/icon-open.png | Bin 0 -> 439 bytes .../Evil/food/tincondmilk.rsi/icon.png | Bin 0 -> 641 bytes .../Evil/food/tincondmilk.rsi/meta.json | 20 ++ .../Evil/food/tincondmilk.rsi/trash.png | Bin 0 -> 763 bytes .../Evil/food/tinerp.rsi/icon-open.png | Bin 0 -> 711 bytes .../Andromeda/Evil/food/tinerp.rsi/icon.png | Bin 0 -> 306 bytes .../Andromeda/Evil/food/tinerp.rsi/meta.json | 20 ++ .../Andromeda/Evil/food/tinerp.rsi/trash.png | Bin 0 -> 327 bytes .../Evil/food/tinporrige.rsi/icon-open.png | Bin 0 -> 674 bytes .../Evil/food/tinporrige.rsi/icon.png | Bin 0 -> 402 bytes .../Evil/food/tinporrige.rsi/meta.json | 20 ++ .../Evil/food/tinporrige.rsi/trash.png | Bin 0 -> 581 bytes .../Andromeda/Evil/mint.rsi/produce.png | Bin 432 -> 0 bytes .../{mint.rsi => plants/catnip.rsi}/dead.png | Bin .../Evil/plants/catnip.rsi/harvest.png | Bin 0 -> 491 bytes .../{mint.rsi => plants/catnip.rsi}/meta.json | 0 .../Evil/plants/catnip.rsi/produce.png | Bin 0 -> 346 bytes .../Andromeda/Evil/plants/catnip.rsi/seed.png | Bin 0 -> 283 bytes .../catnip.rsi}/stage-1.png | Bin .../catnip.rsi}/stage-2.png | Bin .../catnip.rsi}/stage-3.png | Bin .../catnip.rsi}/stage-4.png | Bin .../Evil/plants/catnip.rsi/stage-5.png | Bin 0 -> 378 bytes .../Evil/{ => plants}/meatwheat.rsi/dead.png | Bin .../{ => plants}/meatwheat.rsi/harvest.png | Bin .../Evil/{ => plants}/meatwheat.rsi/meta.json | 0 .../{ => plants}/meatwheat.rsi/produce.png | Bin .../Evil/{ => plants}/meatwheat.rsi/seed.png | Bin .../{ => plants}/meatwheat.rsi/stage-1.png | Bin .../{ => plants}/meatwheat.rsi/stage-2.png | Bin .../{ => plants}/meatwheat.rsi/stage-3.png | Bin .../{ => plants}/meatwheat.rsi/stage-4.png | Bin .../{ => plants}/meatwheat.rsi/stage-5.png | Bin .../{ => plants}/meatwheat.rsi/stage-6.png | Bin .../Andromeda/Evil/plants/mint.rsi/dead.png | Bin 0 -> 343 bytes .../Evil/{ => plants}/mint.rsi/harvest.png | Bin .../Andromeda/Evil/plants/mint.rsi/meta.json | 38 +++ .../Evil/plants/mint.rsi/produce.png | Bin 0 -> 346 bytes .../Evil/{ => plants}/mint.rsi/seed.png | Bin .../Evil/plants/mint.rsi/stage-1.png | Bin 0 -> 172 bytes .../Evil/plants/mint.rsi/stage-2.png | Bin 0 -> 229 bytes .../Evil/plants/mint.rsi/stage-3.png | Bin 0 -> 277 bytes .../Evil/plants/mint.rsi/stage-4.png | Bin 0 -> 361 bytes .../Evil/{ => plants}/mint.rsi/stage-5.png | Bin 54 files changed, 494 insertions(+), 26 deletions(-) create mode 100644 Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/bowl-trash.png create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/bowl.png create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/bowlmime.png create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/meta.json create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/salcoat.png create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/salcrab.png create mode 100644 Resources/Textures/Andromeda/Evil/food/salads.rsi/salmime.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tincondmilk.rsi/icon-open.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tincondmilk.rsi/icon.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tincondmilk.rsi/meta.json create mode 100644 Resources/Textures/Andromeda/Evil/food/tincondmilk.rsi/trash.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tinerp.rsi/icon-open.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tinerp.rsi/icon.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tinerp.rsi/meta.json create mode 100644 Resources/Textures/Andromeda/Evil/food/tinerp.rsi/trash.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/icon-open.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/icon.png create mode 100644 Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/meta.json create mode 100644 Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/trash.png delete mode 100644 Resources/Textures/Andromeda/Evil/mint.rsi/produce.png rename Resources/Textures/Andromeda/Evil/{mint.rsi => plants/catnip.rsi}/dead.png (100%) create mode 100644 Resources/Textures/Andromeda/Evil/plants/catnip.rsi/harvest.png rename Resources/Textures/Andromeda/Evil/{mint.rsi => plants/catnip.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Andromeda/Evil/plants/catnip.rsi/produce.png create mode 100644 Resources/Textures/Andromeda/Evil/plants/catnip.rsi/seed.png rename Resources/Textures/Andromeda/Evil/{mint.rsi => plants/catnip.rsi}/stage-1.png (100%) rename Resources/Textures/Andromeda/Evil/{mint.rsi => plants/catnip.rsi}/stage-2.png (100%) rename Resources/Textures/Andromeda/Evil/{mint.rsi => plants/catnip.rsi}/stage-3.png (100%) rename Resources/Textures/Andromeda/Evil/{mint.rsi => plants/catnip.rsi}/stage-4.png (100%) create mode 100644 Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-5.png rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/dead.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/harvest.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/meta.json (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/produce.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/seed.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/stage-1.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/stage-2.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/stage-3.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/stage-4.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/stage-5.png (100%) rename Resources/Textures/Andromeda/Evil/{ => plants}/meatwheat.rsi/stage-6.png (100%) create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/dead.png rename Resources/Textures/Andromeda/Evil/{ => plants}/mint.rsi/harvest.png (100%) create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/meta.json create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/produce.png rename Resources/Textures/Andromeda/Evil/{ => plants}/mint.rsi/seed.png (100%) create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-1.png create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-2.png create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-3.png create mode 100644 Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-4.png rename Resources/Textures/Andromeda/Evil/{ => plants}/mint.rsi/stage-5.png (100%) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml index 0a4b1a9f2f0..080dbe53e2e 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml @@ -1,6 +1,6 @@ - type: reagent id: MintExtract - name: Экстракт мяты + name: экстракт мяты parent: BaseJuice desc: Приятно пахнущий мятный экстракт physicalDesc: мятное @@ -14,12 +14,12 @@ types: Poison: -1 - !type:MovespeedModifier - walkSpeedModifier: 1.1 - sprintSpeedModifier: 1.1 + walkSpeedModifier: 1.05 + sprintSpeedModifier: 1.05 - type: reagent id: CatNipExtract - name: Экстракт котовика + name: экстракт котовика parent: BaseJuice desc: Подозрительно муррчащий экстракт котовика physicalDesc: котомятное @@ -42,24 +42,31 @@ refresh: false conditions: - !type:OrganType - type: Human #Разобраться с метаболизмом и прописать другой тип + type: Animal - !type:MovespeedModifier - walkSpeedModifier: 1.25 - sprintSpeedModifier: 1.25 + walkSpeedModifier: 1.15 + sprintSpeedModifier: 1.15 conditions: - !type:OrganType - type: Human #Разобраться с метаболизмом и прописать другой тип + type: Animal - !type:Emote emote: Meow showInChat: true - probability: 0.5 + probability: 0.05 conditions: - !type:OrganType - type: Human #Разобраться с метаболизмом и прописать другой тип + type: Animal + - !type:Emote + emote: Mew + showInChat: true + probability: 0.05 + conditions: + - !type:OrganType + type: Animal - type: reagent id: MilkThatMakesYouMurr - name: Милоко + name: милоко group: Special desc: Чистая сущность фелинидов. Заставляет вас Муррчать! physicalDesc: муррчащее @@ -69,10 +76,57 @@ Poison: metabolismRate: 0.5 effects: + - !type:PopupMessage + type: Local + conditions: + - !type:ReagentThreshold + reagent: MilkThatMakesYouMurr + max: 10 + visualType: Medium + messages: ["Вы ощущаете приятное муррчание", "Вы чувствуете желание муррчать", "Вы чувствуете слабое желание гладить Лемирду"] + probability: 0.15 + - !type:PopupMessage + type: Local + conditions: + - !type:ReagentThreshold + reagent: MilkThatMakesYouMurr + min: 11 + max: 20 + visualType: Medium + messages: ["Ваше желание муррчать усиливается", "Вы отчаянно муррчите", "Вы очень хотите погладить Лемирду"] + probability: 0.15 + - !type:PopupMessage + type: Local + conditions: + - !type:ReagentThreshold + reagent: MilkThatMakesYouMurr + min: 21 + max: 30 + visualType: Medium + messages: ["Вы очень хотите потискать Лемирду", "Вы хотите поиграть с клубком ниток"] + probability: 0.15 - !type:Emote - emote: CatMeow #Разобраться со звуками Молей + emote: CatMeow showInChat: true + conditions: + - !type:OrganType + type: Animal + shouldHave: false probability: 0.25 + - !type:Emote + emote: Meow + showInChat: true + probability: 0.05 + conditions: + - !type:OrganType + type: Animal + - !type:Emote + emote: Mew + showInChat: true + probability: 0.05 + conditions: + - !type:OrganType + type: Animal - !type:Polymorph prototype: CatPoly conditions: @@ -100,7 +154,7 @@ - type: reaction id: MilkThatMakesYouMurr reactants: - MintExtract: + CatNipExtract: amount: 1 Milk: amount: 1 diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml new file mode 100644 index 00000000000..781ee5f3d64 --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml @@ -0,0 +1,219 @@ +- type: entity + parent: FoodBowlBase + id: FoodBowlBaseNew + abstract: true + components: + - type: Sprite + sprite: Andromeda/Evil/food/salads.rsi + +- type: entity + name: селедка под шубой + parent: FoodBowlBaseNew + id: SalCoat + description: Созданная по рецепту из далёкой древности, с добавлением космических ингредиентов, она... Это что, карп в шубе?! Только не показывайте его нианам! + components: + - type: FlavorProfile + flavors: + - fishy + - mayonnaise + - egg + - type: Sprite + layers: + - state: bowl + - state: salcoat + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 10 + +- type: entity + name: крабовый салат + parent: FoodBowlBaseNew + id: SalCrab + description: У него есть всё, чего нет у оливье! Кукуруза, достоинство и две большие клешни! + components: + - type: FlavorProfile + flavors: + - fishy + - mayonnaise + - egg + - type: Sprite + layers: + - state: bowl + - state: salcrab + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 10 + +- type: entity + name: салат мимоза + parent: FoodBowlBaseNew + id: SalMime + description: Смотря этот салат, вы понимаете, что будете молчаливо осуждены, если выберете другое блюдо! + components: + - type: FlavorProfile + flavors: + - fishy + - mayonnaise + - egg + - type: Sprite + layers: + - state: bowlmime + - state: salmime + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: MuteToxin + Quantity: 10 + +- type: microwaveMealRecipe + id: RecipeSalCoat + name: рецепт селедки под шубой + result: SalCoat + time: 5 + solids: + FoodBowlBig: 1 + FoodPotato: 1 + FoodCarrot: 1 + FoodEgg: 2 + FoodMeatFish: 1 + reagents: + Mayo: 15 + +- type: microwaveMealRecipe + id: RecipeSalCrab + name: рецепт крабового салата + result: SalCrab + time: 5 + solids: + FoodBowlBig: 1 + FoodCorn: 1 + FoodEgg: 2 + FoodMeatCrab: 1 + reagents: + Mayo: 10 + Rice: 10 + +- type: microwaveMealRecipe + id: RecipeSalMime + name: рецепт салата мимоза + result: SalMime + time: 5 + solids: + FoodBowlBig: 1 + FoodPotato: 1 + FoodCarrot: 1 + FoodEgg: 1 + FoodMeatFish: 1 + FoodPineapple: 1 + reagents: + Mayo: 10 + +- type: entity + parent: FoodTinBase + id: FoodTinCondMilk + name: банка сгущенки + description: Целая банка знаменитой сгущёнки! Вызывает у многих людей приятные воспоминания о прошлом. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Milk + Quantity: 15 + - ReagentId: Sugar + Quantity: 5 + - type: Sprite + sprite: Andromeda/Evil/food/tincondmilk.rsi + - type: FlavorProfile + flavors: + - sweet + - milk + - type: Food + trash: FoodTinCondMilkTrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinCondMilkTrash + name: банка сгущенки + components: + - type: Sprite + sprite: Andromeda/Evil/food/tincondmilk.rsi + +- type: entity + parent: FoodTinBase + id: FoodTinPorrige + name: консервированная каша + description: Старая консерва, заполненная самой настоящей кашей! Судя по внешнему виду гречка с тушенкой, приправленная специями! Слово "вульпятина" почему-то зачеркнуто. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 10 + - type: Sprite + sprite: Andromeda/Evil/food/tinporrige.rsi + - type: FlavorProfile + flavors: + - meaty + - spicy + - type: Food + trash: FoodTinPorrigeTrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinPorrigeTrash + name: консервированная каша + components: + - type: Sprite + sprite: Andromeda/Evil/food/tinporrige.rsi + +- type: entity + parent: FoodTinBase + id: FoodTinErp + name: консервированная хорнятина + description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом. На обратной стороне можно заметить чтото про натуральный вульпяшные ингредиенты. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Aphrodisiac + Quantity: 20 + - type: Sprite + sprite: Andromeda/Evil/food/tinerp.rsi + - type: FlavorProfile + flavors: + - meaty + - spicy + - type: Food + trash: FoodTinErpTrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinErpTrash + name: консервированная хорнятина + components: + - type: Sprite + sprite: Andromeda/Evil/food/tinerp.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml index 72fa85e4d79..3c594d8ffbc 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newseeds.yml @@ -1,10 +1,13 @@ +- type: Tag + id: Herb + - type: seed - id: meatwheat # Мясная пшеница + id: meatwheat name: мясная пшеница noun: seeds-noun-seeds displayName: стебли мясной пшеницы suffix: Андромеда - plantRsi: Andromeda/Evil/meatwheat.rsi + plantRsi: Andromeda/Evil/plants/meatwheat.rsi packetPrototype: MeatWheatSeeds productPrototypes: - MeatWheatBushel @@ -17,7 +20,7 @@ chemicals: Nutriment: Min: 1 - Max: 20 + Max: 5 PotencyDivisor: 20 - type: entity @@ -29,7 +32,7 @@ - type: Seed seedId: meatwheat - type: Sprite - sprite: Andromeda/Evil/meatwheat.rsi + sprite: Andromeda/Evil/plants/meatwheat.rsi - type: entity name: сноп мясной пшеницы @@ -39,14 +42,14 @@ parent: FoodProduceBase components: - type: Sprite - sprite: Andromeda/Evil/meatwheat.rsi + sprite: Andromeda/Evil/plants/meatwheat.rsi - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 20 + Quantity: 5 - type: Produce seedId: meatwheat - type: Food @@ -56,12 +59,12 @@ - Wheat - type: seed - id: mintplant # Мята + id: mintplant name: мята noun: seeds-noun-seeds displayName: куст мяты suffix: Андромеда - plantRsi: Andromeda/Evil/mint.rsi + plantRsi: Andromeda/Evil/plants/mint.rsi packetPrototype: MintPlantSeeds productPrototypes: - MintPlantLeaves @@ -78,6 +81,14 @@ Min: 1 Max: 20 PotencyDivisor: 5 + evolveTable: + catnip: + requiredMinPotency: 60 + requiredMaxPotency: 100 + requiredMinHealth: 80 + requiredMaxHealth: 100 + requiredMutationLevel: 1 + requiredReagent: JuiceLemon - type: entity parent: SeedBase @@ -88,17 +99,17 @@ - type: Seed seedId: mintplant - type: Sprite - sprite: Andromeda/Evil/mint.rsi + sprite: Andromeda/Evil/plants/mint.rsi - type: entity - name: листы мяты + name: листья мяты description: Приятно пахнущие мятные листы. suffix: Андромеда id: MintPlantLeaves parent: FoodProduceBase components: - type: Sprite - sprite: Andromeda/Evil/mint.rsi + sprite: Andromeda/Evil/plants/mint.rsi - type: SolutionContainerManager solutions: food: @@ -110,4 +121,61 @@ seedId: mintplant - type: Tag tags: - - Fruit # Для ботанической сумки ЭТО фрукт \ No newline at end of file + - Herb + +- type: seed + id: catnip + name: котовик + noun: seeds-noun-seeds + displayName: куст котовика + suffix: Андромеда + plantRsi: Andromeda/Evil/plants/catnip.rsi + packetPrototype: CatNipSeeds + productPrototypes: + - CatNipLeaves + harvestRepeat: Repeat + lifespan: 50 + maturation: 6 + production: 6 + growthStages: 5 + yield: 2 + potency: 5 + idealLight: 9 + chemicals: + CatNipExtract: + Min: 1 + Max: 20 + PotencyDivisor: 5 + +- type: entity + parent: SeedBase + name: пакет семян (котовик) + suffix: Андромеда + id: CatNipSeeds + components: + - type: Seed + seedId: catnip + - type: Sprite + sprite: Andromeda/Evil/plants/catnip.rsi + +- type: entity + name: листья котовика + description: Подозрительно муррчащие листы котовика. + suffix: Андромеда + id: CatNipLeaves + parent: FoodProduceBase + components: + - type: Sprite + sprite: Andromeda/Evil/plants/catnip.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: CatNipExtract + Quantity: 20 + - type: Produce + seedId: catnip + - type: Tag + tags: + - Herb \ No newline at end of file diff --git a/Resources/Textures/Andromeda/Evil/food/salads.rsi/bowl-trash.png b/Resources/Textures/Andromeda/Evil/food/salads.rsi/bowl-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..d5b19140d331bfca232f0eabffc978c4a6ecfb67 GIT binary patch literal 688 zcmV;h0#E&kP)|F#i)|U6B7Ju zal{xaJL9s$DzB3uQ*)ELv4#S)pzK!J^?T1#R&gN|StW7>74m1VK6CxPD1FIHfohz? zLT=Q9=D&G#=LQiSK7FR9=9^!jXczbza;1M{sDtJ@1d}@F#K>7h!oM(l{9Fy6<{5bV z{TqgRd-3kgTvh()v6E=| Wm|`Qn6O}B-1+YfJx&?jz85kHCEUX==V!4B>FT?X^j~I;Y z{W0ug!KUHVsWS|EIvNZoj_yYhhdBsed^0dGFsN(mGcYhPFi1+tF)%PNFxk5aca@Q5{`^w z1r{%>)R1;1<(t!V)t$v;1#VRNzmI$A`QT%PjokTONnX!B`3ZWJN7q;1J$Gc+gJ;#( zBi}r)V0iFWwbbm2RKTIyrqV>$N(-s~^6$AvY+Iuw?DHu9RlaAF8vzSwJu!2b)KNA zrqX$aj!9c4inKc>=WYJWlwdXc^`qu_d-9w<-51jQ5+Z{!N+hUHaEq6#3QC%5$qRi4>em=vOy6#`NxC#&ZC_@K?P4T0#F4?acJ%{M zFIF17TNv0~%sRYjz3@t;>BaD3H!BK41!0I-HHZYgm^v$18f5ES87f=KB<+%R^X-bu zn^fP_JYIx1ZCHwS^FlB`I2<@U&-wqK^BkyC=l_oMpbeBxM6J4e>A`#dEu+DhAcBb6 zwjyY*ZD=Qq_bm)~n>(-$5Ah)htiwZeA4_mm+uh3zHLH>GE3BUmRb^e=+uT97!w*3I z+?M!_>7h!C^}R?$5bwAc37UCvR|b?H$Pz)M#}Zj0i2S((Q5%`jU`(7IKa0)Wf~wuc z>1!c+0s4<80O&uS$Og@1h#)3U#!3L4MqUMyI~k}N*TTX=CKL)W>8w5^PhF710Vnf6 z-QoI~MWTTbQt4~>y8N6kPV>C!7^(ENsyoRirg`?c7szH63a6g&4=Y@+IRT}Uj2@v- z=$->cv*gjm!vQCcytc1OOc(ccmA^#K0NJd9EW0^m;?_t7eRO|ucH+B=iT+m(;p_5~bbelGq?_1oMwZ=VvkLwde%r}_ac(U~pUcik z+g33Y3gK=wcn~F!;8FoZE>@hKh?y84ARL%so^Lq(#USU4(;$P%3tTCWUjJ}?0)6`) z|9)=q%E6sXkjv#VK{J_2XF1NwXm39xX=glWC)!QgNE_Nn8=BZesBwq*C;7b|OV#Oj>OY!?TZFM_23#HN7_V~P9*eEjac;^Bak zWU@fJ&&_H|p*`3NfPLA@YRfOIudi2j;Ab_@+9I~a*qi>K8QWD2RX1ShbJ^)=fVDr% zv2wTY>uS-;t&Jwc?`82>%O~Q%STEs#levp&^55QO=}U!8Ezk0gX^Ma3IcOUslUl;= zZKOfkEJ+BV??6}d<(0{$yg8Rnw{92TH8b69m(;jJEcdvyn>~9pHSQ4V;FFhgM;@M6 z;|}rFqb>7l+;RE71#0pBTW?tY)rNKI)TvYFzs6r0{fgrYAc&a&000hUSV?A0O#mtY c000O800000007cclK=n!07*qoM6N<$g509Q+5i9m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/food/salads.rsi/salcrab.png b/Resources/Textures/Andromeda/Evil/food/salads.rsi/salcrab.png new file mode 100644 index 0000000000000000000000000000000000000000..f1842f88337b1623d8e963c46d56ef64ee172a87 GIT binary patch literal 863 zcmV-l1EBngP)K3L>m1P8EuuMAC{-2S0*=K+!}Z)>x`_+3C#B z!!SeDLtCS}ht2;o!}Go~zu)`JGa`-r$5H+bNG7TCd9AN7rih3{zBk-R>1L|ZDk!}sg&L~q{?5fOPk{7A+tw&X^t zQl9YELcYm#iJ|JGEZfvpFIUPFB4>|Z`=sW>gCQ(Wc*QN^wP;n>dg<+|n=P57PRrsi zC8ongL?V5KF(s4K$&FMc-P{^%JbV0F(5BgDXy01=6Z-I(hB;XDji;N=_9cFdl#c)0 zx0oHtBz26Gj(@d_2~16}iwQ<^yLo>ogwro@X&%-=!F`|w`#uaEAisBEeSeZ&Oi(Ks zfdsKIc77*M4mb1SCzYCYf<1{JnLIro%n;6H1tX>7UKJP??1utY)7MGZ#ROPkN>_IB z*Qo@=!eliSQxi;0c=vpOb6qMYw{KvVXpH^2noLqBtEps?I`;1h&I1MKP6*d(nVW=N zOkfuiJUq1&=dl8%UGU-Lks3AtYcDp5>Lpg)YM3IFs9w0lDC zJq7okGJA=#*-5QrP&PaH@ahIsqD)oyC<9i(7egv<>UmH6A?X zo&N9hOFVG94uufol@{FVp}EgOR#SPJ@1bmV!f+GrO~E-6_Cy91_+d$Ke|!0&U`|Hc z7kF@M#oSIlQ=H4fjg{iHy%L4=My!JZg9QSK@^1#i^TPT3JMA$Hj?~+G-_>WV<*^I1T6GF z#LmXf-WS;U*v1EHmk5HdVB#1hD$z(xf(U^`C3`G(-G?OT3Rcbs!(8TG=AOB80Et8* zk^CWKkl)oPzrEPGs@9Y=I`>-C{iIp>upesc9P}ih_|3%S5g=6P4`tj%M%m?`g0ExJ zI0pbV?CDX}o5$*1FMZ8LjaYzRr$7ez5}S7CN?OeceTyFJCK+U9cbxZ;S@)#^u13Z5 zrXlY0%xrwHwZW(BGg82t2&WalCdA5GnwmvTM}NOdLT^0!?Gh@D&DuKoIEFkVy^w zd;B0yr8o0L>;$1v!iOpP{{LY9~1(h^10z;HDHvLf1JQ_|Skw_%} zo)6faozz;Za9jWY01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf#v<9@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/food/tincondmilk.rsi/icon-open.png b/Resources/Textures/Andromeda/Evil/food/tincondmilk.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..bd25ad063d33467a9c6e453aead0aa4f0d6d59b7 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilQ1AIbUuiUt}ZfU^k&HIa#gu2v_Ik}L`G3;vG- zFff{MZ3imiEbxddW?&24s7XPjHF2ZO>;umP-v3{c z%h9qd)cow1c$JO&F6vF$wQk<*bEo|{8eMjF?|$)l{x+UVe6EbsS4*@#l=i4)`@8?Z z4{e8P=3|Akmi@f>*=VZci{q7k^F2+MG+a2dF*szy6V0s*8=mQIW!msIeS0nQ1B)j& z3mFz{Ik)*rl;VPpB@b05HXYD1I%kpYQOUCBQ`;ly6CVT_UhjPxZsGosrD4l7*5mxz zf(Z+Cj@t`0YwXyeykP6T=RY_cL<{TLL-)MlO$a<49>W}Px#1am@3R0s$N2z&@+hyVZr5lKWrR9J=WmN94(Q5eU6T8}%XM{A&QsCnjU z)AvOJ4(1P!yL<2degFS`_r2r600Rs#zySXkhor<@ex@bi`H$|4bBYYKg|A*3J&h>5WN z8dugIbXnbx^LJ0V61@c zC>r$|wxh6IMKcP?y*vY;ugxgLauv3t*xm|zG9fb1#?I3cT%Q2YRREX{Mt0YJ@pohP z|8MMt@e`Db8J%={D`cn=(2PQ+gAqN3DuI4;+fkH@8Id>$o3LEWaP!`x{v2K<-sO#Y z4KI<>++HAR!p_8AB1NNKi;ce(2SEio_y2JA4gklxa%=j2OlZJZfwAwu%f0cf)|J<} z))`}h_&l(7d_vC+pGXPx#1am@3R0s$N2z&@+hyVZri%CR5R9J=8mQP3&VHn1L>pJZ+PBX4p5y(=vkf2MQ zJfxt4kV4TOf)0Tl?67pK!$Ox5yL8zOLGDeEa7jobVh>wLhYlS=>7P)tmq`O64%ixB{>TsX5Q*EA1d7zY6`3bu z1^~EoKjCUZv<8xoA4+Id7#@j=cp?ME+cF&-r!hysRMLaZ#WFxwX6 z^wvjj3~0K=tbUD`H;#%-oW1)M4IuB%6_voANulW$-SL7ew>w@y(=F_olq9q)0|2Gx zNt(_N(wBf|gJlNBTdT&OTw0yrs-Sa~Njo5L#bz<4Y1js*bX9Sg)e7L=j& z$pnF*bCcQ)Q3e7*i`;64K+rflEP{G#IBy{xv zs4M^sr9#_dzxdm8vaYd3C72%TR6#e2S^Vh~AZRf?)+q@sUxd?R zot(S;LY2czSFiHiY6i18thiFt^*gQvHk-rbRx?${pNNAn13SNeW8fkHEsorbx^5T5 z7GsAtBJu&cNy`+?miq^M_Cw6FLHbfN15 tOY^J10000EWmrjOO-%qQ00008000000002eQPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$fQ%K~z{rV;BXa zV4wjblqLvnT)gxjL|=J#lOe=0lxTf~08s{kEI(Vb2g+k$U@wxTnj;7rf^InsP|Fca zP?}=Ud297>c*KOo9sI1Vm+{HTzfp|JnB#%--v81x&+0)QcL1IY-tqaD`k4^S`ap zWRT^QW_bMlX+AJYCc;7m7a+<3Adu9X1Ww`q8?+eS0evULBE~T9Q!!W$1d{lA8GcFs zXRt9dVfgy`4}**m2Sa#^4Ln+K0iqlLvK(gdhHsq=0bJz_mU?y!eFmUWJX6W^J3+At=F<`h+a{w%k3}EUB0ishVs4S3Pq73B` t22W$|GR!NUM|lny1*2dT&=xQ-005sP=iOZi7a0Hm002ovPDHLkV1n)07p?#R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/food/tinerp.rsi/icon.png b/Resources/Textures/Andromeda/Evil/food/tinerp.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..772c6c4b998c5d2eba803eeaea18ab304dc8a78a GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUlX{cZ>|cH3;-$HvbN7~St~G20%KY#+dnEI~Qs2IR|Ndn&JTPFG zaHHk`Q2bm}rVfzeFA4Gs{*M9}uH2ci5Gci2;1OBOz`%DHgc*Di}%zM!jlfNLbMvvs_)HLgru(!(Kr-=}!iUZs!8ta&9u$@y-o+$?a|M(iu%0A0o^HbRy3%)D%cHiL<*!VX|Wmtk#)f95r}0}NudFMb&*EGT6al=#FN z6ZhgYv;P;qi9B1bx8`2vz9eMu?b*$>)y$Ru7<&pCT#oCD#HcHY0o}yl>FVdQ&MBb@ E0B@Oung9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/icon-open.png b/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..fbbb72e55f382a22d8f6546863c2c66b8517829c GIT binary patch literal 674 zcmV;T0$u%yP)Px#1am@3R0s$N2z&@+hyVZrGD$>1R9J=WmEB8IaTv!xXPegH*c8EwV4IBE3z6E3 zkQaH;D|R88A#@{we?U39>8ftK5&8=Xvx`97F1jj`A_&b&*h_4<+{gvfEtav#wv*fG z#;rxVoz-#|?R#_heV>Qt`+?s%&w+;OETK|^FW^=H{J{jHgJ&xC*A&1Pa4XC2?-b8D z{f(MK>^jUBa4Y_|x6x_@e0Rzjw1Lz>3Y|6O#(Su&tTatt{Vk z`^aW9^jfUUd)(}oBs%nZPTB0Z78iLMt`4N^6^u_zDvo{w*Skap2L_1c6prX606s4J zX%a;)k6s}y%cNpa#LOm+egng{<|6oC0SsBa#I#EUlbiTn&T;8vFLAWADLFO-E$4cU z;hLG{fYicV_!C`6dsqzxkq&-l$m&&-Uw#$0W!5Svq zMvDQGtkG(M(DyGi9m-=-B*K|>RR9&gg4EPJc0r=^kr%rladtNN%enA0KlETxL@u~i zR0XRB07y?SAddB6bb5$iJ%Q2b*|E>)^bi^8-nIV60Hx}9y!4xw)BXHMRuiroKpg8M zJ-q-xWTd<37d-jF>!Md$SEI5oA;8*c0rNIQq$EV#p|? z`KmW!Lk%_b|LO;GN4^R|Tjiku000hUSV?A0O#mtY000O800000007cclK=n!07*qo IM6N<$f(gkj!T3|1Y0&-tT+G8Z{~GS*y4Vzns0{JVp6KTf_cascgBH zrfh6%mOPfeq2hCXO*#7B=*Q~Vv>EOv%AEKFetewt@Z-77JT*M&od#Ttaq;ahRM`v! zgFe)L09jmxyzhc(}y{DBX74u}a0VNrPR1 z`J(7^gCqYo87#JF5^}+{!11qz2frSl@Nd)q8ZkVP^CTQL$W$aAKCytK^hmOb zx5dU4ttaJ;{`hTS=6H5_Nz=XmAB(Cx%qBE8HYPq)7N6vOB+!7%?VyIlP6h^*zSzrW m4$P|qh8|yPglC$sFM}44%>l$9a4C2)i1Kvxb6Mw<&;$StyOGNP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/meta.json b/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/meta.json new file mode 100644 index 00000000000..3b2a7493eb8 --- /dev/null +++ b/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by genok7745, code by EvilBug for Andromeda-13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "trash" + } + ] +} diff --git a/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/trash.png b/Resources/Textures/Andromeda/Evil/food/tinporrige.rsi/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..a70ea0d1b9373cb53807732cdc262d92cfd0f61f GIT binary patch literal 581 zcmV-L0=oT)P)Px#1am@3R0s$N2z&@+hyVZq)k#D_R9J=Wl}$?uAY3n=jva4$-h# zI-8K0A0N?$M)js<`MU4Drw|=ZMf+e2z^lo(5+3*S4j_{&wHDy1FH1Yk83kl0^jY9OVQcf5hF>jJN| zAU}&S%hQFxtleMHx)2nKP(1xx>z4*+*9A4;W`XkRHwLv%dSfXDwNA#ia`(=?u@wE% zpy%reedY_swsJ~?l>q=MYlj#!BLw0}F5kW;5Klgs3&fM;LqiSg{|#VQ_r~!*p4oBt zk90F!8Niqsp|W-eKt42N`E{@Q<-qdnbrm^2LV$}m8o^tLylsf_K(=1r8?Gn=H2qG) zk*J*Q*->r?uzEi3dLy>gR$I?ke*lsRl9YK%rUw8301jnXNoGw=04e|g00;m800000 T0Mb*F00000NkvXXu0mjfC9d>P literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/produce.png b/Resources/Textures/Andromeda/Evil/mint.rsi/produce.png deleted file mode 100644 index 99921c6272a51ccaf8167e2ae7eb319ffc69ca73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUIV0u8>W$PaZ8;;2)J$yEx5tP~b`q=iQr~VRGFipqWU&273!vKO zwhiZj6mLn8U+{kS>O>_%)r2R1cVu$fl z*Uj<>7gR9G2sza8enqOlyITiM+77n$7Ac;-(0ssx!*+9$*`}=wp^2qVD;Biwo7yAI z@L5seP$P4j;4N>#{%33#6*Bm=A9}b-9T9!V&`?+Cu65~xGb8(kF6|$>Wz4q%6x`B9 zXT5m5$mESB6T8W^#qtU>Rw?`0xVs!XCedWmn$a}#vssIh@u3Sg$=7&uB&9oaA2Y=i zraoB~eT>^;d(WBZW6}jFsYmL+r`&1KINx!7@<-m9>-G%iKC@r-S2-(g$khQ11O`u6 KKbLh*2~7ZUjis&t diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/dead.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/dead.png similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/dead.png rename to Resources/Textures/Andromeda/Evil/plants/catnip.rsi/dead.png diff --git a/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/harvest.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..58f1e1a67e2371f9846b6a7cdf3865db2c67535b GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUT~Zk=V-$TGG*9VuowDq|ZZ-Y9!xaB&!}GS2&pS`M<39hX`;yCM zlP}v%yX-P^r%wGH$GOM!J1!ef^eNXpW!4weVB}Gx<&vlFpurky3NrQIo3FJ%O1dP- zFZe%Bz@TozZ3O>_%)r2R7=#&*=dVZs3jXnQaSXBWe>&l1(IEq#meidB3wYfZ zPI&X%USoIAnNW#;Wy?-QEDp7Mz2RZ+U(E-Nf9BRRO%Y>Qx8TC^)+x(bA6%8R_@i93 zSxt4*l|9W<`66_j*X`k0@oJ)O!?_>w^ED$b|KT=vz1g(l>S=+>jr;i`ubjR1Wuntl z)@Q+K-6vwUy*O$<)8Vb;mj61E(N{WHEw0^al4fxhkN%?V$t1HdquaNvw{r*Uwsp3P zkM?OxahG&#s#)Hv_p6+FTJ?ryabEmO75T$HG_$%g9Qc>v9;A7rQFqx)bp~~7-@qAZ z9^MHD3_iH{?4HW#@kHD#VGf^f!x4*5DX-$TNygpU&(L5j(HogvRP_A=FdP^>UHx3v IIVCg!0Eze1asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/meta.json b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/meta.json similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/meta.json rename to Resources/Textures/Andromeda/Evil/plants/catnip.rsi/meta.json diff --git a/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/produce.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..8dd91beaddc516c3ae9878e95c6027b8e3261b0d GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUeIhweZnVg+7n?L$M9o%x>vnaZjK=M^Ami9eg8YL2g8_q-H?td1 zh_k>WvY3H^?=T269?xHq0uEak-;eU5hAm3pH9%pBvs{hL8*~AZ7W&Z!VWa$ll z=dCxty63a_T$*Gx?`+iP3|;OZ2Ja=dyGoT8Em_dxF2}iK=^M)(_EsF*3(k97IWfPP z^`XLq#YcoqKRs8t;5dU_+Tbta2c|dajC_@HhLZvq_dh+~$bOGs{D;;GUW=Ceg9YL` z4C}96{vdfmFT!DwXSmpA;=@op0Vv0y=<-}e``u6S|e3)8j! z&h2j{JnM=Mb})B7Yw|UbJ`m&gBYug^p*KhPE-XIeCeM(jb>){~#%H#yl{HLz@3XG| zc0G{=1Td~{D1Avuu4s24_qg4*GNfW Q5zq|`p00i_>zopr0C@&vmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-1.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-1.png similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/stage-1.png rename to Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-1.png diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-2.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-2.png similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/stage-2.png rename to Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-2.png diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-3.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-3.png similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/stage-3.png rename to Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-3.png diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/stage-4.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-4.png similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/stage-4.png rename to Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-4.png diff --git a/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-5.png b/Resources/Textures/Andromeda/Evil/plants/catnip.rsi/stage-5.png new file mode 100644 index 0000000000000000000000000000000000000000..35cfaf32fb6008998eda9446304c4706c00076e5 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUT~Zk=V-$TGH2td$eadx%8jL)Ov|RGk9W+=&O+l(=9lE|ANO6}0 z`33)n0|qaD#!oy?)*XczZ zTQ4X`>OL^IBfnzW)lIBx6pA~327GOLz_!HAi@(g%IV~@G2@i97idEz8*h>tvqBS}v zLfy+D^PJr0W(Zomb&0W${*lTqqAw$mViM4nVt`MhVxp9G-d zmw||39{aGBKaYJt#DIuNjV5In0AQM?W*+-+IG%yVmeJVQ^KpmE_14h5hrdD`0qrCj zH<$M|Mk&Yp<8lk pY&yXOhOQ0tSwbb;ii(Q=#tRV9dO^_nQ9}R#002ovPDHLkV1goimkxi5LT6iBg`1o;L32LlEvZ)P{3 z5NCl$WHAE+-(e7DJf6QI1t_@N)5S5w!vF51K)%BYJkHKSRsWUGvxy(F%KZOz$qCVJi;oDKetNEO!Epw=w83A-4@_^;8Tl&Z3?~IJ?tgl|k^LUO_z$fWycR9_2Mfe? z7}j6C{6X@BUWCIU#}g|i?qzu5@@`fpAEyIP%bA$`lLFVdQ&MBb@05I%*;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/mint.rsi/seed.png b/Resources/Textures/Andromeda/Evil/plants/mint.rsi/seed.png similarity index 100% rename from Resources/Textures/Andromeda/Evil/mint.rsi/seed.png rename to Resources/Textures/Andromeda/Evil/plants/mint.rsi/seed.png diff --git a/Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-1.png b/Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc5a07e6a12a2a71baf4c12dc60662c53342bd5 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}X`U{QArY-_ zFB$SRD2Om$IM%Y;V8bTsO6IWhk9sZUDXy4*v-5}jv4i{e`nEH<0DbP0l+XkKQlddn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-2.png b/Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..bed4a03ad4db98697851ce3f7531977bec9342ad GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2y} z6C_v{Cy4Yk1sZU<9ZX<|Unlq30W+^lZ? zsDD_0lkWf1AG#UmKV^|U00bX?pOz^WMGx` VedERv+YEFngQu&X%Q~loCICxGRnPzc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-3.png b/Resources/Textures/Andromeda/Evil/plants/mint.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..4b4e0af49723c492211c7055b4e70c5024e18687 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?ST-HSDR8#GfoJmXtj!>er_G+0ATL6Qghk17Buj*=k1;QtW7aIbl9 zBv6dAz$3Dlfr0NZ2s0kfUy%Y7Eb?@546*Qk+aJi+pupqI-m&|C@7guDFU10qt1Z3Dwe3=s95h%% zO+h*$KStaFQv4-Be!>4y0K=6#GZq4+I14-?iy0XB4ude`@%$AjK*3d>E{-7<{!jZO zg$^5VI8S!CtE%_iK2MON`jVge|FxSGEcxH)lr55HzIWpM*WiTIrD3-(iEQ8$4>IoK zJml3Y!H^+QwveG?hOo`9m3lqjXH+o#JIlZFWxoyM*3*CbG)(&&GFS6D?FwNL*k9t> zmHYhWgQ7!c*ZiCv`{?VreYYMh^qs5KX%Y}HH!B51A#zSGkCiCxvX Date: Fri, 10 May 2024 23:12:48 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B0=D1=82=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml index 781ee5f3d64..42b02dce88d 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml @@ -192,7 +192,7 @@ parent: FoodTinBase id: FoodTinErp name: консервированная хорнятина - description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом. На обратной стороне можно заметить чтото про натуральный вульпяшные ингредиенты. + description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом. На обратной стороне можно заметить чтото про натуральные вульпяшные ингредиенты. components: - type: SolutionContainerManager solutions: From 0d91726509a708154959f593f2f8524161757c05 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Fri, 10 May 2024 23:15:21 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Textures/Andromeda/Evil/food/tinerp.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Andromeda/Evil/food/tinerp.rsi/meta.json b/Resources/Textures/Andromeda/Evil/food/tinerp.rsi/meta.json index 3b2a7493eb8..5262f5820f1 100644 --- a/Resources/Textures/Andromeda/Evil/food/tinerp.rsi/meta.json +++ b/Resources/Textures/Andromeda/Evil/food/tinerp.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by genok7745, code by EvilBug for Andromeda-13", + "copyright": "Sprites, idea and code by EvilBug for Andromeda-13", "size": { "x": 32, "y": 32 From 69405e73553799969e69f435b6a4304c6612c2df Mon Sep 17 00:00:00 2001 From: EvilBug Date: Fri, 10 May 2024 23:24:05 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BA=D0=BE=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B2=D0=BE=20=D0=BB=D1=8E=D0=B1=D0=B2=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Andromeda/Evil Prototype's/newfood.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml index 42b02dce88d..b513d6c9f45 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml @@ -191,16 +191,18 @@ - type: entity parent: FoodTinBase id: FoodTinErp - name: консервированная хорнятина - description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом. На обратной стороне можно заметить чтото про натуральные вульпяшные ингредиенты. + name: консервированная ебихотня + description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом, вы ощущаете себя ебихотой. На обратной стороне можно заметить чтото про натуральные вульпяшные ингредиенты. components: - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 30 reagents: - ReagentId: Aphrodisiac Quantity: 20 + - ReagentId: Ephedrine + Quantity: 10 - type: Sprite sprite: Andromeda/Evil/food/tinerp.rsi - type: FlavorProfile From f4650b69d4492fbd54f4009b400416650fe4a1d2 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Sat, 11 May 2024 14:59:25 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=81=D1=83=D1=84=D1=84=D0=B8=D0=BA=D1=81=D0=BE=D0=B2=20=D0=B8?= =?UTF-8?q?=20=D0=B2=D0=BA=D1=83=D1=81=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BE?= =?UTF-8?q?=D1=89=D1=83=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BE=D1=82=20?= =?UTF-8?q?=D1=85=D0=B8=D0=BC=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D0=B2=20=D0=B8?= =?UTF-8?q?=20=D0=B5=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/newchems.yml | 9 +++-- .../Andromeda/Evil Prototype's/newfood.yml | 34 +++++++++++++------ .../VendingMachines/Inventories/seeds.yml | 1 + 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml index 080dbe53e2e..12b51a81bd7 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newchems.yml @@ -3,8 +3,9 @@ name: экстракт мяты parent: BaseJuice desc: Приятно пахнущий мятный экстракт + suffix: Андромеда physicalDesc: мятное - flavor: мятно + flavor: minty color: "#18ad45" metabolisms: Medicine: @@ -22,8 +23,9 @@ name: экстракт котовика parent: BaseJuice desc: Подозрительно муррчащий экстракт котовика + suffix: Андромеда physicalDesc: котомятное - flavor: котомятно + flavor: minty color: "#18ad45" metabolisms: Medicine: @@ -69,8 +71,9 @@ name: милоко group: Special desc: Чистая сущность фелинидов. Заставляет вас Муррчать! + suffix: Андромеда physicalDesc: муррчащее - flavor: муррчащее + flavor: magical color: "#dcf0ea" metabolisms: Poison: diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml index b513d6c9f45..f45f3d9d54e 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/newfood.yml @@ -11,12 +11,15 @@ parent: FoodBowlBaseNew id: SalCoat description: Созданная по рецепту из далёкой древности, с добавлением космических ингредиентов, она... Это что, карп в шубе?! Только не показывайте его нианам! + suffix: Андромеда components: - type: FlavorProfile flavors: - fishy - mayonnaise - egg + - potato + - carrot - type: Sprite layers: - state: bowl @@ -24,10 +27,10 @@ - type: SolutionContainerManager solutions: food: - maxVol: 40 + maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 30 + Quantity: 20 - ReagentId: Vitamin Quantity: 10 @@ -36,12 +39,14 @@ parent: FoodBowlBaseNew id: SalCrab description: У него есть всё, чего нет у оливье! Кукуруза, достоинство и две большие клешни! + suffix: Андромеда components: - type: FlavorProfile flavors: - - fishy + - crabby - mayonnaise - egg + - corn - type: Sprite layers: - state: bowl @@ -49,24 +54,26 @@ - type: SolutionContainerManager solutions: food: - maxVol: 40 + maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 30 + Quantity: 15 - ReagentId: Vitamin - Quantity: 10 + Quantity: 15 - type: entity name: салат мимоза parent: FoodBowlBaseNew id: SalMime description: Смотря этот салат, вы понимаете, что будете молчаливо осуждены, если выберете другое блюдо! + suffix: Андромеда components: - type: FlavorProfile flavors: - fishy - mayonnaise - egg + - medicine - type: Sprite layers: - state: bowlmime @@ -129,6 +136,7 @@ id: FoodTinCondMilk name: банка сгущенки description: Целая банка знаменитой сгущёнки! Вызывает у многих людей приятные воспоминания о прошлом. + suffix: Андромеда components: - type: SolutionContainerManager solutions: @@ -152,6 +160,7 @@ parent: FoodTinBaseTrash id: FoodTinCondMilkTrash name: банка сгущенки + suffix: Андромеда components: - type: Sprite sprite: Andromeda/Evil/food/tincondmilk.rsi @@ -161,6 +170,7 @@ id: FoodTinPorrige name: консервированная каша description: Старая консерва, заполненная самой настоящей кашей! Судя по внешнему виду гречка с тушенкой, приправленная специями! Слово "вульпятина" почему-то зачеркнуто. + suffix: Андромеда components: - type: SolutionContainerManager solutions: @@ -184,6 +194,7 @@ parent: FoodTinBaseTrash id: FoodTinPorrigeTrash name: консервированная каша + suffix: Андромеда components: - type: Sprite sprite: Andromeda/Evil/food/tinporrige.rsi @@ -191,16 +202,17 @@ - type: entity parent: FoodTinBase id: FoodTinErp - name: консервированная ебихотня - description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом, вы ощущаете себя ебихотой. На обратной стороне можно заметить чтото про натуральные вульпяшные ингредиенты. + name: консервированная хорнятина + description: КРАЙНЕ подозрительная консерва, с возбуждающим ароматом, вы буквально ощущаете себя ебихотой. На обратной стороне можно заметить что-то про натуральные вульпяшные ингредиенты. + suffix: Андромеда components: - type: SolutionContainerManager solutions: food: - maxVol: 30 + maxVol: 20 reagents: - ReagentId: Aphrodisiac - Quantity: 20 + Quantity: 10 - ReagentId: Ephedrine Quantity: 10 - type: Sprite @@ -209,6 +221,7 @@ flavors: - meaty - spicy + - punishment - type: Food trash: FoodTinErpTrash @@ -216,6 +229,7 @@ parent: FoodTinBaseTrash id: FoodTinErpTrash name: консервированная хорнятина + suffix: Андромеда components: - type: Sprite sprite: Andromeda/Evil/food/tinerp.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 25e41702af3..a306fedbd9b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -19,6 +19,7 @@ LimeSeeds: 5 PineappleSeeds: 4 LingzhiSeeds: 3 + MintPlantSeeds: 3 # A-13 new seeds OatSeeds: 5 OnionSeeds: 5 OnionRedSeeds: 5