Merge branch 'master' into oni-ears

Resources/Changelog/Changelog.yml

@@ -5264,3 +5264,33 @@ Entries:
       message: Changed paramedic voidsuit from a softsuit to a hardsuit.
   id: 6257
   time: '2024-08-12T21:43:52.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Fix
+      message: Whitelist requirements work properly
+  id: 6258
+  time: '2024-08-13T17:08:24.0000000+00:00'
+- author: Skubman and leonardo-dabepis
+  changes:
+    - type: Add
+      message: Onis now get a unique speech bubble, a black bubble with horns.
+    - type: Add
+      message: >-
+        Onis have received a distinct speech style that reflects their strength.
+        Hear them 'grunt', 'bellow', 'blare', and 'rumble' as they talk.
+    - type: Tweak
+      message: >-
+        The Nekomimetic language description has been changed to mention Onis
+        speaking it.
+  id: 6259
+  time: '2024-08-13T17:12:15.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: A ton of new plushies has arrived
+    - type: Add
+      message: >-
+        Prize counter are here, get your prizes by winning games and getting
+        prize tickets! and find prize balls!!
+  id: 6260
+  time: '2024-08-13T17:16:52.0000000+00:00'

Resources/Locale/en-US/chat/managers/chat-manager.ftl

@@ -112,6 +112,12 @@ chat-speech-verb-vox-1 = screeches
 chat-speech-verb-vox-2 = shrieks
 chat-speech-verb-vox-3 = croaks
 
+chat-speech-verb-name-oni = Oni
+chat-speech-verb-oni-1 = grunts
+chat-speech-verb-oni-2 = bellows
+chat-speech-verb-oni-3 = blares
+chat-speech-verb-oni-4 = rumbles
+
 chat-speech-verb-name-canine = Canine
 chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs

Resources/Locale/en-US/language/languages.ftl

@@ -11,7 +11,7 @@ language-RootSpeak-name = Rootspeak
 language-RootSpeak-description = The strange whistling-style language spoken by the Diona.
 
 language-Nekomimetic-name = Nekomimetic
-language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids, it's somehow comprehensible.
+language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the Felinids and Oni, it's somehow comprehensible.
 
 language-Draconic-name = Draconic
 language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles.

Resources/Migrations/eeMigration.yml

@@ -0,0 +1,3 @@
+# 2024-06-08
+CrateFunPlushie: CrateFunToyBox
+CrateFunLizardPlushieBulk: CrateFunToyBox

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:

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

@@ -1,50 +1,3 @@
-- 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: StorageFill
-    contents:
-      - id: PlushieBee
-      - id: PlushieNar
-      - id: PlushieCarp
-      - id: PlushieNuke
-      - id: PlushieSlime
-      - id: PlushieSnake
-      - id: PlushieLizard
-      - id: PlushieSpaceLizard
-      - id: PlushieVox
-      - id: PlushieRouny
-      - id: PlushieRatvar
-      - id: PlushieSharkBlue
-        orGroup: PlushieShark
-      - id: PlushieSharkGrey
-        orGroup: PlushieShark
-      - id: PlushieAtmosian
-      - id: PlushieDiona
-      - id: PlushieXeno
-      - id: PlushieHampter
-      - id: PlushieMoth
-      - id: PlushieMothRandom # Nyanotrasen - Random Moth Plushies
-        amount: 2
-      - id: PlushieArachind
-      - id: PlushiePenguin
-      - id: PlushieArachne
-
-- 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: StorageFill
-    contents:
-      - id: PlushieLizard
-        amount: 3
-      - id: PlushieSpaceLizard
-        amount: 2
-
 - type: entity
   id: CrateFunInstrumentsVariety
   parent: CrateGenericSteel

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

@@ -12,6 +12,7 @@
       rarePrototypes:
         - FoamBlade
         - PlushieGhost
+        - PlushieAbductorAgent
       rareChance: 0.03
       prototypes:
         - PlushieBee
@@ -37,6 +38,37 @@
         - PlushieMothRandom # Nyanotrasen Random Moth Plushies
         - PlushieArachind
         - PlushieArachne
+        - 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
       chance: 0.5
       offset: 0.2