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

zero toy #36

Merged
merged 9 commits into from
Sep 27, 2023
Merged

zero toy #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8499cc
zero toy
Plyushsune Sep 20, 2023
6ae55c6
makes it obtainable
Plyushsune Sep 20, 2023
a12b409
fixes thingys
Plyushsune Sep 20, 2023
3b469cf
Merge branch 'master' into zero
Plyushsune Sep 21, 2023
48833e2
fix mapping error?
Plyushsune Sep 21, 2023
1f30022
Merge branch 'master' into zero
Colin-Tel Sep 26, 2023
8d00eb0
Merge branch 'master' into zero
Plyushsune Sep 27, 2023
bdd428b
adds `components:` into it
Plyushsune Sep 27, 2023
eaff4f2
fixes error
Plyushsune Sep 27, 2023
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
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,13 @@
- type: MeleeWeapon
soundHit:
path: /Audio/Animals/fox_squeak.ogg

- type: entity
parent: BaseFigurine
id: ToyZero
name: toy zero
description: whirrrrrrrrr taktaktaktaktak BOOM whirrrrrrr
components:
- type: Sprite
Plyushsune marked this conversation as resolved.
Show resolved Hide resolved
sprite: DeltaV/Objects/Fun/Toys/zerotoy.rsi
Plyushsune marked this conversation as resolved.
Show resolved Hide resolved
state: icon
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 @@ -70,6 +70,7 @@
- ToyDurand
- ToySkeleton
- MysteryFigureBox
- ToyZero # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
- ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
- ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml
chance: 0.5
Expand Down
Binary file added Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "plyushkina",
"states": [
{
"name": "icon"
}
]
}