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.

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

Исправленная резиновая свинья WIP #2607

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions Resources/Audio/Corvax/Items/Toys/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- files: ["rubber_pig_1.ogg"]
license: "CC-BY-4.0"
copyright: "MattRuthSound from Freesound"
source: "https://freesound.org/s/562067/"

- files: ["rubber_pig_2.ogg"]
license: "CC-BY-4.0"
copyright: "MattRuthSound from Freesound"
source: "https://freesound.org/s/562068/"

- files: ["rubber_pig_3.ogg"]
license: "CC-BY-4.0"
copyright: "MattRuthSound from Freesound"
source: "https://freesound.org/s/562069/"

- files: ["rubber_pig_4.ogg"]
license: "CC-BY-4.0"
copyright: "MattRuthSound from Freesound"
source: "https://freesound.org/s/562076/"

- files: ["rubber_pig_5.ogg"]
license: "CC-BY-4.0"
copyright: "MattRuthSound from Freesound"
source: "https://freesound.org/s/562077/"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@
- id: BeachBall
- id: ClothingShoesSkates
- id: RubberChicken
# Corvax-Toys-Start
- id: RubberPig
# Corvax-Toys-End

- type: entity
id: CrateFunBikeHornImplants
Expand Down
49 changes: 49 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
- type: entity
parent: BasePlushie
Moryachok136 marked this conversation as resolved.
Show resolved Hide resolved
id: RubberPig
name: игрушечная свинья
description: Дементий, гони свиней!
components:
- type: Sprite
sprite: Corvax/Objects/Fun/toys.rsi
state: rubber_pig
- type: EmitSoundOnUse
sound:
collection: RubberPig
params:
variation: 0.125
- type: EmitSoundOnLand
sound:
collection: RubberPig
params:
variation: 0.125
- type: EmitSoundOnActivate
sound:
collection: RubberPig
params:
variation: 0.125
- type: EmitSoundOnCollide
sound:
collection: RubberPig
params:
variation: 0.125
- type: EmitSoundOnTrigger
sound:
collection: RubberPig
params:
variation: 0.125
- type: Food
requiresSpecialDigestion: true
useSound:
collection: RubberPig
params:
variation: 0.125
- type: MeleeWeapon
wideAnimationRotation: 110
soundHit:
collection: RubberPig
params:
variation: 0.125
- type: PhysicalComposition
materialComposition:
Plastic: 25
8 changes: 8 additions & 0 deletions Resources/Prototypes/Corvax/SoundCollections/rubber_pig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: soundCollection
id: RubberPig
files:
- /Audio/Corvax/Items/Toys/rubber_pig_1.ogg
- /Audio/Corvax/Items/Toys/rubber_pig_2.ogg
- /Audio/Corvax/Items/Toys/rubber_pig_3.ogg
- /Audio/Corvax/Items/Toys/rubber_pig_4.ogg
- /Audio/Corvax/Items/Toys/rubber_pig_5.ogg
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
- id: BalloonCorgi
- id: MysteryFigureBox
- id: RubberChicken
# Corvax-Toys-Start
- id: RubberPig
# Corvax-Toys-End
# Cult
- !type:AllSelector
children:
Expand Down
14 changes: 14 additions & 0 deletions Resources/Textures/Corvax/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "rubber_pig by Moryachok136",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "rubber_pig"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading