From 32af76dd2b6898ca2d9e2eecde14dc1776a7380f Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:17:01 -0600 Subject: [PATCH] Adds Smile the slime recipe (#2632) * Adds Smile the slime recipe * unindent * 4 space Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> * switch to migration * It's the future, bro --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Velcroboy Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../en-US/_DV/reagents/meta/biological.ftl | 2 + Resources/Migrations/deltaMigrations.yml | 3 ++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 3 ++ .../_DV/Body/Organs/Animal/slimes.yml | 17 +++++++ .../_DV/Body/Prototypes/Animal/slimes.yml | 19 ++++++++ .../Prototypes/_DV/Reagents/biological.yml | 5 +++ .../Prototypes/_DV/Recipes/Reactions/fun.yml | 18 ++++++++ .../Smile/organs.rsi/brain-inhand-left.png | Bin 0 -> 428 bytes .../Smile/organs.rsi/brain-inhand-right.png | Bin 0 -> 414 bytes .../Pets/Smile/organs.rsi/brain-smile.png | Bin 0 -> 2177 bytes .../_DV/Mobs/Pets/Smile/organs.rsi/meta.json | 42 ++++++++++++++++++ 11 files changed, 109 insertions(+) create mode 100644 Resources/Locale/en-US/_DV/reagents/meta/biological.ftl create mode 100644 Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml create mode 100644 Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml create mode 100644 Resources/Prototypes/_DV/Reagents/biological.yml create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json diff --git a/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl new file mode 100644 index 0000000000..d3fcceb245 --- /dev/null +++ b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl @@ -0,0 +1,2 @@ +reagent-name-sentient-grey-matter = sentient grey matter +reagent-desc-sentient-grey-matter = Thought juice, the stuff that leaks out of your ears. It seems to be sparkling when you look at it in the right light. That's odd... diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index d0c682215f..8113abba17 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -131,3 +131,6 @@ AlwaysPoweredSmallLightMaintenanceRed: PoweredDimSmallLight # 2024-12-22 VendingMachineRestockSalvageEquipment: null + +# 2025-01-11 +SpawnMobSmile: SentientSmileCore diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3570e8fd5e..41b1aca0ed 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -776,6 +776,9 @@ BaseUnshaded: aslime-_3 Dead: Base: rainbow_baby_slime_dead + - type: Body # DeltaV - Changes to add brain + prototype: Smiles + requiredLegs: 1 - type: Butcherable spawned: - id: FoodMeatSlime diff --git a/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml new file mode 100644 index 0000000000..b16f573547 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml @@ -0,0 +1,17 @@ +- type: entity + id: SentientSmileCore + parent: SentientSlimesCore + name: sentient smile core + components: + - type: Sprite + sprite: _DV/Mobs/Pets/Smile/organs.rsi + state: brain-smile + - type: Extractable + grindableSolutionName: organ + - type: SolutionContainerManager + solutions: + organ: + maxVol: 5 + reagents: + - ReagentId: SentientGreyMatter + Quantity: 5 diff --git a/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml new file mode 100644 index 0000000000..80a27f8c3a --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml @@ -0,0 +1,19 @@ +- type: body + id: Smiles + name: "Smiles" + parent: Slimes + root: torso + slots: + torso: + part: TorsoSlime + connections: + - legs + organs: + core: SentientSmileCore + lungs: OrganSlimesLungs + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal diff --git a/Resources/Prototypes/_DV/Reagents/biological.yml b/Resources/Prototypes/_DV/Reagents/biological.yml new file mode 100644 index 0000000000..b45bf8a435 --- /dev/null +++ b/Resources/Prototypes/_DV/Reagents/biological.yml @@ -0,0 +1,5 @@ +- type: reagent + id: SentientGreyMatter + parent: GreyMatter + name: reagent-name-sentient-grey-matter + desc: reagent-desc-sentient-grey-matter diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml index 2c026637ce..722c6a2a4f 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml @@ -9,3 +9,21 @@ effects: - !type:CreateEntityReactionEffect entity: SheetGlass1 + +- type: reaction + id: SmileTheSlime + impact: Low + quantized: true + conserveEnergy: false + reactants: + Happiness: + amount: 4 + SentientGreyMatter: + amount: 5 + JuiceThatMakesYouWeh: + amount: 10 + Slime: + amount: 20 + effects: + - !type:CreateEntityReactionEffect + entity: MobSlimesPet diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c07475fc631713557358605a8f675eca390d6391 GIT binary patch literal 428 zcmV;d0aN~oP)vk%=f0T0^ruaF7#hqBa;HL0NMS7@)a361Bkq3CfytzyQtN zk*Ey@NKn?C0|sdBjzn!RK!UR7956t0cfQreacJ6D1MEGu?#SHT8Cc!&pO4KO3!uI@ zk(qta?U6wm6?@cZr*;a9eenX^jf{Lmbwyh{{E(2b9X!pJiDq+QRMCyy-gp4ch2?S zx?-8tg0StUer+lJw&iO&TZ_}e534I>*KS#`a^CSLA-o=?OS+X zPaUmoS^xkYFP!_yjR<`+r22;Mz=U@LfW&#Zy9SU#=S$Kf2d|rU(Rz4;JtJyyEo0(n z$LJHqnSBK7XTNx7{^EQqGD_>5N5)nhK0|rJRP334^X8USKT?$PiLqA(woJFNZXMtG zxr{fRoLBZq`ZS^CGRp}gIDG2!Oaki|hjmHv8GHN?c5x<|5yoNZd`YeWQ}@`qTc)l{ z296>@vTg=IgQ;dj@?`sG0C#zGB!6bUTj#%0W*kt(AzQs@9T&Yz{F>mcG)dd0YRVi} zyw7>Rz6_W`pVOgdbWzlfH+j8F+Y@vUd>cOB@k*{vWbJcu;wes)(N>M^-=b^p!PRkw~m z?8O1>tiSu2-wFu$DOt8Q6D-gu+?V;Oiz=VQ-ctpER%w6A`+p4>L?TbQ{YKa8&5rKy zK~V|9H&umJ{Y>Q~%b}#LHc9SV-QXbIgO?fQi^Vy#AcLCbLBluPLo3P!+R3oJyHeqC z0Xc7dtX^61c@p#>`>%V-QMP^7LC>Uk?QM-)?iPX(P4~|ha%3(C$P`k6LH0_ zVto>~cpqya@FPRG3nQ0=BbzPpUy?#+vr}Ff61m;Ha6x?SgYKd4F$-K}< zC3)T*K52)QmC<}uouEP>`!i{Hw?5_0v=LFz=Xzi0kNxh~bp?C)xMU%uoo6?>4BIXj zpXZ2u_ud0+yYh;n11}gKHI9=I;9)tYAL(8eixSi zK2Er7F5ivFWb(|7I{rQ3IijYJWrUTW;1X^k3O>Kpl$4 zOf-h{myh~A)`72{)^ z@Tr9yMm)Mb39}rhqSjMOqoSh9-{rF8$+%I|M7=vgm=q*qA*`!C?$@M7Z zO;y1Kh4JEl)S+4Ph zcxddJC6T1pes9c=ZNEgcC@Z*y%Y10hfqp zRb5C>W9=F6>i-K&5gQX96iLgtcqv^6iWNymd%Fbc_M