]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[Spawn] Plush Dion now spawns (#14986)
authorPuro <103608145+PuroSlavKing@users.noreply.github.com>
Fri, 31 Mar 2023 04:30:06 +0000 (07:30 +0300)
committerGitHub <noreply@github.com>
Fri, 31 Mar 2023 04:30:06 +0000 (22:30 -0600)
* [Spawn] Diona Plush now spawns

shkibididopdop

* compiled code fun.yml

removed "amount: 1", since it initially appears in the amount of 1 piece.

Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Resources/Prototypes/Entities/Objects/Decoration/present.yml

index 815dcf90cd21a9c91a240a636b140743f815830d..5b34762ec2753bc53f2b3f0185003b671cdcd8bb 100644 (file)
@@ -5,32 +5,19 @@
   - type: StorageFill
     contents:
       - id: PlushieBee
-        amount: 1
       - id: PlushieNar
-        amount: 1
       - id: PlushieCarp
-        amount: 1
       - id: PlushieNuke
-        amount: 1
       - id: PlushieSlime
-        amount: 1
       - id: PlushieSnake
-        amount: 1
       - id: PlushieLizard
-        amount: 1
       - id: PlushieSpaceLizard
-        amount: 1
       - id: PlushieVox
-        amount: 1
       - id: PlushieRouny
-        amount: 1
       - id: PlushieRatvar
-        amount: 1
       - id: PlushieSharkBlue
-        amount: 1
       - id: PlushieAtmosian
-        amount: 1
-
+      - id: PlushieDiona
 
 - type: entity
   id: CrateFunInstruments
   - type: StorageFill
     contents:
       - id: SynthesizerInstrument
-        amount: 1
       - id: AcousticGuitarInstrument
-        amount: 1
       - id: ViolinInstrument
-        amount: 1
       - id: TrumpetInstrument
-        amount: 1
       - id: ElectricGuitarInstrument
-        amount: 1
       - id: AccordionInstrument
-        amount: 1
       - id: HarmonicaInstrument
-        amount: 1
       - id: RecorderInstrument
-        amount: 1
       - id: TromboneInstrument
-        amount: 1
       - id: SaxophoneInstrument
-        amount: 1
       - id: GlockenspielInstrument
-        amount: 1
       - id: BanjoInstrument
-        amount: 1
       - id: BikeHornInstrument
-        amount: 1
 
 - type: entity
   id: CrateFunBrass
@@ -78,9 +52,7 @@
       - id: FrenchHornInstrument
         amount: 2
       - id: EuphoniumInstrument
-        amount: 1
       - id: TubaInstrument
-        amount: 1
 
 - type: entity
   id: CrateFunArtSupplies
@@ -89,9 +61,7 @@
   - type: StorageFill
     contents:
       - id: CrayonBox
-        amount: 1
       - id: CrayonWhite
-        amount: 1
 
 - type: entity
   id: CrateFunBoardGames
   - type: StorageFill
     contents:
       - id: ChessBoard
-        amount: 1
       - id: BackgammonBoard
-        amount: 1
       - id: ParchisBoard
-        amount: 1
       - id: CheckerBoard
-        amount: 1
       - id: d6Dice
         amount: 4
 
   - type: StorageFill
     contents:
       - id: VehicleATV
-        amount: 1
       - id: VehicleKeyATV
-        amount: 1
 
 - type: entity
   id: CrateFunSadTromboneImplants
       - id: GlowstickYellow
         amount: 2
       - id: FoodCakeBirthday
-        amount: 1
       - id: DrinkLean
         amount: 4
       - id: KnifePlastic
-        amount: 1
 
 - type: entity
   id: CrateFunSyndicateSegway
     - type: StorageFill
       contents:
         - id: VehicleSyndicateSegway
-          amount: 1
         - id: VehicleKeySyndicateSegway
-          amount: 1
index 9b89f3faaceef45caf79165a6e8c434ae748be05..09c5cfbe19f26e1e0c677f7c157d40bdcb2c6d64 100644 (file)
@@ -31,6 +31,7 @@
         - PlushieSharkGrey
         - ToyAmongPequeno
         - ToyMouse
+        - PlushieDiona
       chance: 0.5
       offset: 0.2
 
index 0740bb0a4d7c686b23e549d4f8a7ce678141c7e3..6988c03b55695117d46be65727152a4429d26d28 100644 (file)
@@ -87,6 +87,8 @@
         orGroup: GiftPool
       - id: ToyAmongPequeno
         orGroup: GiftPool
+      - id: PlushieDiona
+        orGroup: GiftPool
       - id: ToyMouse
         orGroup: GiftPool
       - id: ToyAi