diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index 15bf27fb8f..381bfbfbb3 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -149,7 +149,7 @@
         - 0 # water vapor
         - 0 # ammonia
         - 0.014251686 # 5% N2O
-        # 0.285033721       total 
+        # 0.285033721       total
       temperature: 293.15
 
 - type: entity
@@ -217,14 +217,14 @@
   name: plasma tank
   suffix: Filled
   components:
-  - type: GasTank
-    outputPressure: 101.3
-    air:
-      # 6 minutes of agony
-      volume: 5
-      moles:
-        - 0           # oxygen
-        - 0           # nitrogen
-        - 0           # CO2
-        - 2.051379050 # plasma
-      temperature: 293.15
+    - type: GasTank
+      outputPressure: 101.3
+      air:
+        # 20 minutes of agony
+        volume: 15
+        moles:
+          - 0           # oxygen
+          - 0           # nitrogen
+          - 0           # CO2
+          - 18.74958767 # plasma
+        temperature: 96.22
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 59f135cef7..9f4faf469c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -158,6 +158,8 @@
        - MagazineBoxMagnum
        - MagazineBoxRifle
        - MagazineBoxLightRifle
+       - OxygenTank
+       - PlasmaTank
     emagDynamicRecipes:
       - CartridgePistolRubber
       - CartridgeMagnumRubber
diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml
index c591299419..aee8b1c480 100644
--- a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml
@@ -5,7 +5,7 @@
   noSpawn: true
   components:
   - type: GasProjectile
-    gasUsagePerTile: 0.7
+    gasUsagePerTile: 1.05
   - type: Projectile
     damage:
       types:
diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml
index 5651114d31..701d96faee 100644
--- a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml
@@ -28,7 +28,7 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
   - type: GasAmmoProvider
-    gasUsage: 2.1
+    gasUsage: 6.25
     proto: ProjectileFlamethrower
   - type: Flamethrower
   - type: ItemMapper
@@ -69,7 +69,7 @@
 - type: entity
   name: часть огнемёта
   parent: BaseItem
-  id: WeaponFlamethrowerNoIgniter
+  id: WeaponFlamethrowerUnfinished
   description: Недоделанный огнемёт.
   components:
   - type: Sprite
@@ -87,19 +87,3 @@
     deconstructionTarget: null
     graph: WeaponFlamethrowerGraph
     node: no-igniter
-
-- type: entity
-  name: часть огнемёта
-  parent: WeaponFlamethrowerNoIgniter
-  id: WeaponFlamethrowerUnscrewed
-  description: Недоделанный огнемёт.
-  components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/flamethrower.rsi
-    layers:
-    - state: icon
-  - type: Construction
-    deconstructionTarget: null
-    graph: WeaponFlamethrowerGraph
-    node: unscrewed
-
diff --git a/Resources/Prototypes/White/Recipes/hidden_crafts.yml b/Resources/Prototypes/White/Recipes/hidden_crafts.yml
index 41fd1c90bb..f5df7fae0f 100644
--- a/Resources/Prototypes/White/Recipes/hidden_crafts.yml
+++ b/Resources/Prototypes/White/Recipes/hidden_crafts.yml
@@ -30,13 +30,12 @@
             amount: 5
             doAfter: 5
   - node: no-igniter
-    entity: WeaponFlamethrowerNoIgniter
+    entity: WeaponFlamethrowerUnfinished
     edges:
       - to: unscrewed
         steps:
           - tag: Igniter
   - node: unscrewed
-    entity: WeaponFlamethrowerUnscrewed
     edges:
       - to: flamethrower
         steps:
diff --git a/Resources/Prototypes/White/Recipes/lathe_recipes.yml b/Resources/Prototypes/White/Recipes/lathe_recipes.yml
new file mode 100644
index 0000000000..ad179fa11f
--- /dev/null
+++ b/Resources/Prototypes/White/Recipes/lathe_recipes.yml
@@ -0,0 +1,13 @@
+- type: latheRecipe
+  id: OxygenTank
+  result: OxygenTank
+  completetime: 5
+  materials:
+    Steel: 1000
+
+- type: latheRecipe
+  id: PlasmaTank
+  result: PlasmaTank
+  completetime: 5
+  materials:
+    Steel: 1000