Fix YAML

AdventureTimeSS14 · Oct 4, 2023 · fe86654 · fe86654
1 parent 8ad821b
commit fe86654
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -51,8 +51,8 @@ public sealed partial class HumanoidAppearanceComponent : Component
     /// <summary>
     ///     Current voice. Used for correct cloning.
     /// </summary>
-    [DataField("voice", customTypeSerializer: typeof(PrototypeIdSerializer<TTSVoicePrototype>))]
-    public string Voice { get; set; } = SharedHumanoidAppearanceSystem.DefaultVoice;
+    [DataField("voice")]
+    public ProtoId<TTSVoicePrototype> Voice { get; set; } = SharedHumanoidAppearanceSystem.DefaultVoice;
     // Corvax-TTS-End
 
     /// <summary>

diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/ammo.yml b/Resources/Prototypes/ADT/Recipes/Lathes/ammo.yml
@@ -0,0 +1,20 @@
+- type: latheRecipe
+  id: SpeedLoader357
+  result: SpeedLoader357
+  completetime: 5
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: SpeedLoader357Rubber
+  result: SpeedLoader357Rubber
+  completetime: 5
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: MagazineShotgun
+  result: MagazineShotgun
+  completetime: 5
+  materials:
+    Steel: 300
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
@@ -19,7 +19,7 @@
     sprite: Clothing/Neck/mantles/cemantle.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/cemantle.rsi
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckMantleCMO
@@ -30,7 +30,7 @@
     sprite: Clothing/Neck/mantles/cmomantle.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/cmomantle.rsi
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckMantleHOP
@@ -41,7 +41,7 @@
     sprite: Clothing/Neck/mantles/hopmantle.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/hopmantle.rsi
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckMantleHOS
@@ -52,7 +52,7 @@
     sprite: Clothing/Neck/mantles/hosmantle.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/hosmantle.rsi
-    
+
 - type: entity # Corvax-Resprite: Old mantle renamed and saved as that new entity
   parent: ClothingNeckBase
   id: ClothingNeckMantleHOSShoulder
@@ -63,7 +63,7 @@
     sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckMantleRD
@@ -74,14 +74,3 @@
     sprite: Clothing/Neck/mantles/rdmantle.rsi
   - type: Clothing
     sprite: Clothing/Neck/mantles/rdmantle.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckMantleQM
-  name: quartermaster's mantle
-  description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority!
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/mantles/qmmantle.rsi
-  - type: Clothing
-    sprite: Clothing/Neck/mantles/qmmantle.rsi  
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -814,7 +814,6 @@
       - ClothingNeckMantleHOSShoulder # Corvax-Resprite: Old mantle
       - ClothingNeckMantleRD
       - ClothingNeckMantleQM # Corvax-Resprite
-      - ClothingNeckMantleQM
       - ClothingOuterWinterMusician
       - ClothingOuterWinterClown
       - ClothingOuterWinterMime

diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -563,15 +563,6 @@
     Cloth: 150
     Durathread: 150
 
-- type: latheRecipe
-  id: ClothingNeckMantleQM
-  result: ClothingNeckMantleQM
-  completetime: 2.8
-  materials:
-    Cloth: 150
-    Durathread: 150
-
-
 - type: latheRecipe
   id: ClothingOuterWinterMusician
   result: ClothingOuterWinterMusician

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -76,6 +76,9 @@
     {
       "name": "icon-pen"
     },
+    {
+          "name": "icon-pda"
+    },
     {
       "name": "icon-radiation"
     },