diff --git a/dogfights/doom_e1m1.cdogscpn/pickups.json b/dogfights/doom_e1m1.cdogscpn/pickups.json
index 45e56d464..1c14b1ef0 100644
--- a/dogfights/doom_e1m1.cdogscpn/pickups.json
+++ b/dogfights/doom_e1m1.cdogscpn/pickups.json
@@ -5,19 +5,21 @@
       "Name": "health_bonus",
       "Pic": "health_bonus",
       "Type": "Health",
-      "Health": 2
+      "Health": 1,
+      "ExceedMax": true
     },
     {
       "Name": "stimpack",
       "Pic": "stimpack",
       "Type": "Health",
-      "Health": 20
+      "Health": 10
     },
     {
       "Name": "armor_bonus",
       "Pic": "armor_bonus",
       "Type": "Health",
-      "Health": 2
+      "Health": 1,
+      "ExceedMax": true
     }
   ]
 }
\ No newline at end of file
diff --git a/dogfights/dwango5_map01.cdogscpn/pickups.json b/dogfights/dwango5_map01.cdogscpn/pickups.json
index 45e56d464..1c14b1ef0 100644
--- a/dogfights/dwango5_map01.cdogscpn/pickups.json
+++ b/dogfights/dwango5_map01.cdogscpn/pickups.json
@@ -5,19 +5,21 @@
       "Name": "health_bonus",
       "Pic": "health_bonus",
       "Type": "Health",
-      "Health": 2
+      "Health": 1,
+      "ExceedMax": true
     },
     {
       "Name": "stimpack",
       "Pic": "stimpack",
       "Type": "Health",
-      "Health": 20
+      "Health": 10
     },
     {
       "Name": "armor_bonus",
       "Pic": "armor_bonus",
       "Type": "Health",
-      "Health": 2
+      "Health": 1,
+      "ExceedMax": true
     }
   ]
 }
\ No newline at end of file
diff --git a/missions/doom.cdogscpn/graphics/armor.txt b/graphics/armor.txt
similarity index 100%
rename from missions/doom.cdogscpn/graphics/armor.txt
rename to graphics/armor.txt
diff --git a/missions/doom.cdogscpn/graphics/megaarmor.png b/graphics/armor_blue.png
similarity index 100%
rename from missions/doom.cdogscpn/graphics/megaarmor.png
rename to graphics/armor_blue.png
diff --git a/missions/doom.cdogscpn/graphics/armor.png b/graphics/armor_green.png
similarity index 100%
rename from missions/doom.cdogscpn/graphics/armor.png
rename to graphics/armor_green.png
diff --git a/missions/custom/techdemo/cyberdogs.cdogscpn/missions.json b/missions/custom/techdemo/cyberdogs.cdogscpn/missions.json
index 241c5f7e2..0546f549f 100644
--- a/missions/custom/techdemo/cyberdogs.cdogscpn/missions.json
+++ b/missions/custom/techdemo/cyberdogs.cdogscpn/missions.json
@@ -253,6 +253,10 @@
 		{
 			"Pickup": "ammo_Cells",
 			"Density": 1
+		},
+		{
+			"Pickup": "armor",
+			"Density": 1
 		}],
 		"EnemyDensity": 40,
 		"Weapons": ["Fists",
@@ -419,7 +423,10 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 2
+		}],
 		"EnemyDensity": 50,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -586,7 +593,10 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "max_armor",
+			"Density": 1
+		}],
 		"EnemyDensity": 55,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -768,7 +778,10 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 3
+		}],
 		"EnemyDensity": 13,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -943,7 +956,14 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 2
+		},
+		{
+			"Pickup": "max_armor",
+			"Density": 1
+		}],
 		"EnemyDensity": 13,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -1122,7 +1142,14 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 3
+		},
+		{
+			"Pickup": "max_armor",
+			"Density": 2
+		}],
 		"EnemyDensity": 65,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -1306,7 +1333,22 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 3
+		},
+		{
+			"Pickup": "max_armor",
+			"Density": 1
+		},
+		{
+			"Pickup": "gun_Flamer",
+			"Density": 1
+		},
+		{
+			"Pickup": "ammo_Gas tank",
+			"Density": 1
+		}],
 		"EnemyDensity": 13,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -1472,7 +1514,18 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 4
+		},
+		{
+			"Pickup": "gun_Powergun",
+			"Density": 1
+		},
+		{
+			"Pickup": "ammo_Cells",
+			"Density": 1
+		}],
 		"EnemyDensity": 70,
 		"Weapons": ["Fists",
 		"Chainsaw",
@@ -1644,7 +1697,14 @@
 			"MapObject": "bloodstain1",
 			"Density": 20
 		}],
-		"PickupDensities": [],
+		"PickupDensities": [{
+			"Pickup": "armor",
+			"Density": 2
+		},
+		{
+			"Pickup": "max_armor",
+			"Density": 2
+		}],
 		"EnemyDensity": 80,
 		"Weapons": ["Fists",
 		"Chainsaw",
diff --git a/missions/custom/techdemo/cyberdogs.cdogscpn/pickups.json b/missions/custom/techdemo/cyberdogs.cdogscpn/pickups.json
index 8fba014e3..9602c32a1 100644
--- a/missions/custom/techdemo/cyberdogs.cdogscpn/pickups.json
+++ b/missions/custom/techdemo/cyberdogs.cdogscpn/pickups.json
@@ -55,6 +55,29 @@
           "Type": "Score",
           "Score": 200
         }]
+      },
+      {
+        "Name": "armor",
+        "Pic": {
+          "Type": "Normal",
+          "Pic": "armor_green"
+        },
+        "Effects": [{
+          "Type": "Health",
+          "Health": 50
+        }]
+      },
+      {
+        "Name": "max_armor",
+        "Pic": {
+          "Type": "Normal",
+          "Pic": "armor_blue"
+        },
+        "Effects": [{
+          "Type": "Health",
+          "Health": 70,
+          "ExceedMax": true
+        }]
       }
     ]
 }
\ No newline at end of file
diff --git a/missions/doom.cdogscpn/graphics/megaarmor.txt b/missions/doom.cdogscpn/graphics/megaarmor.txt
deleted file mode 100644
index fdb3290e5..000000000
--- a/missions/doom.cdogscpn/graphics/megaarmor.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Derived from 140 Military Icons Set (fixed)
-by AngryMeteor.com
-https://opengameart.org/content/140-military-icons-set-fixed
-http://creativecommons.org/licenses/by/3.0/
\ No newline at end of file
diff --git a/missions/doom.cdogscpn/pickups.json b/missions/doom.cdogscpn/pickups.json
index 30e102b90..b10f7e1f4 100644
--- a/missions/doom.cdogscpn/pickups.json
+++ b/missions/doom.cdogscpn/pickups.json
@@ -9,7 +9,8 @@
       },
       "Effects": [{
         "Type": "Health",
-        "Health": 1
+        "Health": 1,
+        "ExceedMax": true
       }]
     },
     {
@@ -42,7 +43,8 @@
       },
       "Effects": [{
         "Type": "Health",
-        "Health": 100
+        "Health": 100,
+        "ExceedMax": true
       }]
     },
     {
@@ -53,14 +55,15 @@
       },
       "Effects": [{
         "Type": "Health",
-        "Health": 1
+        "Health": 1,
+        "ExceedMax": true
       }]
     },
     {
       "Name": "armor",
       "Pic": {
         "Type": "Normal",
-        "Pic": "armor"
+        "Pic": "armor_green"
       },
       "Effects": [{
         "Type": "Health",
@@ -71,11 +74,12 @@
       "Name": "megaarmor",
       "Pic": {
         "Type": "Normal",
-        "Pic": "megaarmor"
+        "Pic": "armor_blue"
       },
       "Effects": [{
         "Type": "Health",
-        "Health": 200
+        "Health": 200,
+        "ExceedMax": true
       }]
     },
     {