Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added morty plushie to plushie, toy, and arcade reward pools, #2516

Merged
merged 14 commits into from
Dec 23, 2024
Merged

added morty plushie to plushie, toy, and arcade reward pools, #2516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fb41bdb
morty plushie :3
Dec 22, 2024
551dc7d
Morty Plushie fixed real
Dec 22, 2024
bc46aa5
Merge branch 'DeltaV-Station:master' into Morty-Plushie
juniwoofs Dec 22, 2024
9bd2d95
Update toys.yml
juniwoofs Dec 22, 2024
d39d48d
Merge branch 'DeltaV-Station:master' into Morty-Plushie
juniwoofs Dec 22, 2024
51b290f
Update toys.yml
juniwoofs Dec 22, 2024
76593d8
fixedbutforrealipromise
Dec 22, 2024
f6f0389
fixedbutforrealrealrealtrustme
Dec 22, 2024
d6b6345
jessiepleaseworkjessie
Dec 22, 2024
bc79179
waitwasthisthefix
Dec 22, 2024
165b6f8
imhonestlyembarassed
Dec 22, 2024
6d120f2
Plushie morty in the pools
Dec 23, 2024
f47c331
Merge branch 'master' into Morty-Plushie
juniwoofs Dec 23, 2024
e251ceb
added deltav notation
Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/fun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
- id: PlushieMothRandom # Nyano - random moth plushies
- id: PlushieArachind
- id: PlushiePenguin
- id: PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml

- type: entity
id: CrateFunPlushie
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
- PlushieMoth
- PlushieMothRandom # Nyanotrasen Random Moth Plushies
- PlushieArachind
- PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
chance: 0.5
offset: 0.2

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
- PlushieSharkBlue
- PlushieVox
- PlushieXeno
- PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
- PlasticBanana
- RevolverCapGun
- SnapPopBox
Expand Down
Loading