diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 99094ff10fe7b6..1657714826012c 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -95,7 +95,7 @@
   - type: StorageFill
     contents:
       - id: ClothingMaskBreath
-      - id: EmergencyOxygenTankFilled
+      - id: EmergencyFunnyOxygenTankFilled
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index 4dd9608e2b81e3..15bf27fb8f12e2 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -130,6 +130,27 @@
         - 1.025689525 # nitrogen
       temperature: 293.15
 
+- type: entity
+  id: EmergencyFunnyOxygenTankFilled
+  parent: EmergencyFunnyOxygenTank
+  suffix: Filled
+  components:
+  - type: GasTank
+    outputPressure: 22.4
+    air:
+      # 4 minutes
+      volume: 0.66
+      moles:
+        - 0.270782035 # 95% oxygen
+        - 0 # nitrogen
+        - 0 # CO2
+        - 0 # plasma
+        - 0 # tritium
+        - 0 # water vapor
+        - 0 # ammonia
+        - 0.014251686 # 5% N2O
+        # 0.285033721       total 
+      temperature: 293.15
 
 - type: entity
   id: AirTankFilled
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index b9a8fe7260363f..12b9bfc3dee578 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -146,6 +146,7 @@
         - ToolboxArtisticFilled
         - NitrogenTankFilled
         - DoubleEmergencyNitrogenTankFilled
+        - EmergencyFunnyOxygenTankFilled
         - ToolboxElectricalFilled
         - ToolboxMechanicalFilled
         - ClothingBeltUtility
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 0dba7570f51c1a..71b581a4f3e26a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -198,6 +198,19 @@
   - type: Clothing
     sprite: Objects/Tanks/emergency_double_red.rsi
 
+- type: entity
+  parent: EmergencyOxygenTank
+  id: EmergencyFunnyOxygenTank
+  name: funny emergency oxygen tank
+  description: An easily portable tank for emergencies. Contains very little oxygen with an extra of funny gas, rated for survival use only.
+  components:
+  - type: Sprite
+    sprite: Objects/Tanks/emergency_clown.rsi
+  - type: Item
+    sprite: Objects/Tanks/emergency_clown.rsi
+  - type: Clothing
+    sprite: Objects/Tanks/emergency_clown.rsi
+
 - type: entity
   parent: GasTankRoundBase
   id: AirTank
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-BELT.png
new file mode 100644
index 00000000000000..dd19aa56804a18
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-cat.png
new file mode 100644
index 00000000000000..28b8312c9804e7
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-cat.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-dog.png
new file mode 100644
index 00000000000000..9fa63e895386c4
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-dog.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-fox.png
new file mode 100644
index 00000000000000..86f3bfc35a97b1
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-fox.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644
index 00000000000000..c39e7743064c51
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-hamster.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644
index 00000000000000..eb47f102e7dccb
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-kangaroo.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-pig.png
new file mode 100644
index 00000000000000..59ed19ab59b72b
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-pig.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-possum.png
new file mode 100644
index 00000000000000..0c92aed453e994
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-possum.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-puppy.png
new file mode 100644
index 00000000000000..0a73dc82a5f46c
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-puppy.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-sloth.png
new file mode 100644
index 00000000000000..215c52fca920c8
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE-sloth.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/icon.png
new file mode 100644
index 00000000000000..8940f46cfb2725
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/inhand-left.png
new file mode 100644
index 00000000000000..aa8876973bb062
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/inhand-right.png
new file mode 100644
index 00000000000000..e2aca5eed550f5
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
new file mode 100644
index 00000000000000..489cf3072aea21
--- /dev/null
+++ b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
@@ -0,0 +1,71 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/ff8df99906ab1909674680b9973bd3c909080360",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE-dog",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-puppy",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-fox",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-cat",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-sloth",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-possum",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-pig",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}