Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MintRainSS committed Dec 22, 2024
1 parent f450260 commit c721c5a
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 23 deletions.
7 changes: 7 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
- PlushieSharkBlue
- PlushieSharkPink
- PlushieSharkGrey
- PlushieSharkGreen #starshine start.
- PlushieSharkBrown
- PlushieSharkGold
- PlushieSharkOrange
- PlushieSharkBurn
- PlushieSharkBlack
- PlushieSharkPurple #starshine end.
- ToyAmongPequeno
- ToyMouse
- PlushieDiona
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Entities/Objects/Decoration/present.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,18 @@
orGroup: GiftPool
- id: PlushieSharkGrey
orGroup: GiftPool
- id: PlushieSharkGreen #starshine start.
orGroup: GiftPool
- id: PlushieSharkGold
orGroup: GiftPool
- id: PlushieSharkPurple
orGroup: GiftPool
- id: PlushieSharkOrange
orGroup: GiftPool
- id: PlushieSharkBlack
orGroup: GiftPool
- id: PlushieSharkBrown
orGroup: GiftPool #starshine end.
- id: ToyAmongPequeno
orGroup: GiftPool
- id: PlushieDiona
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
- PlushieGhost
- PlushieDiona
- PlushieSharkBlue
- PlushieSharkPink
- PlushieSharkGrey
- PlushieSharkGreen #starshine start.
- PlushieSharkPurple
- PlushieSharkOrange
- PlushieSharkBlack
- PlushieSharkBrown #starshine end.
- PlushieVox
- PlushieXeno
- PlasticBanana
Expand Down
44 changes: 21 additions & 23 deletions Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
@@ -1,115 +1,113 @@
- type: entity
parent: PlushieSharkBlue
id: PlushieSharkStarshineBase
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
- type: Item
storedRotation: -90

- type: entity
parent: PlushieSharkStarshineBase
id: PlushieSharkGold
name: gold shark soft toy
description: Soft and shiny!
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: gold
- type: Item
heldPrefix: gold
storedRotation: -90
- type: Tag
tags:
- PlushieSharkGold
- Payload

- type: entity
parent: PlushieSharkBlue
parent: PlushieSharkStarshineBase
id: PlushieSharkBurn
name: burn shark soft toy
description: Still dreams of seeing the sea, at least once again...
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: burn
- type: Item
heldPrefix: burn
storedRotation: -90
- type: Tag
tags:
- PlushieSharkBurn
- Payload

- type: entity
parent: PlushieSharkBlue
parent: PlushieSharkStarshineBase
id: PlushieSharkGreen
name: green shark soft toy
description: A bright green shark with a friendly smile.
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: green
- type: Item
heldPrefix: green
storedRotation: -90
- type: Tag
tags:
- PlushieSharkGreen
- Payload

- type: entity
parent: PlushieSharkBlue
parent: PlushieSharkStarshineBase
id: PlushieSharkPurple
name: purple shark soft toy
description: Comfortable to hug, like a sea fantasy.
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: purple
- type: Item
heldPrefix: purple
storedRotation: -90
- type: Tag
tags:
- PlushieSharkPurple
- Payload

- type: entity
parent: PlushieSharkBlue
parent: PlushieSharkStarshineBase
id: PlushieSharkBrown
name: brown shark soft toy
description: Soft and cozy, perfect for play.
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: brown
- type: Item
heldPrefix: brown
storedRotation: -90
- type: Tag
tags:
- PlushieSharkBrown
- Payload

- type: entity
parent: PlushieSharkBlue
parent: PlushieSharkStarshineBase
id: PlushieSharkBlack
name: black shark soft toy
description: Strict and stylish, like the night sea.
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: black
- type: Item
heldPrefix: black
storedRotation: -90
- type: Tag
tags:
- PlushieSharkBlack
- Payload

- type: entity
parent: PlushieSharkBlue
parent: PlushieSharkStarshineBase
id: PlushieSharkOrange
name: orange shark soft toy
description: Bright and joyful, like a sunset on the beach.
components:
- type: Sprite
sprite: Starshine/Objects/Fun/sharkplush.rsi
state: orange
- type: Item
heldPrefix: orange
storedRotation: -90
- type: Tag
tags:
- PlushieSharkOrange
- Payload



0 comments on commit c721c5a

Please sign in to comment.