Skip to content

Commit

Permalink
Wife Plush (#83)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

I added my wife as a marketable plushie.

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: The Grimble plush has been added.
  • Loading branch information
sleepyyapril authored Dec 2, 2024
1 parent 387dfea commit 6fd67ac
Show file tree
Hide file tree
Showing 16 changed files with 104 additions and 6 deletions.
15 changes: 15 additions & 0 deletions Resources/Audio/Items/Toys/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,18 @@
license: "CC0-1.0"
copyright: "Created by unusualcrow for ss14"
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/skub2.ogg"

- files: ["grimble1.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Created by Grimsy Arcum"
source: "https://github.com/TheDenSS14/TheDen/blob/d5defa599324678ea218ff7cb8f430181a98c5ab/Resources/Audio/Items/Toys/grimble1.ogg"

- files: ["grimble2.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Created by Grimsy Arcum"
source: "https://github.com/TheDenSS14/TheDen/blob/d5defa599324678ea218ff7cb8f430181a98c5ab/Resources/Audio/Items/Toys/grimble2.ogg"

- files: ["grimbleactive.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Created by Grimsy Arcum"
source: "https://github.com/TheDenSS14/TheDen/blob/d5defa599324678ea218ff7cb8f430181a98c5ab/Resources/Audio/Items/Toys/grimbleactive.ogg"
Binary file added Resources/Audio/Items/Toys/grimble1.ogg
Binary file not shown.
Binary file added Resources/Audio/Items/Toys/grimble2.ogg
Binary file not shown.
Binary file added Resources/Audio/Items/Toys/grimbleactive.ogg
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
id: PlushieArachind
- !type:EntSelector
id: PlushiePenguin
- !type:EntSelector
id: PlushieGrim

- type: entity
id: CrateFunPlushie
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,8 @@
- id: PlushieMothBartender
prob: 0.5
orGroup: Plushie
- id: PlushieGrim
orGroup: Plushie

# Random snacks, replaces MailChocolate (lousy animal organs)
- type: entity
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Decoration/present.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
orGroup: GiftPool
- id: PlushieArachind
orGroup: GiftPool
- id: PlushieGrim
orGroup: GiftPool
- id: ClothingNeckCloakMoth
orGroup: GiftPool
- id: ToyMouse
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,9 @@
- id: PlushieAbductor
prob: 0.50
orGroup: Prize
- id: PlushieGrim
prob: 0.50
orGroup: Prize
- id: PlushieTrystan
prob: 0.50
orGroup: Prize
Expand Down
50 changes: 50 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1965,3 +1965,53 @@
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: shadowkin

- type: entity
parent: BasePlushie
id: PlushieGrim
name: grimble plushie
description: Smells like ginger.
components:
- type: Sprite
sprite: Objects/Fun/toys.rsi
state: plushie_grim
- type: StaminaDamageOnHit
damage: 0.8
- type: EmitSoundOnActivate
sound:
collection: Grimble
params:
variation: 0.05
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/grimbleactive.ogg
- type: EmitSoundOnCollide
sound:
collection: Grimble
params:
variation: 0.05
- type: EmitSoundOnLand
sound:
collection: Grimble
params:
variation: 0.05
- type: UseDelay
delay: 0.8
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 0.5
damage:
types:
Blunt: 0
soundHit:
collection: Grimble
params:
variation: 0.05
soundSwing:
collection: Grimble
params:
variation: 0.05
soundNoDamage:
collection: Grimble
params:
variation: 0.05
Original file line number Diff line number Diff line change
Expand Up @@ -1560,6 +1560,7 @@
- CrazyGlue
- PlushieRatvar
- PlushieNar
- PlushieGrim
- type: EmagLatheRecipes
emagStaticRecipes:
- PlushieGhost
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/prizecounter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,14 @@
materials:
PrizeTicket: 80

- type: latheRecipe
id: PlushieGrim
result: PlushieGrim
applyMaterialDiscount: false
completeTime: 0.1
materials:
PrizeTicket: 50

# EMAG

- type: latheRecipe
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/SoundCollections/toys.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: soundCollection
id: Grimble
files:
- /Audio/Items/Toys/grimble1.ogg
- /Audio/Items/Toys/grimble2.ogg
11 changes: 9 additions & 2 deletions Resources/Prototypes/TheDen/Loadouts/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@
id: LoadoutNetworkConfigurator
category: Items
cost: 0
exclusive: true
items:
- NetworkConfigurator
- NetworkConfigurator

- type: loadout
id: LoadoutPlushieGrim
category: Items
cost: 0
canBeHeirloom: true
items:
- PlushieGrim
8 changes: 4 additions & 4 deletions Resources/Prototypes/threats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
announcement: terror-dragon
rule: DragonSpawn

- type: ninjaHackingThreat
id: Revenant
announcement: terror-revenant
rule: RevenantSpawn
#- type: ninjaHackingThreat
# id: Revenant
# announcement: terror-revenant
# rule: RevenantSpawn
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,9 @@
},
{
"name": "shadowkin"
},
{
"name": "plushie_grim"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6fd67ac

Please sign in to comment.