Skip to content

Commit

Permalink
Plushies! (#1369)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Added two new plushies to the game! A harpy plushie and a plushie for
the beloved station pet Morty!


![image](https://github.com/user-attachments/assets/3e202da2-3571-4c67-82c9-54a6aaf3c91f)

![mortplush](https://github.com/user-attachments/assets/9f131eb9-ed89-4818-b54c-e9da949e8ce2)

![harpyplushie](https://github.com/user-attachments/assets/47aa5b91-0747-4a2c-8c5c-18c5429ab570)



---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: two new cuddly friends to the station! (harpy and morty plush)

---------

Signed-off-by: sleepyyapril <[email protected]>
Co-authored-by: juniwoofs <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>
Co-authored-by: sleepyyapril <[email protected]>
  • Loading branch information
juniwoofs and sleepyyapril authored Dec 22, 2024
1 parent 18a751d commit 6fb1223
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
- PlushieTrystan
- PlushieSlips
- PlushieJester
- PlushieHarpy
- PlushieMort
chance: 0.5
offset: 0.2

Expand Down
60 changes: 60 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1966,3 +1966,63 @@
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: shadowkin

- type: entity
parent: BasePlushie
id: PlushieMort
name: morty plushie
description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush.
components:
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: mortplush

- type: entity
parent: BasePlushie
id: PlushieHarpy
name: harpy plushie
description: A soft plushie of a harpy! A small tag on it guarantees that all feathers are ethically sourced.
components:
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: harpyplushie
- type: StaminaDamageOnHit
damage: 0.8
- type: EmitSoundOnActivate
sound:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
params:
variation: 0.05
- type: EmitSoundOnUse
sound:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
params:
variation: 0.05
- type: EmitSoundOnLand
sound:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
params:
variation: 0.05
- type: UseDelay
delay: 0.8
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 0.5
damage:
types:
Blunt: 0
soundHit:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
params:
variation: 0.05
soundSwing:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
params:
variation: 0.05
soundNoDamage:
path: /Audio/DeltaV/Voice/Harpy/caw1.ogg
params:
variation: 0.05
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@
},
{
"name": "shadowkin"
},
{
"name": "mortplush"
},
{
"name": "harpyplushie"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6fb1223

Please sign in to comment.