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

Plushie Update! #654

Merged
merged 14 commits into from
Aug 13, 2024
Binary file added Resources/Audio/Effects/silence.ogg
Binary file not shown.
20 changes: 0 additions & 20 deletions Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,6 @@
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunPlushies
icon:
sprite: Objects/Fun/toys.rsi
state: plushie_h
product: CrateFunPlushie
cost: 1000
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunLizardPlushies
icon:
sprite: Objects/Fun/toys.rsi
state: plushie_lizard
product: CrateFunLizardPlushieBulk
cost: 500
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: FunBoardGames
icon:
Expand Down
47 changes: 0 additions & 47 deletions Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,3 @@
- type: entity
id: CrateFunPlushie
parent: CrateGenericSteel
name: plushie crate
description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
components:
- type: StorageFill
contents:
- id: PlushieBee
- id: PlushieNar
- id: PlushieCarp
- id: PlushieNuke
- id: PlushieSlime
- id: PlushieSnake
- id: PlushieLizard
- id: PlushieSpaceLizard
- id: PlushieVox
- id: PlushieRouny
- id: PlushieRatvar
- id: PlushieSharkBlue
orGroup: PlushieShark
- id: PlushieSharkGrey
orGroup: PlushieShark
- id: PlushieAtmosian
- id: PlushieDiona
- id: PlushieXeno
- id: PlushieHampter
- id: PlushieMoth
- id: PlushieMothRandom # Nyanotrasen - Random Moth Plushies
amount: 2
- id: PlushieArachind
- id: PlushiePenguin
- id: PlushieArachne

- type: entity
id: CrateFunLizardPlushieBulk
parent: CrateGenericSteel
name: bulk lizard plushie crate
description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT.
components:
- type: StorageFill
contents:
- id: PlushieLizard
amount: 3
- id: PlushieSpaceLizard
amount: 2

- type: entity
id: CrateFunInstrumentsVariety
parent: CrateGenericSteel
Expand Down
32 changes: 32 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
rarePrototypes:
- FoamBlade
- PlushieGhost
- PlushieAbductorAgent
rareChance: 0.03
prototypes:
- PlushieBee
Expand All @@ -37,6 +38,37 @@
- PlushieMothRandom # Nyanotrasen Random Moth Plushies
- PlushieArachind
- PlushieArachne
- PlushieAbductor
- PlushieGnome
- PlushieLoveable
- PlushieDeer
- PlushieIpc
- PlushieGrey
- PlushieRedFox
- PlushiePurpleFox
- PlushiePinkFox
- PlushieOrangeFox
- PlushieMarbleFox
- PlushieCrimsonFox
- PlushieCoffeeFox
- PlushieBlueFox
- PlushieBlackFox
- PlushieVulp
- PlushieCorgi
- PlushieGirlyCorgi
- PlushieRobotCorgi
- PlushieCatBlack
- PlushieCatGrey
- PlushieCatOrange
- PlushieCatSiames
- PlushieCatTabby
- PlushieCatTuxedo
- PlushieCatWhite
- PlushieRatvar
- PlushieNar
- PlushieTrystan
- PlushieSlips
- PlushieJester
chance: 0.5
offset: 0.2

Expand Down
Loading
Loading