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

Jenn Plush Fix #196

Closed
wants to merge 4 commits into from
Closed

Jenn Plush Fix #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0dc6ad
Jenn Plush (Testing Purposes Only)
Rosycup Jan 25, 2025
464cf35
Merge branch 'master' into jennplush
Rosycup Jan 25, 2025
08b3f48
guh
Rosycup Jan 25, 2025
2619c76
audio file fixes
Rosycup Jan 25, 2025
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
0 Resources/Audio/Items/alice1.ogg → ...tems/Toys/Plushie/PlushieAlice/alice1.ogg
View file
Open in desktop
File renamed without changes.
0 Resources/Audio/Items/alice3.ogg → ...tems/Toys/Plushie/PlushieAlice/alice3.ogg
View file
Open in desktop
File renamed without changes.
Binary file added Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushieuse1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg
View file
Open in desktop
Binary file not shown.
0 Resources/Audio/Items/tabieep.ogg → ...tems/Toys/Plushie/PlushieTabi/tabieep.ogg
View file
Open in desktop
File renamed without changes.
0 Resources/Audio/Items/tabieep2.ogg → ...ems/Toys/Plushie/PlushieTabi/tabieep2.ogg
View file
Open in desktop
File renamed without changes.
0 Resources/Audio/Items/tabiwaow.ogg → ...ems/Toys/Plushie/PlushieTabi/tabiwaow.ogg
View file
Open in desktop
File renamed without changes.
0 Resources/Audio/Items/vegaheyy.ogg → ...ems/Toys/Plushie/PlushieVega/vegaheyy.ogg
View file
Open in desktop
File renamed without changes.
0 Resources/Audio/Items/vegawoag.ogg → ...ems/Toys/Plushie/PlushieVega/vegawoag.ogg
View file
Open in desktop
File renamed without changes.
86 changes: 62 additions & 24 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,16 +2051,16 @@
damage: 0.8
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/vegawoag.ogg
path: /Audio/Items/Toys/Plushie/PlushieVega/vegawoag.ogg
- type: EmitSoundOnUse
sound:
path: /Audio/Items/vegawoag.ogg
path: /Audio/Items/Toys/Plushie/PlushieVega/vegawoag.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Items/vegaheyy.ogg
path: /Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/vegaheyy.ogg
sound:
path: /Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg
- type: UseDelay
delay: 1.5
- type: MeleeWeapon
Expand All @@ -2070,11 +2070,11 @@
types:
Blunt: 0
soundHit:
path: /Audio/Items/vegaheyy.ogg
path: /Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg
soundSwing:
path: /Audio/Items/vegaheyy.ogg
path: /Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg
soundNoDamage:
path: /Audio/Items/vegaheyy.ogg
path: /Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg

- type: entity
parent: BasePlushie
Expand All @@ -2089,16 +2089,16 @@
damage: 0.8
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/alice1.ogg
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice1.ogg
- type: EmitSoundOnUse
sound:
path: /Audio/Items/alice1.ogg
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice1.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Items/alice3.ogg
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/alice3.ogg
sound:
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg
- type: UseDelay
delay: 1.5
- type: MeleeWeapon
Expand All @@ -2108,11 +2108,11 @@
types:
Blunt: 0
soundHit:
path: /Audio/Items/alice3.ogg
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg
soundSwing:
path: /Audio/Items/alice3.ogg
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg
soundNoDamage:
path: /Audio/Items/alice3.ogg
path: /Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg

- type: entity
parent: BasePlushie
Expand All @@ -2127,16 +2127,54 @@
damage: 0.8
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/tabiwaow.ogg
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabiwaow.ogg
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabiwaow.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg
- type: UseDelay
delay: 1.5
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 1.2
damage:
types:
Blunt: 0
soundHit:
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg
soundSwing:
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg
soundNoDamage:
path: /Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg

- type: entity
parent: BasePlushie
id: PlushieJenn
name: jenn plushie
description: Smells like vanilla and dominance.
components:
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: jennplush
- type: StaminaDamageOnHit
damage: 0.8
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushieuse1.ogg
- type: EmitSoundOnUse
sound:
path: /Audio/Items/tabiwaow.ogg
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushieuse1.ogg
- type: EmitSoundOnCollide
sound:
path: /Audio/Items/tabieep2.ogg
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/tabieep2.ogg
sound:
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg
- type: UseDelay
delay: 1.5
- type: MeleeWeapon
Expand All @@ -2146,8 +2184,8 @@
types:
Blunt: 0
soundHit:
path: /Audio/Items/tabieep2.ogg
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg
soundSwing:
path: /Audio/Items/tabieep2.ogg
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg
soundNoDamage:
path: /Audio/Items/tabieep2.ogg
path: /Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg
Binary file added Resources/Textures/Objects/Fun/toys.rsi/jennplush.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.
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,9 @@
},
{
"name": "tabiplushie"
},
{
"name": "jennplush"
}
]
}
Loading