diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index 3511963835..79ca46cc40 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -75,6 +75,21 @@
           - 4.75217098 # oxygen
           - 17.8772147 # nitrogen
         temperature: 293.15
+        
+- type: entity
+  id: NitrogenTankFilled
+  parent: RedOxygenTankFilled
+  suffix: Filled
+  name: nitrogen tank
+  components:
+    - type: GasTank
+      outputPressure: 101.325
+      air:
+        volume: 70
+        moles:
+          - 0 # oxygen
+          - 22.6293856 # nitrogen
+        temperature: 293.15
 
 - type: entity
   id: PlasmaTankFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
new file mode 100644
index 0000000000..800c6ee0f0
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
@@ -0,0 +1,15 @@
+- type: vendingMachineInventory
+  id: TankDispenserEVAInventory
+  name: tank dispenser
+  spriteName: tankdispenser
+  startingInventory:
+    OxygenTankFilled: 5
+    NitrogenTankFilled: 5
+    
+- type: vendingMachineInventory
+  id: TankDispenserEngineeringInventory
+  name: tank dispenser
+  spriteName: tankdispenser
+  startingInventory:
+    PlasmaTankFilled: 5
+    OxygenTankFilled: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 34f19559f3..de2ec9170e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1334,3 +1334,33 @@
     - type: WiresVisualizer
   - type: AccessReader
     access: [["Medical"]]
+    
+# Gas Tank Dispenser
+
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineTankDispenserEVA
+  suffix: EVA [O2, N2]
+  name: gas tank dispenser
+  description: A vendor for dispensing gas tanks.
+  components:
+  - type: VendingMachine
+    pack: TankDispenserEVAInventory
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
+    state: dispenser
+    
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineTankDispenserEngineering
+  suffix: ENG [O2, Plasma]
+  name: gas tank dispenser
+  description: A vendor for dispensing gas tanks. This one has an engineering livery.
+  components:
+  - type: VendingMachine
+    pack: TankDispenserEngineeringInventory
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
+    layers:
+    - state: dispenser
+    - state: dispensereng
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png
new file mode 100644
index 0000000000..ed77da131f
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png
new file mode 100644
index 0000000000..7001663a48
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/meta.json
new file mode 100644
index 0000000000..163474fb80
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177, eng layer by peptide",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dispenser"
+    },
+    {
+      "name": "dispensereng"
+    }
+  ]
+}