diff --git a/Resources/Audio/Items/alice1.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieAlice/alice1.ogg similarity index 100% rename from Resources/Audio/Items/alice1.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieAlice/alice1.ogg diff --git a/Resources/Audio/Items/alice3.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg similarity index 100% rename from Resources/Audio/Items/alice3.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieAlice/alice3.ogg diff --git a/Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushieuse1.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushieuse1.ogg new file mode 100644 index 0000000000..9f0ffc4ff6 Binary files /dev/null and b/Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushieuse1.ogg differ diff --git a/Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg new file mode 100644 index 0000000000..1fcf3cc92f Binary files /dev/null and b/Resources/Audio/Items/Toys/Plushie/PlushieJenn/jennplushthrow1.ogg differ diff --git a/Resources/Audio/Items/tabieep.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieTabi/tabieep.ogg similarity index 100% rename from Resources/Audio/Items/tabieep.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieTabi/tabieep.ogg diff --git a/Resources/Audio/Items/tabieep2.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg similarity index 100% rename from Resources/Audio/Items/tabieep2.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieTabi/tabieep2.ogg diff --git a/Resources/Audio/Items/tabiwaow.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieTabi/tabiwaow.ogg similarity index 100% rename from Resources/Audio/Items/tabiwaow.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieTabi/tabiwaow.ogg diff --git a/Resources/Audio/Items/vegaheyy.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg similarity index 100% rename from Resources/Audio/Items/vegaheyy.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieVega/vegaheyy.ogg diff --git a/Resources/Audio/Items/vegawoag.ogg b/Resources/Audio/Items/Toys/Plushie/PlushieVega/vegawoag.ogg similarity index 100% rename from Resources/Audio/Items/vegawoag.ogg rename to Resources/Audio/Items/Toys/Plushie/PlushieVega/vegawoag.ogg diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 8362ea48c2..03ac204625 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/jennplush.png b/Resources/Textures/Objects/Fun/toys.rsi/jennplush.png new file mode 100644 index 0000000000..ea25cc062e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/jennplush.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 6b8e5e248f..4e2592d29d 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -428,6 +428,9 @@ }, { "name": "tabiplushie" + }, + { + "name": "jennplush" } ] }