diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs b/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
index 768491f9876..4c8da806130 100644
--- a/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
+++ b/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
@@ -31,7 +31,7 @@ private void OnStorageFillMapInit(EntityUid uid, StorageFillComponent component,
         }
     }
 
-    private void FillStorage(Entity<StorageFillComponent?, StorageComponent?> entity)
+    public void FillStorage(Entity<StorageFillComponent?, StorageComponent?> entity) // Corvax NEXT-cards
     {
         var (uid, component, storage) = entity;
 
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml
index 2a83de3dc91..98511c9eb35 100644
--- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/armor.yml
@@ -17,110 +17,3 @@
           Heat: 0.5
     - type: ExplosionResistance
       damageCoefficient: 0.65
-
-# UIC
-- type: entity
-  parent: ClothingOuterBaseMedium
-  id: ClothingOuterArmorUICLight
-  name: uic armor vest
-  suffix: UIC, Volcanic
-  description: Worn by military police, auxiliary units, and non-combat forces.
-  components:
-  - type: Sprite
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi
-  - type: Clothing
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi
-  - type: Armor 
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.7 
-        Heat: 0.7
-  - type: ExplosionResistance
-    damageCoefficient: 0.80
-
-- type: entity
-  parent: ClothingOuterBaseMedium
-  id: ClothingOuterArmorUICLightVolcanic
-  name: uic armor vest
-  suffix: UIC, Volcanic
-  description: Worn by military police, auxiliary units, and non-combat forces on volcanic planets.
-  components:
-  - type: Sprite
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi
-  - type: Clothing
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi
-  - type: Armor 
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.7 
-        Heat: 0.5
-  - type: ExplosionResistance
-    damageCoefficient: 0.70
-
-- type: entity
-  parent: ClothingOuterBaseMedium
-  id: ClothingOuterArmorUICLightForest
-  name: uic armor vest
-  suffix: UIC, Forest
-  description: Worn by auxiliary units and non-combat forces in forested regions.
-  components:
-  - type: Sprite
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi
-  - type: Clothing
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi
-  - type: Armor 
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.6
-        Piercing: 0.7 
-        Heat: 0.7
-  - type: ExplosionResistance
-    damageCoefficient: 0.80
-
-- type: entity
-  parent: ClothingOuterBaseMedium
-  id: ClothingOuterArmorUICLightSnow
-  name: uic armor vest
-  suffix: UIC, Snow
-  description: Worn by military police, auxiliary units, and non-combat forces in winter and on snow-covered planets.
-  components:
-  - type: Sprite
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi
-  - type: Clothing
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi
-  - type: Armor 
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.7 
-        Heat: 0.6
-        Cold: 0.6
-  - type: ExplosionResistance
-    damageCoefficient: 0.80
-
-- type: entity
-  parent: ClothingOuterBaseMedium
-  id: ClothingOuterArmorUICLightSand
-  name: uic armor vest
-  suffix: UIC, Sand
-  description: Worn by military police, auxiliary units, and non-combat forces on sand-covered planets.
-  components:
-  - type: Sprite
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi
-  - type: Clothing
-    sprite: Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi
-  - type: Armor 
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.7 
-        Heat: 0.6
-  - type: ExplosionResistance
-    damageCoefficient: 0.80
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ca34427aef5..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/icon.png
deleted file mode 100644
index 644d597bda6..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/inhand-left.png
deleted file mode 100644
index ebb299a9371..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/inhand-right.png
deleted file mode 100644
index 2852ac54b3e..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/meta.json
deleted file mode 100644
index 8728913a54d..00000000000
--- a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, recolored by crazzy_pingvin(371735100674670593)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index c052bb4ea7e..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/icon.png
deleted file mode 100644
index b8639b7dd64..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/inhand-left.png
deleted file mode 100644
index bf4fe3ea552..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/inhand-right.png
deleted file mode 100644
index 45755486229..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/meta.json
deleted file mode 100644
index 8728913a54d..00000000000
--- a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_forest.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, recolored by crazzy_pingvin(371735100674670593)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 25d3993502b..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/icon.png
deleted file mode 100644
index 28d1f0b81be..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/inhand-left.png
deleted file mode 100644
index aea0f39676c..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/inhand-right.png
deleted file mode 100644
index cef6f162c71..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/meta.json
deleted file mode 100644
index f8bac4e1da6..00000000000
--- a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_sand.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, digi made by kuro(388673708753027083)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 8ff8a5e3db2..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/icon.png
deleted file mode 100644
index db813d88e1b..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/inhand-left.png
deleted file mode 100644
index 298a21792d5..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/inhand-right.png
deleted file mode 100644
index fbe3684d0e3..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/meta.json
deleted file mode 100644
index 8728913a54d..00000000000
--- a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_snow.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, recolored by crazzy_pingvin(371735100674670593)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index f5d17508bd2..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/icon.png
deleted file mode 100644
index 46d23961896..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/inhand-left.png
deleted file mode 100644
index c530a5830a8..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/inhand-right.png
deleted file mode 100644
index bb49925b59a..00000000000
Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/meta.json
deleted file mode 100644
index 8728913a54d..00000000000
--- a/Resources/Textures/Corvax/Clothing/OuterClothing/Armor/uic_armor_light_vest_volcanic.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, recolored by crazzy_pingvin(371735100674670593)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file