Merge branch 'Plushie' of https://github.com/AtaraxiaSpaceFoundation/…

…ataraxia-station-14 into Plushie
AtaraxiaSpaceFoundation · Sep 1, 2024 · 6363aca · 6363aca
2 parents e391136 + 132933b
commit 6363aca
Show file tree

Hide file tree

Showing 67 changed files with 2,374 additions and 473 deletions.
diff --git a/Resources/Audio/Effects/silence.ogg b/Resources/Audio/Effects/silence.ogg
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -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:

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -40,35 +40,7 @@
     - id: PlushieArachind
     - id: PlushiePenguin
 
-- 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: EntityTableContainerFill
-    containers:
-      entity_storage: !type:NestedSelector
-        tableId: AllPlushiesTable
-        rolls: !type:ConstantNumberSelector
-          value: 10
-
-- 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: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: PlushieLizard
-          amount: !type:ConstantNumberSelector
-            value: 3
-        - id: PlushieSpaceLizard
-          amount: !type:ConstantNumberSelector
-            value: 3
+# Removed crates with toys because EE toys
 
 - type: entity
   id: CrateFunInstrumentsVariety

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -12,6 +12,7 @@
       rarePrototypes:
         - FoamBlade
         - PlushieGhost
+        - PlushieAbductorAgent
       rareChance: 0.03
       prototypes:
         - PlushieBee
@@ -34,6 +35,38 @@
         - ToyMouse
         - PlushieDiona
         - PlushieArachind
+        - PlushieArachne # EE toys START
+        - 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 # EE toys END
       chance: 0.5
       offset: 0.2