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 0000000000..c07475fc63 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png new file mode 100644 index 0000000000..c8c570917b Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png new file mode 100644 index 0000000000..60aaa2f92c Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json new file mode 100644 index 0000000000..0452730816 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brain-smile", + "delays": [ + [ + 10.0, + 0.2, + 0.4, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2, + 0.4, + 0.6, + 0.4, + 5.0, + 0.02, + 0.02, + 0.02 + ] + ] + }, + { + "name": "brain-inhand-left", + "directions": 4 + }, + { + "name": "brain-inhand-right", + "directions": 4 + } + ] +}