diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 8988e7758c..bb67bcc15a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -80,10 +80,11 @@
     contents:
       - id: ClothingOuterHardsuitAtmos
       - id: ClothingMaskGasAtmos
-      - id: OxygenTankFilled
+      - id: YellowOxygenTankFilled
       - id: ClothingOuterSuitAtmosFire
       - id: ClothingHeadHelmetAtmosFire
       - id: GasAnalyzer
+      - id: MedkitOxygenFilled
 
 - type: entity
   id: LockerEngineerFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
index 418d4e86d2..218373617d 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
@@ -6,10 +6,11 @@
     ClothingBackpackDuffelEngineering: 2
     ClothingBackpackSatchelEngineering: 2
     ClothingBackpackEngineering: 2
-    ClothingUniformJumpsuitEngineering: 3
-    ClothingUniformJumpskirtEngineering: 3
-    ClothingShoesColorBlack: 3
+    ClothingUniformJumpsuitAtmos: 3
+    ClothingUniformJumpskirtAtmos: 3
+    ClothingShoesColorWhite: 3
     ClothingHeadsetEngineering: 2
-    ClothingOuterSuitFire: 2
     ClothingHeadHelmetFire: 2
+    ClothingOuterSuitFire: 2
     ClothingOuterWinterAtmos: 2
+    ClothingHandsGlovesCombat: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 9fb5fbe679..0dd42c7342 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -530,3 +530,14 @@
     sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi  
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtAtmos
+  name: atmosheric technician jumpskirt
+  description: I am at work. I can't leave work. Work is breathing. I am testing air quality.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 494d21ed73..2ae12a73a3 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -756,3 +756,16 @@
     sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
+    
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitAtmos
+  name: atmosheric technician jumpsuit
+  description: I am at work. I can't leave work. Work is breathing. I am testing air quality.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
+    
+    
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 855936073f..46792ab0f8 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -258,7 +258,19 @@
     layers:
       - state: green
       - state: engineer
-
+      
+- type: entity
+  id: SpawnPointAtmos
+  parent: SpawnPointJobBase
+  name: atmospherics
+  components:
+    - type: SpawnPoint
+      job_id: AtmosphericTechnician
+    - type: Sprite
+      layers:
+        - state: green
+        - state: atmospherics
+        
 # Medical
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 9b0fe897d1..82e0a384f8 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -505,3 +505,19 @@
     handheld: true
     bank: 1
     program: 2
+
+- type: entity
+  parent: BasePDA
+  id: AtmosPDA
+  name: atmos PDA
+  description: Still smells like plasma.
+  components:
+  - type: PDA
+    id: AtmosIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-atmos
+  - type: Icon
+    state: pda-atmos
+        
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 84a1f423dc..5440e69f3e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -390,3 +390,15 @@
     interfaces:
       - key: enum.AgentIDCardUiKey.Key
         type: AgentIDCardBoundUserInterface
+        
+- type: entity
+  parent: IDCardStandard
+  id: AtmosIDCard
+  name: atmospheric technician ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: orange
+    - state: idatmospherictechnician
+  - type: PresetIdCard
+    job: AtmosphericTechnician
diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml
index f5e7cc8ea4..ef0f8cc21a 100644
--- a/Resources/Prototypes/Maps/atlas.yml
+++ b/Resources/Prototypes/Maps/atlas.yml
@@ -37,3 +37,4 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 2, 2 ]
     Musician: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index 0ca97dd244..610ad696b7 100644
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -36,3 +36,4 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 3, 3 ] 
     Musician: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/delta.yml b/Resources/Prototypes/Maps/delta.yml
index c775766580..64d6dd7316 100644
--- a/Resources/Prototypes/Maps/delta.yml
+++ b/Resources/Prototypes/Maps/delta.yml
@@ -36,3 +36,4 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 3, 3 ] 
     Musician: [ 2, 2 ]
+    AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/game.yml b/Resources/Prototypes/Maps/game.yml
index 49a1832ae4..69d99d23f3 100644
--- a/Resources/Prototypes/Maps/game.yml
+++ b/Resources/Prototypes/Maps/game.yml
@@ -37,7 +37,8 @@
     Lawyer: [ 1, 1 ]
     SalvageSpecialist: [ 1, 2 ]
     Quartermaster: [ 1, 1 ]
-
+    AtmosphericTechnician: [ 1, 2 ]
+    
 - type: gameMap
   id: packedstation
   mapName: 'Packedstation'
@@ -80,6 +81,7 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 1, 2 ]
     Musician: [1, 1]
+    AtmosphericTechnician: [ 1, 2 ]
 
 - type: gameMap
   id: knightship
@@ -141,6 +143,7 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 4, 6 ]
     Musician: [1, 1]
+    AtmosphericTechnician: [ 1, 2 ]
 
 - type: gameMap
   id: ssreach
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index d99b1879d8..86604a863a 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -37,3 +37,4 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 3, 3 ] 
     Musician: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/moose.yml b/Resources/Prototypes/Maps/moose.yml
index a9ac148462..5c555cd8bc 100644
--- a/Resources/Prototypes/Maps/moose.yml
+++ b/Resources/Prototypes/Maps/moose.yml
@@ -37,3 +37,4 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 1, 2 ]
     Musician: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/splitstation.yml b/Resources/Prototypes/Maps/splitstation.yml
index 513d499d98..feede53ddc 100644
--- a/Resources/Prototypes/Maps/splitstation.yml
+++ b/Resources/Prototypes/Maps/splitstation.yml
@@ -36,3 +36,4 @@
     Quartermaster: [ 1, 1 ]
     SalvageSpecialist: [ 4, 6 ] 
     Musician: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
new file mode 100644
index 0000000000..71b0ed5d22
--- /dev/null
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -0,0 +1,28 @@
+- type: job
+  id: AtmosphericTechnician
+  name: "Atmospheric Technician"
+  startingGear: AtmosphericTechnicianGear
+  departments:
+  - Engineering
+  icon: "AtmosphericTechnician"
+  supervisors: "the chief engineer"
+  canBeAntag: false 
+  access:
+  - Maintenance
+  - Engineering
+  - External
+
+- type: startingGear
+  id: AtmosphericTechnicianGear
+  equipment:
+    head: 
+    jumpsuit: ClothingUniformJumpsuitAtmos
+    back: ClothingBackpackEngineeringFilled
+    shoes: ClothingShoesColorWhite
+    outerClothing: 
+    id: AtmosPDA
+    belt: ClothingBeltUtilityFilled
+    ears: ClothingHeadsetEngineering
+  innerclothingskirt: ClothingUniformJumpskirtAtmos
+  satchel: ClothingBackpackSatchelEngineeringFilled
+  duffelbag: ClothingBackpackDuffelEngineeringFilled
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..6a867d0ffd
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png
new file mode 100644
index 0000000000..88e3456ff1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png
new file mode 100644
index 0000000000..0a44f2f3e9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png
new file mode 100644
index 0000000000..815b2a813c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
new file mode 100644
index 0000000000..945e39d34b
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..02fd03dc92
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png
new file mode 100644
index 0000000000..209d9a8ab3
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png
new file mode 100644
index 0000000000..9cfedb2728
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png
new file mode 100644
index 0000000000..e5035e20de
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
new file mode 100644
index 0000000000..945e39d34b
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file