diff --git a/wadsrc/static/zscript/actors/chex/chexitems.zs b/wadsrc/static/zscript/actors/chex/chexitems.zs
index fc5d4c817..5f9a9a252 100644
--- a/wadsrc/static/zscript/actors/chex/chexitems.zs
+++ b/wadsrc/static/zscript/actors/chex/chexitems.zs
@@ -8,6 +8,7 @@ class GlassOfWater : HealthBonus
 	Default
 	{
 		inventory.pickupmessage "$GOTWATER";
+		tag "$TAG_GLASSOFWATER";
 	}
 }
 
@@ -16,6 +17,7 @@ class BowlOfFruit : Stimpack
 	Default
 	{
 		inventory.pickupmessage "$GOTFRUIT";
+		tag "$TAG_BOWLOFFRUIT";
 	}
 }
 
@@ -25,6 +27,7 @@ class BowlOfVegetables : Medikit
 	{
 		inventory.pickupmessage "$GOTVEGETABLES";
 		health.lowmessage 25, "$GOTVEGETABLESNEED";
+		tag "$TAG_BOWLOFVEGETABLES";
 	}
 }
 
@@ -33,6 +36,7 @@ class SuperchargeBreakfast : Soulsphere
 	Default
 	{
 		inventory.pickupmessage "$GOTBREAKFAST";
+		tag "$TAG_BREAKFAST";
 	}
 }
 
@@ -43,6 +47,7 @@ class SlimeRepellent : ArmorBonus
 	Default
 	{
 		inventory.pickupmessage "$GOTREPELLENT";
+		tag "$TAG_REPELLENT";
 	}
 }
 
@@ -51,6 +56,7 @@ class ChexArmor : GreenArmor
 	Default
 	{
 		inventory.pickupmessage "$GOTCHEXARMOR";
+		tag "$TAG_CHEXARMOR";
 	}
 }
 
@@ -59,6 +65,7 @@ class SuperChexArmor : BlueArmor
 	Default
 	{
 		inventory.pickupmessage "$GOTSUPERCHEXARMOR";
+		tag "$TAG_SUPERCHEXARMOR";
 	}
 }
 
@@ -69,6 +76,7 @@ class ComputerAreaMap : Allmap
 	Default
 	{
 		inventory.pickupmessage "$GOTCHEXMAP";
+		tag "$TAG_CHEXMAP";
 	}
 }
 
@@ -77,6 +85,7 @@ class SlimeProofSuit : RadSuit
 	Default
 	{
 		inventory.pickupmessage "$GOTSLIMESUIT";
+		tag "$TAG_SLIMESUIT";
 	}
 }
 
@@ -85,5 +94,6 @@ class Zorchpack : Backpack
 	Default
 	{
 		inventory.pickupmessage "$GOTZORCHPACK";
+		tag "$TAG_ZORCHPACK";
 	}
 }
diff --git a/wadsrc/static/zscript/actors/doom/doomammo.zs b/wadsrc/static/zscript/actors/doom/doomammo.zs
index 950fd2122..de4f2e3d6 100644
--- a/wadsrc/static/zscript/actors/doom/doomammo.zs
+++ b/wadsrc/static/zscript/actors/doom/doomammo.zs
@@ -162,6 +162,7 @@ class Backpack : BackpackItem
 	{
 		Height 26;
 		Inventory.PickupMessage "$GOTBACKPACK";
+		Tag "$TAG_BACKPACK";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/actors/doom/doomarmor.zs b/wadsrc/static/zscript/actors/doom/doomarmor.zs
index 30ff9a140..2c39c5fcc 100644
--- a/wadsrc/static/zscript/actors/doom/doomarmor.zs
+++ b/wadsrc/static/zscript/actors/doom/doomarmor.zs
@@ -14,6 +14,7 @@ class ArmorBonus : BasicArmorBonus
 		Armor.Maxsaveamount 200;
 		+COUNTITEM
 		+INVENTORY.ALWAYSPICKUP
+		Tag "$TAG_ARMORBONUS";
 	}
 	States
 	{
@@ -35,6 +36,7 @@ class GreenArmor : BasicArmorPickup
 		Inventory.Icon "ARM1A0";
 		Armor.SavePercent 33.335;
 		Armor.SaveAmount 100;
+		Tag "$TAG_GREENARMOR";
 	}
 	States
 	{
@@ -57,6 +59,7 @@ class BlueArmor : BasicArmorPickup
 		Inventory.Icon "ARM2A0";
 		Armor.Savepercent 50;
 		Armor.Saveamount 200;
+		Tag "$TAG_BLUEARMOR";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/actors/doom/doomartifacts.zs b/wadsrc/static/zscript/actors/doom/doomartifacts.zs
index 5dbbc837f..f9067561f 100644
--- a/wadsrc/static/zscript/actors/doom/doomartifacts.zs
+++ b/wadsrc/static/zscript/actors/doom/doomartifacts.zs
@@ -12,6 +12,7 @@ class InvulnerabilitySphere : PowerupGiver
 		Powerup.Type "PowerInvulnerable";
 		Powerup.Color "InverseMap";
 		Inventory.PickupMessage "$GOTINVUL";
+		Tag "$TAG_INVULSPHERE";
 	}
 	States
 	{
@@ -35,6 +36,7 @@ class Soulsphere : Health
 		Inventory.MaxAmount 200;
 		Inventory.PickupMessage "$GOTSUPER";
 		Inventory.PickupSound "misc/p_pkup";
+		Tag "$TAG_SOULSPHERE";
 	}
 	States
 	{
@@ -76,6 +78,7 @@ class Megasphere : CustomInventory
 		+INVENTORY.ISARMOR
 		Inventory.PickupMessage "$GOTMSPHERE";
 		Inventory.PickupSound "misc/p_pkup";
+		Tag "$TAG_MEGASPHERE";
 	}
 	States
 	{
@@ -105,6 +108,7 @@ class BlurSphere : PowerupGiver
 		Powerup.Type "PowerInvisibility";
 		RenderStyle "Translucent";
 		Inventory.PickupMessage "$GOTINVIS";
+		Tag "$TAG_INVISSPHERE";
 	}
 	States
 	{
@@ -126,6 +130,7 @@ class RadSuit : PowerupGiver
 		Inventory.MaxAmount 0;
 		Inventory.PickupMessage "$GOTSUIT";
 		Powerup.Type "PowerIronFeet";
+		Tag "$TAG_RADSUIT";
 	}
 	States
 	{
@@ -147,6 +152,7 @@ class Infrared : PowerupGiver
 		Inventory.MaxAmount 0;
 		Powerup.Type "PowerLightAmp";
 		Inventory.PickupMessage "$GOTVISOR";
+		Tag "$TAG_VISOR";
 	}
 	States
 	{
@@ -169,6 +175,7 @@ class Allmap : MapRevealer
 		Inventory.MaxAmount 0;
 		Inventory.PickupSound "misc/p_pkup";
 		Inventory.PickupMessage "$GOTMAP";
+		Tag "$TAG_ALLMAP";
 	}
 	States
 	{
@@ -189,6 +196,7 @@ class Berserk : CustomInventory
 		+INVENTORY.ISHEALTH
 		Inventory.PickupMessage "$GOTBERSERK";
 		Inventory.PickupSound "misc/p_pkup";
+		Tag "$TAG_BERSERK";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/actors/doom/doomhealth.zs b/wadsrc/static/zscript/actors/doom/doomhealth.zs
index 04909b248..260f60bee 100644
--- a/wadsrc/static/zscript/actors/doom/doomhealth.zs
+++ b/wadsrc/static/zscript/actors/doom/doomhealth.zs
@@ -9,6 +9,7 @@ class HealthBonus : Health
 		Inventory.Amount 1;
 		Inventory.MaxAmount 200;
 		Inventory.PickupMessage "$GOTHTHBONUS";
+		Tag "$TAG_HEALTHBONUS";
 	}
 	States
 	{
@@ -53,6 +54,7 @@ class Stimpack : Health
 	{
 		Inventory.Amount 10;
 		Inventory.PickupMessage "$GOTSTIM";
+		Tag "$TAG_STIMPACK";
 	}
 	States
 	{
@@ -71,6 +73,7 @@ class Medikit : Health
 		Inventory.Amount 25;
 		Inventory.PickupMessage "$GOTMEDIKIT";
 		Health.LowMessage 25, "$GOTMEDINEED";
+		Tag "$TAG_MEDIKIT";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/actors/doom/doomkeys.zs b/wadsrc/static/zscript/actors/doom/doomkeys.zs
index 9ae88dade..130591634 100644
--- a/wadsrc/static/zscript/actors/doom/doomkeys.zs
+++ b/wadsrc/static/zscript/actors/doom/doomkeys.zs
@@ -17,6 +17,7 @@ class BlueCard : DoomKey
 	{
 		Inventory.Pickupmessage "$GOTBLUECARD";
 		Inventory.Icon "STKEYS0";
+		Tag "$TAG_BLUECARD";
 	}
 	States
 	{
@@ -35,6 +36,7 @@ class YellowCard : DoomKey
 	{
 		Inventory.Pickupmessage "$GOTYELWCARD";
 		Inventory.Icon "STKEYS1";
+		Tag "$TAG_YELLOWCARD";
 	}
 	States
 	{
@@ -53,6 +55,7 @@ class RedCard : DoomKey
 	{
 		Inventory.Pickupmessage "$GOTREDCARD";
 		Inventory.Icon "STKEYS2";
+		Tag "$TAG_REDCARD";
 	}
 	States
 	{
@@ -71,6 +74,7 @@ class BlueSkull : DoomKey
 	{
 		Inventory.Pickupmessage "$GOTBLUESKUL";
 		Inventory.Icon "STKEYS3";
+		Tag "$TAG_BLUESKULL";
 	}
 	States
 	{
@@ -89,6 +93,7 @@ class YellowSkull : DoomKey
 	{
 		Inventory.Pickupmessage "$GOTYELWSKUL";
 		Inventory.Icon "STKEYS4";
+		Tag "$TAG_YELLOWSKULL";
 	}
 	States
 	{
@@ -107,6 +112,7 @@ class RedSkull : DoomKey
 	{
 		Inventory.Pickupmessage "$GOTREDSKUL";
 		Inventory.Icon "STKEYS5";
+		Tag "$TAG_REDSKULL";
 	}
 	States
 	{