Акулагеддон!

Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/clothing/Neck/pins.ftl

@@ -0,0 +1,20 @@
+ent-ClothingNeckSharkBrownPin = значок коричневой акулы
+    .desc = Это значок акулы.
+ent-ClothingNeckSharkPinkPin = значок розовой акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkGoldPin = значок золотой акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkOrangePin = значок оранжевой акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkBurnPin = значок сгоревшей акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkBluePin = значок синей акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkGreyPin = значок серой акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkBlackPin = значок чёрной акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkGreenPin = значок зелёной акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }
+ent-ClothingNeckSharkPurplePin = значок фиолетовой акулы
+    .desc = { ent-ClothingNeckSharkBrownPin.desc }

Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/fun/toys.ftl

@@ -0,0 +1,15 @@
+
+ent-PlushieSharkGold = золотая плюшевая акула
+    .desc = Мягкая и блестящая!
+ent-PlushieSharkBurn = сгоревшая плюшевая акула
+    .desc = Всё мечтает увидеть море, хотя бы ещё раз...
+ent-PlushieSharkGreen = зелёная плюшевая акула
+    .desc = Ярко-зелёная акула с дружелюбной улыбкой.
+ent-PlushieSharkPurple = фиолетовая плюшевая акула
+    .desc = Удобно обнимать, она словно морская фантазия.
+ent-PlushieSharkOrange = оранжевая плюшевая акула
+    .desc = Яркая и радостная, как закат на пляже.
+ent-PlushieSharkBrown = коричневая плюшевая акула
+    .desc = Мягкая и уютная, идеально подходит для игр.
+ent-PlushieSharkBlack = чёрная плюшевая акула
+    .desc = Строгая и стильная, как ночное море.

Resources/Prototypes/Catalog/Fills/Crates/fun.yml

@@ -29,6 +29,14 @@
     - id: PlushieRouny
     - !type:GroupSelector
       children:
+      - id: PlushieSharkGold   #starshine start.
+        weight: 0.15
+      - id: PlushieSharkBurn
+      - id: PlushieSharkGreen
+      - id: PlushieSharkOrange
+      - id: PlushieSharkBlack
+      - id: PlushieSharkPurple
+      - id: PlushieSharkBrown   #starshine end.
       - id: PlushieSharkBlue
       - id: PlushieSharkGrey
       - id: PlushieSharkPink

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -140,6 +140,16 @@
       # Pins
       - !type:GroupSelector
         children:
+        - id: ClothingNeckSharkBrownPin #starshine start.
+        - id: ClothingNeckSharkBluePin
+        - id: ClothingNeckSharkGreyPin
+        - id: ClothingNeckSharkBlackPin
+        - id: ClothingNeckSharkGreenPin
+        - id: ClothingNeckSharkPurplePin
+        - id: ClothingNeckSharkPinkPin
+        - id: ClothingNeckSharkBurnPin
+        - id: ClothingNeckSharkOrangePin
+        - id: ClothingNeckSharkGoldPin   #starshine end.
         - id: ClothingNeckLGBTPin
         - id: ClothingNeckAromanticPin
         - id: ClothingNeckAsexualPin

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

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

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

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -5,6 +5,16 @@
   minLimit: 0
   maxLimit: 3
   loadouts:
+  - ClothingNeckSharkPinkPin    #starshine start.
+  - ClothingNeckSharkBrownPin
+  - ClothingNeckSharkBlackPin
+  - ClothingNeckSharkGoldPin
+  - ClothingNeckSharkPurplePin
+  - ClothingNeckSharkOrangePin
+  - ClothingNeckSharkGreenPin
+  - ClothingNeckSharkBluePin
+  - ClothingNeckSharkGreyPin
+  - ClothingNeckSharkBurnPin    #starshine end.
   - FlowerWreath
   - Hairflower
   - Headphones

Resources/Prototypes/Starshine/Entities/Clothing/Neck/pins.yml

@@ -0,0 +1,112 @@
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckPinStarshineBase
+  abstract: true
+  components:
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: Starshine/Clothing/Neck/Misc/pins.rsi
+  - type: Clothing
+    sprite: Starshine/Clothing/Neck/Misc/pins.rsi
+
+- type: entity
+  parent: ClothingNeckPinStarshineBase
+  id: ClothingNeckSharkBrownPin
+  name: brown shark pin.
+  description: Its shark pin.
+  components:
+  - type: Sprite
+    state: shark-brown-pin
+  - type: Clothing
+    equippedPrefix: sharkbrownpin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkPinkPin
+  name: pink shark pin.
+  components:
+  - type: Sprite
+    state: shark-pink-pin
+  - type: Clothing
+    equippedPrefix: sharkpinkpin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkGoldPin
+  name: gold shark pin.
+  components:
+  - type: Sprite
+    state: shark-gold-pin
+  - type: Clothing
+    equippedPrefix: sharkgoldpin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkOrangePin
+  name: orange shark pin.
+  components:
+  - type: Sprite
+    state: shark-orange-pin
+  - type: Clothing
+    equippedPrefix: sharkorangepin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkBurnPin
+  name: burn shark pin.
+  components:
+  - type: Sprite
+    state: shark-burn-pin
+  - type: Clothing
+    equippedPrefix: sharkburnpin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkBluePin
+  name: blue shark pin.
+  components:
+  - type: Sprite
+    state: shark-blue-pin
+  - type: Clothing
+    equippedPrefix: sharkbluepin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkGreyPin
+  name: grey shark pin.
+  components:
+  - type: Sprite
+    state: shark-grey-pin
+  - type: Clothing
+    equippedPrefix: sharkgreypin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkBlackPin
+  name: black shark pin.
+  components:
+  - type: Sprite
+    state: shark-black-pin
+  - type: Clothing
+    equippedPrefix: sharkblackpin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkGreenPin
+  name: green shark pin.
+  components:
+  - type: Sprite
+    state: shark-green-pin
+  - type: Clothing
+    equippedPrefix: sharkgreenpin
+
+- type: entity
+  parent: ClothingNeckSharkBrownPin
+  id: ClothingNeckSharkPurplePin
+  name: purple shark pin.
+  components:
+  - type: Sprite
+    state: shark-purple-pin
+  - type: Clothing
+    equippedPrefix: sharkpurplepin

Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml

@@ -0,0 +1,133 @@
+- type: entity
+  abstract: true
+  parent: BasePlushie
+  id: PlushieSharkStarshineBase
+  components:
+  - type: Sprite
+    sprite: Starshine/Objects/Fun/sharkplush.rsi
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/rawr.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/rawr.ogg
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Items/Toys/rawr.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/rawr.ogg
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit:
+      path: /Audio/Items/Toys/rawr.ogg
+  - type: Item
+    storedRotation: -90
+  - type: Tag
+    tags:
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkGold
+  name: gold shark soft toy
+  description: Soft and shiny!
+  components:
+  - type: Sprite
+    state: gold
+  - type: Item
+    heldPrefix: gold
+  - type: Tag
+    tags:
+      - PlushieSharkGold
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkBurn
+  name: burn shark soft toy
+  description: Still dreams of seeing the sea, at least once again...
+  components:
+  - type: Sprite
+    state: burn
+  - type: Item
+    heldPrefix: burn
+  - type: Tag
+    tags:
+      - PlushieSharkBurn
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkGreen
+  name: green shark soft toy
+  description: A bright green shark with a friendly smile.
+  components:
+  - type: Sprite
+    state: green
+  - type: Item
+    heldPrefix: green
+  - type: Tag
+    tags:
+      - PlushieSharkGreen
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkPurple
+  name: purple shark soft toy
+  description: Comfortable to hug, like a sea fantasy.
+  components:
+  - type: Sprite
+    state: purple
+  - type: Item
+    heldPrefix: purple
+  - type: Tag
+    tags:
+      - PlushieSharkPurple
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkBrown
+  name: brown shark soft toy
+  description: Soft and cozy, perfect for play.
+  components:
+  - type: Sprite
+    state: brown
+  - type: Item
+    heldPrefix: brown
+  - type: Tag
+    tags:
+      - PlushieSharkBrown
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkBlack
+  name: black shark soft toy
+  description: Strict and stylish, like the night sea.
+  components:
+  - type: Sprite
+    state: black
+  - type: Item
+    heldPrefix: black
+  - type: Tag
+    tags:
+      - PlushieSharkBlack
+      - Payload
+
+- type: entity
+  parent: PlushieSharkStarshineBase
+  id: PlushieSharkOrange
+  name: orange shark soft toy
+  description: Bright and joyful, like a sunset on the beach.
+  components:
+  - type: Sprite
+    state: orange
+  - type: Item
+    heldPrefix: orange
+  - type: Tag
+    tags:
+      - PlushieSharkOrange
+      - Payload