diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 4312a31f46..e096185907 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -7,7 +7,7 @@
     - type: AtmosAlarmable
       alarmedBy:
       - FireAlarm
-      - GasVentPump # TODO: No
+      - AirSensor
     - type: ApcPowerReceiver
     - type: ExtensionCableReceiver
     - type: DeviceNetwork
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index bdddfa018f..de129b0959 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -32,27 +32,8 @@
       transmitFrequencyId: AtmosMonitor
       prefix: device-address-prefix-vent
       sendBroadcastAttemptEvent: true
-    - type: DeviceList
     - type: WiredNetworkConnection
-    - type: AtmosAlarmable
-      alarmedBy:
-      - GasVentPump # TODO: No
     - type: AtmosDevice
-    - type: AtmosMonitor
-      temperatureThreshold: stationTemperature
-      pressureThreshold: stationPressure
-      gasThresholds:
-        Oxygen: stationOxygen
-        Nitrogen: ignore
-        CarbonDioxide: stationCO2
-        Plasma: danger # everything below is usually bad
-        Tritium: danger
-        WaterVapor: danger
-        Miasma: danger
-        NitrousOxide: danger
-        Frezon: danger
-    - type: AccessReader
-      access: [ [ "Atmospherics" ] ]
     - type: Sprite
       netsync: false
       drawdepth: FloorObjects
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
new file mode 100644
index 0000000000..0326db4bd9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -0,0 +1,37 @@
+- type: entity
+  id: AirSensor
+  name: air sensor
+  description: Air sensor. It senses air.
+  components:
+    - type: ApcPowerReceiver
+    - type: ExtensionCableReceiver
+    - type: DeviceNetwork
+      deviceNetId: AtmosDevices
+      receiveFrequencyId: AtmosMonitor
+      transmitFrequencyId: AtmosMonitor
+      prefix: device-address-prefix-sensor
+      sendBroadcastAttemptEvent: true
+    - type: DeviceList
+    - type: WiredNetworkConnection
+    - type: AtmosDevice
+    - type: AtmosMonitor
+      temperatureThreshold: stationTemperature
+      pressureThreshold: stationPressure
+      gasThresholds:
+        Oxygen: stationOxygen
+        Nitrogen: ignore
+        CarbonDioxide: stationCO2
+        Plasma: danger # everything below is usually bad
+        Tritium: danger
+        WaterVapor: danger
+        Miasma: danger
+        NitrousOxide: danger
+        Frezon: danger
+    - type: AccessReader
+      access: [ [ "Atmospherics" ] ]
+    - type: Sprite
+      netsync: false
+      drawdepth: FloorObjects
+      sprite: Structures/Specific/Atmospherics/sensor.rsi
+      layers:
+        - state: gsensor1
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index 0860acdea2..7588231fa7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -17,7 +17,7 @@
   - type: WiredNetworkConnection
   - type: DeviceList
   - type: AtmosAlarmable
-    alarmedBy: ["GasVentPump"]
+    alarmedBy: ["AirSensor"]
   - type: AtmosDevice
   - type: AirAlarm
   - type: Clickable
diff --git a/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/gsensor0.png b/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/gsensor0.png
new file mode 100644
index 0000000000..c1a10f0020
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/gsensor0.png differ
diff --git a/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/gsensor1.png b/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/gsensor1.png
new file mode 100644
index 0000000000..e4e4a96da3
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/gsensor1.png differ
diff --git a/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/meta.json b/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/meta.json
new file mode 100644
index 0000000000..464ca9ba98
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/Atmospherics/sensor.rsi/meta.json
@@ -0,0 +1,13 @@
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"license": "CC 3.0 BY-SA",
+	"copyright": "Taken from /tg/station on commit https://github.com/tgstation/tgstation/commit/1dd5021b2c5b64e954935bdf77bc973c34016a04",
+	"states": [
+		{ "name": "gsensor0" },
+		{ "name": "gsensor1" }
+	]
+}