From c721c5a2d8784ac6779d84915d9ff5c04b45a6e8 Mon Sep 17 00:00:00 2001 From: MintRain Date: Sun, 22 Dec 2024 11:54:18 +0300 Subject: [PATCH] Fix --- .../Entities/Markers/Spawners/Random/toy.yml | 7 +++ .../Entities/Objects/Decoration/present.yml | 12 +++++ .../Structures/Machines/Computers/arcades.yml | 7 +++ .../Starshine/Entities/Objects/Fun/toys.yml | 44 +++++++++---------- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 42eba88e182473..8d3b8dfc2af9a4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -31,6 +31,13 @@ - PlushieSharkBlue - PlushieSharkPink - PlushieSharkGrey + - PlushieSharkGreen #starshine start. + - PlushieSharkBrown + - PlushieSharkGold + - PlushieSharkOrange + - PlushieSharkBurn + - PlushieSharkBlack + - PlushieSharkPurple #starshine end. - ToyAmongPequeno - ToyMouse - PlushieDiona diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 7be281561837d8..5528239e368c2b 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index d7f0297101a8b7..7171f28252bdb8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -120,6 +120,13 @@ - PlushieGhost - PlushieDiona - PlushieSharkBlue + - PlushieSharkPink + - PlushieSharkGrey + - PlushieSharkGreen #starshine start. + - PlushieSharkPurple + - PlushieSharkOrange + - PlushieSharkBlack + - PlushieSharkBrown #starshine end. - PlushieVox - PlushieXeno - PlasticBanana diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index 56157cfa7c047c..1f038601ac5cdd 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -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 - - -