Merge pull request ss14Starlight#1876 from ss14Starlight/starlight-dev

GO GO Gadget Hotfix!

Author: walksanatora

Content.Shared/_Starlight/Magic/Systems/TowerOfBabelSystem.cs

@@ -27,7 +27,7 @@ public override void Initialize()
 
     private void ShuffleLanguages(Entity<LanguageKnowledgeComponent> languageKnower, List<ProtoId<LanguagePrototype>>? allLangs = null)
     {
-        if (MetaData(languageKnower).EntityLifeStage < EntityLifeStage.Terminating)
+        if (TerminatingOrDeleted(languageKnower))
             return; // Entity is terminating caching can cause it to testfail/crash
         if (HasComp<UniversalLanguageSpeakerComponent>(languageKnower))
             return; // One who knows the knowledge of all things cannot know less.

Resources/Locale/en-US/_Starlight/plushies/nebula_plushie.ftl

@@ -0,0 +1,8 @@
+plushie-nebula-1 = CDD Liaison Officer Nebula, reporting for duty!
+plushie-nebula-2 = Hey Nali!
+plushie-nebula-3 = Yes sir.
+plushie-nebula-4 = You've all been such a fantastic audience!
+plushie-nebula-5 = I am so telling the Grand Admiral.
+plushie-nebula-6 = Keep your eyes peeled for Central Domestic's next big show!!!
+plushie-nebula-7 = I will say 'Guh' and you will deal with it, Daniel!
+plushie-nebula-8 = One more boykisser fax and you are being relieved of command.

Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushie_bases.yml

@@ -36,6 +36,35 @@
     useSound:
       path: /Audio/Voice/Resomi/resomi_scream.ogg
 
+- type: entity
+  parent: BasePlushieVocalizer
+  id: BaseAvaliPlushie
+  abstract: true
+  components:
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/_Starlight/Voice/Avali/avali_2.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/_Starlight/Voice/Avali/avali_2.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/_Starlight/Voice/Avali/avali_2.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/_Starlight/Effects/avali_scream.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/_Starlight/Voice/Avali/avali_cry.ogg
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit:
+      path: /Audio/_Starlight/Voice/Avali/avali_cry.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/_Starlight/Effects/avali_scream.ogg
+
 - type: entity
   parent: BasePlushieVocalizer
   id: BaseVulpkaninPlushie

Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushie_datasets.yml

@@ -148,6 +148,12 @@
     prefix: plushie-brighteyes-
     count: 10
 
+- type: localizedDataset
+  id: PlushiesNebula
+  values:
+    prefix: plushie-nebula-
+    count: 8
+
 - type: localizedDataset
   id: PlushiesKilla
   values:

Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushies.yml

@@ -1723,6 +1723,29 @@
     soundHit:
       path: /Audio/Animals/cat_hiss.ogg
 
+- type: entity
+  parent: BaseAvaliPlushie
+  id: PlushieNebula
+  name: nebula plushie
+  description: A marketable plushie of Beta sector's lovable Central Domestic Division official. Toy "Deckard" revolver not included.
+  components:
+  - type: Item
+    size: Small
+    sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi
+  - type: Sprite
+    sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi
+    state: icon
+  - type: ItemToggle
+    onUse: false
+    verbToggleOn: plushie-voicebox-activate
+    verbToggleOff: plushie-voicebox-deactivate
+  - type: ComponentToggler
+    components:
+      - type: DatasetVocalizer
+        dataset: PlushiesNebula
+      - type: TextToSpeech
+        voice: hiyokosaionji
+
 - type: entity
   parent: BaseVulpkaninPlushie
   id: PlushieKilla

Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/icon.png

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "By rtasva",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}