diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 88c6eafdf4..3222bc2706 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -38,7 +38,7 @@
     - id: PlushieHampter
     - id: PlushieMoth
     - id: PlushieMothRandom # Nyano - random moth plushies
-      amount: 2
+    - id: PlushieMothRandom # Nyano - random moth plushies
     - id: PlushieArachind
     - id: PlushiePenguin
 
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml
index fb11fbf91d..f1a7f54938 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml
@@ -43,7 +43,7 @@
       prob: 0.3
 
 - type: entityTable
-  id: LockerChiefEngineerDeltaV
+  id: LockerFillChiefEngineerDeltaV
   table: !type:AllSelector
     children:
     - id: BoxPDAEngineering
@@ -53,7 +53,7 @@
       prob: 0.3
 
 - type: entityTable
-  id: LockerChiefMedicalOfficerDeltaV
+  id: LockerFillChiefMedicalOfficerDeltaV
   table: !type:AllSelector
     children:
     - id: RubberStampPsychologist # TODO: make a psych locker and move this to it
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml
index e50724053a..2faa815edf 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml
@@ -6,7 +6,7 @@
   components:
   - type: FlavorProfile
     flavors:
-      - sharp
+    - sharp
   - type: SolutionContainerManager
     solutions:
       food:
@@ -36,32 +36,32 @@
   id: FoodGhostPepper
   description: So hot, you'll have one foot in the grave.
   components:
-    - type: FlavorProfile
-      flavors:
-        - spicy
-        - sweet
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 39
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 6
-            - ReagentId: CapsaicinOil
-              Quantity: 15
-            - ReagentId: Vitamin
-              Quantity: 6
-            - ReagentId: Thermite
-              Quantity: 10
-    - type: TileFrictionModifier
-      modifier: 0.05
-    - type: Sprite
-      sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi
-    - type: Produce
-      seedId: GhostPepper
-    - type: Tag
-      tags:
-      - Vegetable
+  - type: FlavorProfile
+    flavors:
+    - spicy
+    - sweet
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 39
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: CapsaicinOil
+          Quantity: 15
+        - ReagentId: Vitamin
+          Quantity: 6
+        - ReagentId: Thermite
+          Quantity: 10
+  - type: TileFrictionModifier
+    modifier: 0.05
+  - type: Sprite
+    sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi
+  - type: Produce
+    seedId: GhostPepper
+  - type: Tag
+    tags:
+    - Vegetable
   - type: FoodSequenceElement
     entries:
       burger:
@@ -76,32 +76,32 @@
   id: FoodCosmicRevenant
   description: Is this even a pepper? Looks... Haunted.
   components:
-    - type: FlavorProfile
-      flavors:
-        - spicy
-        - spooky
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 41
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 8
-            - ReagentId: CapsaicinOil
-              Quantity: 20
-            - ReagentId: Vitamin
-              Quantity: 8
-            - ReagentId: Ectoplasm
-              Quantity: 5
-    - type: TileFrictionModifier
-      modifier: 0.0001
-    - type: Sprite
-      sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
-    - type: Produce
-      seedId: CosmicRevenant
-    - type: Tag
-      tags:
-      - Vegetable
+  - type: FlavorProfile
+    flavors:
+    - spicy
+    - spooky
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 41
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: CapsaicinOil
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 8
+        - ReagentId: Ectoplasm
+          Quantity: 5
+  - type: TileFrictionModifier
+    modifier: 0.0001
+  - type: Sprite
+    sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
+  - type: Produce
+    seedId: CosmicRevenant
+  - type: Tag
+    tags:
+    - Vegetable
   - type: FoodSequenceElement
     entries:
       burger:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml
index 624689a7ed..9a36d37971 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/meals.yml
@@ -73,7 +73,8 @@
     count: 6
     slice: FoodMothGreenLasagneSlice
   - type: Food
-    trash: FoodPlate
+    trash:
+    - FoodPlate
   - type: Sprite
     sprite: Nyanotrasen/Objects/Consumable/Food/meal.rsi
     state: greenlasagne
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml
index f49d6cb2ce..773f848a42 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/snacks.yml
@@ -12,7 +12,8 @@
       - tofu
       - leafy
   - type: Food
-    trash: FoodPlateSmall
+    trash:
+    - FoodPlateSmall
   - type: Sprite
     sprite: Nyanotrasen/Objects/Consumable/Food/Snacks/moth.rsi
     state: squeakingstirfry
@@ -214,7 +215,8 @@
     sprite: Nyanotrasen/Objects/Consumable/Food/Snacks/boritopie.rsi
     state: borito-pie
   - type: Food
-    trash: FoodPacketBoritosTrash
+    trash:
+    - FoodPacketBoritosTrash
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json
index 1f802716c7..c4c8ecef98 100644
--- a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json
@@ -33,10 +33,6 @@
     {
       "name": "equipped-MASK-vulpkanin",
       "directions": 4
-    },
-    {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
index 94f071487d..d4879abf8a 100644
--- a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
@@ -33,10 +33,6 @@
     {
       "name": "equipped-MASK-vulpkanin",
       "directions": 4
-    },
-    {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json
index 9d89c15b13..b7708a22e3 100644
--- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json
@@ -33,10 +33,6 @@
     {
       "name": "equipped-MASK-vulpkanin",
       "directions": 4
-    },
-    {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
     }
   ]
 }