diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 7ecfd89ae14..8bed66c5b98 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -9,10 +9,10 @@
     - type: Transform
       noRot: true
     - type: Sprite
-      sprite: Structures/Storage/canister.rsi
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       noRot: true
       layers:
-        - state: grey
+        - state: air # Frontier
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -101,9 +101,9 @@
     - type: StaticPrice
       price: 100
     - type: AccessReader
-      access: [["Atmospherics"], ["Engineering"], ["Research"], ["Captain"]]
+#      access: [["Atmospherics"], ["Engineering"], ["Research"], ["Captain"]]
     - type: Lock
-      locked: false
+      locked: true
 
 - type: entity
   parent: GasCanister
@@ -111,9 +111,8 @@
   name: storage canister
   components:
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
-        - state: yellow
+        - state: storage # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -161,9 +160,8 @@
   description: A canister that can contain any type of gas. This one is supposed to contain air mixture. It can be attached to connector ports using a wrench.
   components:
   - type: Sprite
-    sprite: _NF/Structures/Storage/canister.rsi # Frontier
     layers:
-      - state: grey
+      - state: air # Frontier
   - type: GasCanister
     gasMixture:
       volume: 1000
@@ -202,9 +200,8 @@
   description: A canister that can contain any type of gas. This one is supposed to contain oxygen. It can be attached to connector ports using a wrench.
   components:
   - type: Sprite
-    sprite: _NF/Structures/Storage/canister.rsi # Frontier
     layers:
-      - state: blue
+      - state: oxygen # Frontier
   - type: GasCanister
     gasMixture:
       volume: 1000
@@ -241,14 +238,40 @@
   name: liquid oxygen canister
   description: A canister that can contain any type of gas. This one is supposed to contain liquid oxygen. It can be attached to connector ports using a wrench.
   components:
+  - type: Sprite
+    layers:
+      - state: oxygen_liquid # Frontier
   - type: GasCanister
     gasMixture:
       volume: 1000
       moles:
         - 18710.71051 # oxygen
       temperature: 72
-  - type: AccessReader
-    access: [["Atmospherics"]]
+#  - type: AccessReader
+#    access: [["Atmospherics"]]
+  - type: Destructible # Frontier
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 600
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          LiquidOxygenCanisterBroken:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:DumpCanisterBehavior
 
 - type: entity
   parent: GasCanister
@@ -257,9 +280,8 @@
   description: A canister that can contain any type of gas. This one is supposed to contain nitrogen. It can be attached to connector ports using a wrench.
   components:
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
-        - state: red
+        - state: nitrogen # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -297,6 +319,9 @@
   name: liquid nitrogen canister
   description: A canister that can contain any type of gas. This one is supposed to contain liquid nitrogen. It can be attached to connector ports using a wrench.
   components:
+  - type: Sprite
+    layers:
+      - state: nitrogen_liquid # Frontier
   - type: GasCanister
     gasMixture:
       volume: 1000
@@ -304,8 +329,31 @@
         - 0 # oxygen
         - 18710.71051 # nitrogen
       temperature: 72
-  - type: AccessReader
-    access: [["Atmospherics"]]
+#  - type: AccessReader
+#    access: [["Atmospherics"]]
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 600
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          LiquidNitrogenCanisterBroken:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:DumpCanisterBehavior
 
 - type: entity
   parent: GasCanister
@@ -314,9 +362,8 @@
   description: A canister that can contain any type of gas. This one is supposed to contain carbon dioxide. It can be attached to connector ports using a wrench.
   components:
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
-        - state: black
+        - state: carbon # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -348,8 +395,8 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
         - !type:DumpCanisterBehavior
-    - type: Lock
-      locked: true
+#    - type: Lock
+#      locked: true
 
 - type: entity
   id: LiquidCarbonDioxideCanister
@@ -357,6 +404,9 @@
   name: liquid carbon dioxide canister
   description: A canister that can contain any type of gas. This one is supposed to contain liquid carbon dioxide. It can be attached to connector ports using a wrench.
   components:
+  - type: Sprite
+    layers:
+      - state: carbon_liquid # Frontier
   - type: GasCanister
     gasMixture:
       volume: 1000
@@ -365,8 +415,31 @@
         - 0 # nitrogen
         - 18710.71051 # CO2
       temperature: 72
-  - type: AccessReader
-    access: [["Atmospherics"]]
+#  - type: AccessReader
+#    access: [["Atmospherics"]]
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 600
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          LiquidCarbonDioxideCanisterBroken:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:DumpCanisterBehavior
 
 - type: entity
   parent: GasCanister
@@ -375,9 +448,8 @@
   description: A canister that can contain any type of gas. This one is supposed to contain plasma. It can be attached to connector ports using a wrench.
   components:
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
-        - state: orange
+        - state: plasma # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -410,8 +482,8 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
         - !type:DumpCanisterBehavior
-    - type: Lock
-      locked: true
+#    - type: Lock
+#      locked: true
 
 - type: entity
   parent: GasCanister
@@ -421,7 +493,7 @@
   components:
     - type: Sprite
       layers:
-        - state: green
+        - state: tritium # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -455,8 +527,8 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
         - !type:DumpCanisterBehavior
-    - type: Lock
-      locked: true
+#    - type: Lock
+#      locked: true
 
 - type: entity
   parent: GasCanister
@@ -465,7 +537,6 @@
   description: A canister that can contain any type of gas. This one is supposed to contain water vapor. It can be attached to connector ports using a wrench.
   components:
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
         - state: water_vapor
     - type: GasCanister
@@ -511,7 +582,7 @@
   components:
     - type: Sprite
       layers:
-        - state: greenys
+        - state: ammonia # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -547,8 +618,8 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
         - !type:DumpCanisterBehavior
-    - type: Lock
-      locked: true
+#    - type: Lock
+#      locked: true
 
 - type: entity
   parent: GasCanister
@@ -557,9 +628,8 @@
   description: A canister that can contain any type of gas. This one is supposed to contain nitrous oxide. It can be attached to connector ports using a wrench.
   components:
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
-        - state: redws
+        - state: nitrous_oxide # Frontier
     - type: GasCanister
       gasMixture:
         volume: 1000
@@ -643,8 +713,8 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
       - !type:DumpCanisterBehavior
-  - type: Lock
-    locked: true
+#  - type: Lock
+#    locked: true
 
 # Broke Entities
 
@@ -681,8 +751,8 @@
       damageModifierSet: Metallic
     - type: InteractionOutline
     - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi
-      state: grey-1
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
+      state: air-1 # Frontier
     - type: Physics
       bodyType: Dynamic
     - type: Fixtures
@@ -707,9 +777,8 @@
   id: StorageCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
-      state: yellow-1
+  - type: Sprite
+    state: storage-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
@@ -717,8 +786,7 @@
   noSpawn: true
   components:
   - type: Sprite
-    sprite: _NF/Structures/Storage/canister.rsi # Frontier
-    state: grey-1
+    state: air-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
@@ -726,43 +794,39 @@
   noSpawn: true
   components:
   - type: Sprite
-    sprite: _NF/Structures/Storage/canister.rsi # Frontier
-    state: blue-1
+    state: oxygen-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
   id: NitrogenCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
-      state: red-1
+  - type: Sprite
+    state: nitrogen-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
   id: CarbonDioxideCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
-      state: black-1
+  - type: Sprite
+    state: carbon-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
   id: PlasmaCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
-      state: orange-1
+  - type: Sprite
+    state: plasma-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
   id: TritiumCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      state: green-1
+  - type: Sprite
+    state: tritium-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
@@ -770,26 +834,24 @@
   name: broken water vapor canister
   noSpawn: true
   components:
-    - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
-      state: water_vapor-1
+  - type: Sprite
+    state: water_vapor-1
 
 - type: entity
   parent: GasCanisterBrokenBase
   id: AmmoniaCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      state: greenys-1
+  - type: Sprite
+    state: ammonia-1
 
 - type: entity
   parent: GasCanisterBrokenBase
   id: NitrousOxideCanisterBroken
   noSpawn: true
   components:
-    - type: Sprite
-      sprite: _NF/Structures/Storage/canister.rsi # Frontier
-      state: redws-1
+  - type: Sprite
+    state: nitrous_oxide-1 # Frontier
 
 - type: entity
   parent: GasCanisterBrokenBase
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Canisters/gas_canisters.yml
new file mode 100644
index 00000000000..46776273a3e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -0,0 +1,23 @@
+- type: entity
+  parent: GasCanisterBrokenBase
+  id: LiquidOxygenCanisterBroken
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: oxygen_liquid-1 # Frontier
+
+- type: entity
+  parent: GasCanisterBrokenBase
+  id: LiquidNitrogenCanisterBroken
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: nitrogen_liquid-1 # Frontier
+
+- type: entity
+  parent: GasCanisterBrokenBase
+  id: LiquidCarbonDioxideCanisterBroken
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: carbon_liquid-1 # Frontier
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/air-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/air-1.png
new file mode 100644
index 00000000000..56809adb298
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/air-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/air.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/air.png
new file mode 100644
index 00000000000..4d33fd002be
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/air.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia-1.png
new file mode 100644
index 00000000000..e659da7034b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia.png
new file mode 100644
index 00000000000..5f039d3de25
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png
deleted file mode 100644
index 2f7fc54a31d..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png
deleted file mode 100644
index 2b07b2b087d..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png
deleted file mode 100644
index 1cb0f83ebf1..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png
deleted file mode 100644
index c39f1ff26e9..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png
index 9360a41c58b..fb7ec38c53c 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png
index 89f617973f8..cfcd91b6c87 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png
index 6f9566ee13c..12e17918084 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png
index 1a0a4023636..e335d45fc57 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png
index 87a68af474a..30736618596 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png
deleted file mode 100644
index 8489866f74b..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png
index 61d286efb55..d7aad250361 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon-1.png
new file mode 100644
index 00000000000..e8b2beecf1a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon.png
new file mode 100644
index 00000000000..3a4e5e940f9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid-1.png
new file mode 100644
index 00000000000..86602c668d9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid.png
new file mode 100644
index 00000000000..717e0a115f6
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png
deleted file mode 100644
index 1cb0f83ebf1..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png
deleted file mode 100644
index f664d0f3bf0..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png
index 1cb0f83ebf1..a9943a3bba4 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png
index c39f1ff26e9..18dc4c4b805 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png
deleted file mode 100644
index df9958d3e6a..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png
deleted file mode 100644
index 75d21b09181..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png
deleted file mode 100644
index ecc5294699b..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png
deleted file mode 100644
index a414a192812..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png
deleted file mode 100644
index d7bef4b366c..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png
deleted file mode 100644
index 6668cd6789b..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png
index 9edd84975f3..4033c7af811 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json
index 95d67cc8ae1..7e59984ee00 100644
--- a/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json
@@ -1,23 +1,23 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
+  "copyright": "Made by stagnation for Frontier",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "black"
+      "name": "air"
     },
     {
-      "name": "black-1"
+      "name": "air-1"
     },
     {
-      "name": "blue"
+      "name": "ammonia"
     },
     {
-      "name": "blue-1"
+      "name": "ammonia-1"
     },
     {
       "name": "can-connector"
@@ -47,76 +47,79 @@
       "name": "can-o3"
     },
     {
-      "name": "can-oa1"
+      "name": "can-open"
     },
     {
-      "name": "can-open"
+      "name": "carbon"
     },
     {
-      "name": "grey"
+      "name": "carbon-1"
     },
     {
-      "name": "grey-1"
+      "name": "carbon_liquid"
     },
     {
-      "name": "orange"
+      "name": "carbon_liquid-1"
     },
     {
-      "name": "orange-1"
+      "name": "frezon"
     },
     {
-      "name": "red"
+      "name": "frezon-1"
     },
     {
-      "name": "red-1"
+      "name": "nitrogen"
     },
     {
-      "name": "redws"
+      "name": "nitrogen-1"
     },
     {
-      "name": "redws-1"
+      "name": "nitrogen_liquid"
     },
     {
-      "name": "yellow"
+      "name": "nitrogen_liquid-1"
     },
     {
-      "name": "yellow-1"
+      "name": "nitrous_oxide"
     },
     {
-      "name": "green"
+      "name": "nitrous_oxide-1"
     },
     {
-      "name": "green-1"
+      "name": "oxygen"
     },
     {
-      "name": "greenys"
+      "name": "oxygen-1"
     },
     {
-      "name": "greenys-1"
+      "name": "oxygen_liquid"
     },
     {
-      "name": "darkblue"
+      "name": "oxygen_liquid-1"
     },
     {
-      "name": "darkblue-1"
+      "name": "plasma"
     },
     {
-      "name": "frezon"
+      "name": "plasma-1"
     },
     {
-      "name": "frezon-1"
+      "name": "storage"
     },
     {
-      "name": "water_vapor"
+      "name": "storage-1"
     },
     {
-      "name": "water_vapor-1"
+      "name": "tritium"
+    },
+    {
+      "name": "tritium-1"
     },
     {
-      "name": "scrubber-connector"
+      "name": "water_vapor"
     },
     {
-      "name": "scrubber-open"
+      "name": "water_vapor-1"
     }
   ]
 }
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen-1.png
new file mode 100644
index 00000000000..fead204df58
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen.png
new file mode 100644
index 00000000000..57af7bcc8bd
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid-1.png
new file mode 100644
index 00000000000..c0f70fe5a68
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid.png
new file mode 100644
index 00000000000..0aa5458d833
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide-1.png
new file mode 100644
index 00000000000..c7721fcca45
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide.png
new file mode 100644
index 00000000000..89564132bf0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png
deleted file mode 100644
index 136b36ca3cd..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png
deleted file mode 100644
index 7681cc2f064..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen-1.png
new file mode 100644
index 00000000000..a21c6b651c8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen.png
new file mode 100644
index 00000000000..5142c4b5cf3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid-1.png
new file mode 100644
index 00000000000..5a77fe92ca1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid.png
new file mode 100644
index 00000000000..8dca3f19a69
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma-1.png
new file mode 100644
index 00000000000..2cf7b775048
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma.png
new file mode 100644
index 00000000000..4830c5dadcf
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png
deleted file mode 100644
index 84ccd606c9d..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png
deleted file mode 100644
index 3ee22dae499..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png
deleted file mode 100644
index 5f924fffce0..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png
deleted file mode 100644
index 63065177708..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png
deleted file mode 100644
index 261bbdb3403..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png
deleted file mode 100644
index 4eb9d1e7082..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/storage-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/storage-1.png
new file mode 100644
index 00000000000..3832ba05e65
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/storage-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/storage.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/storage.png
new file mode 100644
index 00000000000..54c71142dc2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/storage.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium-1.png
new file mode 100644
index 00000000000..887da8f8344
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium.png
new file mode 100644
index 00000000000..387c61ee3f1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png
index 5ba12d06af2..5581bddb718 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png
index 2f7fc54a31d..40b0049ca43 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png
index 993c5ac4ff6..2bc7f971022 100644
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png
deleted file mode 100644
index c12694850d3..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png
deleted file mode 100644
index fc98a456822..00000000000
Binary files a/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png and /dev/null differ