diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs
index 0b305faaeb..d29104fcad 100644
--- a/Content.Client/IgnoredComponents.cs
+++ b/Content.Client/IgnoredComponents.cs
@@ -19,7 +19,6 @@ namespace Content.Client
             "EmitSoundOnUse",
             "FootstepModifier",
             "HeatResistance",
-            "Teleportable",
             "ItemTeleporter",
             "EntityStorage",
             "Wirecutter",
@@ -60,7 +59,6 @@ namespace Content.Client
             "Rotatable",
             "MagicMirror",
             "FloorTile",
-            "FootstepSound",
             "ShuttleController",
             "HumanInventoryController",
             "UseDelay",
diff --git a/Resources/Prototypes/Catalog/VendingMachines/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/nutri.yml
index 17b830509a..64def65762 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/nutri.yml
@@ -4,7 +4,7 @@
   description: A vending machine containing nutritional substances for plants and botanical tools.
   spriteName: nutri
   startingInventory:
-    Spade: 3
+    HydroponicsToolSpade: 3
     PlantBGoneSpray: 20
     WeedSpray: 20
     PestSpray: 20
diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
index a63903c1b8..aa69146831 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
@@ -19,15 +19,15 @@
     state: Assistant
 
 # Quartermaster
-- type: entity
-  id: SpawnPointQuartermaster
-  parent: SpawnPointJobBase
-  name: spawn point (quartermaster)
-  components:
-    - type: SpawnPoint
-      job_id: Quartermaster
-    - type: Sprite
-      state: Quartermaster
+#- type: entity
+#  id: SpawnPointQuartermaster
+#  parent: SpawnPointJobBase
+#  name: spawn point (quartermaster)
+#  components:
+#    - type: SpawnPoint
+#      job_id: Quartermaster
+#    - type: Sprite
+#      state: Quartermaster
 
 # Cargo tech
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 6e69101360..925fa649a3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -122,20 +122,20 @@
 #    - type: Icon
 #      state: pda-chaplain
 
-- type: entity
-  name: Quartermaster PDA
-  parent: BasePDA
-  id: QuartermasterPDA
-  description: PDA for the guy that orders the guns.
-  components:
-    - type: PDA
-      idCard: QuartermasterIDCard
-    - type: Appearance
-      visuals:
-        - type: PDAVisualizer
-          state: pda-qm
-    - type: Icon
-      state: pda-qm
+#- type: entity
+#  name: Quartermaster PDA
+#  parent: BasePDA
+#  id: QuartermasterPDA
+#  description: PDA for the guy that orders the guns.
+#  components:
+#    - type: PDA
+#      idCard: QuartermasterIDCard
+#    - type: Appearance
+#      visuals:
+#        - type: PDAVisualizer
+#          state: pda-qm
+#    - type: Icon
+#      state: pda-qm
 
 - type: entity
   name: Cargo PDA
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 91916f84af..10c1eb1743 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -103,17 +103,17 @@
   - type: PresetIdCard
     job: CargoTechnician
 
-- type: entity
-  parent: IDCardStandard
-  id: QuartermasterIDCard
-  name: quartermaster ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idquartermaster
-    - type: PresetIdCard
-      job: Quartermaster
+#- type: entity
+#  parent: IDCardStandard
+#  id: QuartermasterIDCard
+#  name: quartermaster ID card
+#  components:
+#    - type: Sprite
+#      layers:
+#        - state: default
+#        - state: idquartermaster
+#    - type: PresetIdCard
+#      job: Quartermaster
 
 - type: entity
   parent: IDCardStandard
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml
index 2650ac9f5a..9441a6e30a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml
@@ -8,7 +8,9 @@
     - type: Sprite
       state: produce
     - type: Produce
-    - type: Grindable
+    - type: Tag
+      tags:
+      - Grindable
 
 - type: entity
   name: wheat
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 89289ccf31..081d527a4d 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -9,7 +9,7 @@
 
 - type: Tag
   id: FirelockElectronics
-  
+
 - type: Tag
   id: FootstepSound
 
@@ -27,8 +27,8 @@
 
 - type: Tag
   id: Shovel
-  
-  - type: Tag
+
+- type: Tag
   id: Teleportable
 
 - type: Tag