- Added Gez's patch for moving tag strings into the language file and adding tags for all weapons and inventory items.

SVN r2552 (trunk)

src/g_game.cpp

@@ -116,13 +116,13 @@ EXTERN_CVAR (Float, con_midtime);
 //
 // CVAR displaynametags
 //
-// Selects whether to display name tags or not when changing weapons
+// Selects whether to display name tags or not when changing weapons/items
 //
 //==========================================================================
 
-CUSTOM_CVAR (Bool, displaynametags, 0, CVAR_ARCHIVE)
+CUSTOM_CVAR (Int, displaynametags, 0, CVAR_ARCHIVE)
 {
-	if (self != 0 && self != 1)
+	if (self < 0 || self > 3)
 	{
 		self = 0;
 	}
@@ -322,11 +322,23 @@ CCMD (turn180)
 CCMD (weapnext)
 {
 	SendItemUse = players[consoleplayer].weapons.PickNextWeapon (&players[consoleplayer]);
+	// [BC] Option to display the name of the weapon being cycled to.
+	if ((displaynametags & 2) && StatusBar && SmallFont && SendItemUse)
+	{
+		StatusBar->AttachMessage(new DHUDMessageFadeOut(SmallFont, SendItemUse->GetTag(),
+			1.5f, 0.90f, 0, 0, CR_GOLD, 2.f, 0.35f), MAKE_ID( 'W', 'E', 'P', 'N' ));
+	}
 }
 
 CCMD (weapprev)
 {
 	SendItemUse = players[consoleplayer].weapons.PickPrevWeapon (&players[consoleplayer]);
+	// [BC] Option to display the name of the weapon being cycled to.
+	if ((displaynametags & 2) && StatusBar && SmallFont && SendItemUse)
+	{
+		StatusBar->AttachMessage(new DHUDMessageFadeOut(SmallFont, SendItemUse->GetTag(),
+			1.5f, 0.90f, 0, 0, CR_GOLD, 2.f, 0.35f), MAKE_ID( 'W', 'E', 'P', 'N' ));
+	}
 }
 
 CCMD (invnext)
@@ -354,10 +366,9 @@ CCMD (invnext)
 				who->InvSel = who->Inventory;
 			}
 		}
-		if (displaynametags && StatusBar && SmallFont 
-			&& gamestate == GS_LEVEL && level.time > con_midtime && who->InvSel)
-			StatusBar->AttachMessage (new DHUDMessage (SmallFont, who->InvSel->GetTag(), 
-			2.5f, 0.375f, 0, 0, CR_YELLOW, con_midtime), MAKE_ID('S','I','N','V'));
+		if ((displaynametags & 1) && StatusBar && SmallFont && who->InvSel)
+			StatusBar->AttachMessage (new DHUDMessageFadeOut (SmallFont, who->InvSel->GetTag(), 
+			1.5f, 0.80f, 0, 0, CR_GOLD, 2.f, 0.35f), MAKE_ID('S','I','N','V'));
 	}
 	who->player->inventorytics = 5*TICRATE;
 }
@@ -385,10 +396,9 @@ CCMD (invprev)
 			}
 			who->InvSel = item;
 		}
-		if (displaynametags && StatusBar && SmallFont 
-			&& gamestate == GS_LEVEL && level.time > con_midtime && who->InvSel)
-			StatusBar->AttachMessage (new DHUDMessage (SmallFont, who->InvSel->GetTag(), 
-			2.5f, 0.375f, 0, 0, CR_YELLOW, con_midtime), MAKE_ID('S','I','N','V'));
+		if ((displaynametags & 1) && StatusBar && SmallFont && who->InvSel)
+			StatusBar->AttachMessage (new DHUDMessageFadeOut (SmallFont, who->InvSel->GetTag(), 
+			1.5f, 0.80f, 0, 0, CR_GOLD, 2.f, 0.35f), MAKE_ID('S','I','N','V'));
 	}
 	who->player->inventorytics = 5*TICRATE;
 }

src/g_shared/a_pickups.cpp

@@ -356,6 +356,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_RestoreSpecialPosition)
 			self->z += FloatBobOffsets[(self->FloatBobPhase + level.maptime) & 63];
 		}
 	}
+	self->SetOrigin (self->x, self->y, self->z);
 }
 
 int AInventory::StaticLastMessageTic;

src/m_options.cpp

@@ -93,7 +93,7 @@ EXTERN_CVAR(Int, showendoom)
 EXTERN_CVAR(Bool, hud_althud)
 EXTERN_CVAR(Int, compatmode)
 EXTERN_CVAR (Bool, vid_vsync)
-EXTERN_CVAR(Bool, displaynametags)
+EXTERN_CVAR(Int, displaynametags)
 EXTERN_CVAR (Int, snd_channels)
 
 //
@@ -485,6 +485,13 @@ static value_t Contrast[] = {
 	{ 2.0, "Smooth" }
 };
 
+static value_t DisplayTagsTypes[] = {
+	{ 0.0, "None" },
+	{ 1.0, "Items" },
+	{ 2.0, "Weapons" },
+	{ 3.0, "Both" }
+};
+
 static menuitem_t VideoItems[] = {
 	{ more,		"Message Options",		{NULL},					{0.0}, {0.0},	{0.0}, {(value_t *)StartMessagesMenu} },
 	{ more,		"Automap Options",		{NULL},					{0.0}, {0.0},	{0.0}, {(value_t *)StartAutomapMenu} },
@@ -510,7 +517,7 @@ static menuitem_t VideoItems[] = {
 	{ discrete, "Rocket Trails",		{&cl_rockettrails},		{4.0}, {0.0},	{0.0}, {RocketTrailTypes} },
 	{ discrete, "Blood Type",			{&cl_bloodtype},	   	{3.0}, {0.0},	{0.0}, {BloodTypes} },
 	{ discrete, "Bullet Puff Type",		{&cl_pufftype},			{2.0}, {0.0},	{0.0}, {PuffTypes} },
-	{ discrete, "Display nametags",		{&displaynametags},		{2.0}, {0.0},	{0.0}, {YesNo} },
+	{ discrete, "Display nametags",		{&displaynametags},		{4.0}, {0.0},	{0.0}, {DisplayTagsTypes} },
 };
 
 #define CROSSHAIR_INDEX 7

wadsrc/static/actors/chex/chexweapons.txt

@@ -4,6 +4,7 @@ actor Bootspoon : Fist
 {
 	game Chex
 	obituary "$OB_MPSPOON"
+	Tag "$TAG_SPOON"
 }
 
 actor SuperBootspork : Chainsaw 2005
@@ -11,6 +12,7 @@ actor SuperBootspork : Chainsaw 2005
 	game Chex
 	obituary "$OB_MPBOOTSPORK"
 	Inventory.PickupMessage "$GOTSUPERBOOTSPORK"
+	Tag "$TAG_SPORK"
 }
 
 actor MiniZorcher : Pistol
@@ -18,6 +20,7 @@ actor MiniZorcher : Pistol
 	game Chex
 	obituary "$OP_MPZORCH"
 	inventory.pickupmessage "$GOTMINIZORCHER"
+	Tag "$TAG_MINIZORCHER"
 	states
 	{
 		Spawn:
@@ -30,6 +33,7 @@ actor LargeZorcher : Shotgun 2001
 	game Chex
 	obituary "$OP_MPZORCH"
 	inventory.pickupmessage "$GOTLARGEZORCHER"
+	Tag "$TAG_LARGEZORCHER"
 }
 
 actor SuperLargeZorcher : SuperShotgun 82
@@ -37,6 +41,7 @@ actor SuperLargeZorcher : SuperShotgun 82
 	game Chex
 	obituary "$OB_MPMEGAZORCH"
 	inventory.pickupmessage "$GOTSUPERLARGEZORCHER"
+	Tag "$TAG_SUPERLARGEZORCHER"
 }
 
 actor RapidZorcher : Chaingun 2002
@@ -44,6 +49,7 @@ actor RapidZorcher : Chaingun 2002
 	game Chex
 	obituary "$OB_MPRAPIDZORCH"
 	inventory.pickupmessage "$GOTRAPIDZORCHER"
+	Tag "$TAG_RAPIDZORCHER"
 }
 
 actor ZorchPropulsor : RocketLauncher 2003
@@ -51,6 +57,7 @@ actor ZorchPropulsor : RocketLauncher 2003
 	game Chex
 	obituary ""
 	inventory.pickupmessage "$GOTZORCHPROPULSOR"
+	Tag "$TAG_ZORCHPROPULSOR"
 	States
 	{
 	Fire:
@@ -75,6 +82,7 @@ actor PhasingZorcher : PlasmaRifle 2004
 	game Chex
 	obituary ""
 	inventory.pickupmessage "$GOTPHASINGZORCHER"
+	Tag "$TAG_PHASINGZORCHER"
 	states
 	{
 	Fire:
@@ -104,6 +112,7 @@ actor LAZDevice : BFG9000 2006
 	game Chex
 	obituary ""
 	inventory.pickupmessage "$GOTLAZDEVICE"
+	Tag "$TAG_LAZDEVICE"
 	states
 	{
 	Fire:

wadsrc/static/actors/doom/doomweapons.txt

@@ -21,6 +21,7 @@ ACTOR Fist : Weapon
 	Weapon.SelectionOrder 3700
 	Weapon.Kickback 100
 	Obituary "$OB_MPFIST"
+	Tag "$FIST"
 	+WEAPON.WIMPY_WEAPON
 	+WEAPON.MELEEWEAPON
 	States
@@ -61,6 +62,7 @@ ACTOR Pistol : DoomWeapon 5010
 	Obituary "$OB_MPPISTOL"
 	+WEAPON.WIMPY_WEAPON
 	Inventory.Pickupmessage "$PICKUP_PISTOL_DROPPED"
+	Tag "$TAG_PISTOL"
 	States
 	{
 	Ready:
@@ -105,6 +107,7 @@ ACTOR Chainsaw : Weapon 2005
 	Weapon.ReadySound "weapons/sawidle"
 	Inventory.PickupMessage "$GOTCHAINSAW"
 	Obituary "$OB_MPCHAINSAW"
+	Tag "$TAG_CHAINSAW"
 	+WEAPON.MELEEWEAPON		
 	States
 	{
@@ -144,6 +147,7 @@ ACTOR Shotgun : DoomWeapon 2001
 	Weapon.AmmoType "Shell"
 	Inventory.PickupMessage "$GOTSHOTGUN"
 	Obituary "$OB_MPSHOTGUN"
+	Tag "$TAG_SHOTGUN"
 	States
 	{
 	Ready:
@@ -190,6 +194,7 @@ ACTOR SuperShotgun : DoomWeapon 82
 	Weapon.AmmoType "Shell"
 	Inventory.PickupMessage "$GOTSHOTGUN2"
 	Obituary "$OB_MPSSHOTGUN"
+	Tag "$TAG_SUPERSHOTGUN"
 	States
 	{
 	Ready:
@@ -243,6 +248,7 @@ ACTOR Chaingun : DoomWeapon 2002
 	Weapon.AmmoType "Clip"
 	Inventory.PickupMessage "$GOTCHAINGUN"
 	Obituary "$OB_MPCHAINGUN"
+	Tag "$TAG_CHAINGUN"
 	States
 	{
 	Ready:
@@ -285,6 +291,7 @@ ACTOR RocketLauncher : DoomWeapon 2003
 	Weapon.AmmoType "RocketAmmo"
 	+WEAPON.NOAUTOFIRE
 	Inventory.PickupMessage "$GOTLAUNCHER"
+	Tag "$TAG_ROCKETLAUNCHER"
 	States
 	{
 	Ready:
@@ -406,6 +413,7 @@ ACTOR PlasmaRifle : DoomWeapon 2004
 	Weapon.AmmoGive 40
 	Weapon.AmmoType "Cell"
 	Inventory.PickupMessage "$GOTPLASMA"
+	Tag "$TAG_PLASMARIFLE"
 	States
 	{
 	Ready:
@@ -511,6 +519,7 @@ ACTOR BFG9000 : DoomWeapon 2006
 	Weapon.AmmoType "Cell"
 	+WEAPON.NOAUTOFIRE
 	Inventory.PickupMessage "$GOTBFG9000"
+	Tag "$TAG_BFG9000"
 	States
 	{
 	Ready:

wadsrc/static/actors/heretic/hereticartifacts.txt

@@ -33,6 +33,7 @@ ACTOR ArtiInvisibility : PowerupGiver 75
 	Inventory.Icon ARTIINVS
 	Powerup.Type Ghost
 	Inventory.PickupMessage "$TXT_ARTIINVISIBILITY"
+	Tag "$TAG_ARTIINVISIBILITY"
 	States
 	{
 	Spawn:
@@ -54,6 +55,7 @@ ACTOR ArtiTomeOfPower : PowerupGiver 86 native
 	Inventory.Icon "ARTIPWBK"
 	Powerup.Type Weaponlevel2
 	Inventory.PickupMessage "$TXT_ARTITOMEOFPOWER"
+	Tag "$TAG_ARTITOMEOFPOWER"
 	States
 	{
 	Spawn:
@@ -98,6 +100,7 @@ ACTOR ArtiTimeBomb : Inventory 34 native
 	Inventory.Icon "ARTIFBMB"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIFIREBOMB"
+	Tag "$TAG_ARTIFIREBOMB"
 	Inventory.DefMaxAmount
 	States
 	{

wadsrc/static/actors/heretic/hereticweaps.txt

@@ -15,6 +15,8 @@ ACTOR Staff : HereticWeapon
 	+WIMPY_WEAPON
 	+MELEEWEAPON
 	Weapon.sisterweapon "StaffPowered"
+	Obituary "$OB_MPSTAFF"
+	Tag "$TAG_STAFF"
 
 	action native A_StaffAttack (int damage, class<Actor> puff);
 
@@ -45,6 +47,8 @@ ACTOR StaffPowered : Staff
 	+WEAPON.POWERED_UP
 	+WEAPON.READYSNDHALF
 	+WEAPON.STAFF2_KICKBACK
+	Obituary "$OB_MPPSTAFF"
+	Tag "$TAG_STAFFP"
 	States
 	{
 	Ready:	
@@ -116,6 +120,8 @@ ACTOR GoldWand : HereticWeapon
 	Weapon.AmmoType "GoldWandAmmo"
 	Weapon.SisterWeapon "GoldWandPowered"
 	Weapon.YAdjust 5
+	Obituary "$OB_MPGOLDWAND"
+	Tag "$TAG_GOLDWAND"
 
 	action native A_FireGoldWandPL1 ();
 	
@@ -145,6 +151,8 @@ ACTOR GoldWandPowered : GoldWand
 	+WEAPON.POWERED_UP
 	Weapon.AmmoGive 0
 	Weapon.SisterWeapon "GoldWand"
+	Obituary "$OB_MPPGOLDWAND"
+	Tag "$TAG_GOLDWANDP"
 
 	action native A_FireGoldWandPL2 ();
 
@@ -173,6 +181,7 @@ ACTOR GoldWandFX1
 	Projectile
 	RenderStyle Add
 	DeathSound "weapons/wandhit"
+	Obituary "$OB_MPPGOLDWAND"
 	States
 	{
 	Spawn:
@@ -209,7 +218,8 @@ ACTOR GoldWandPuff1
 	+NOGRAVITY
 	+PUFFONACTORS
 	RenderStyle Add
-	States	{
+	States
+	{
 	Spawn:
 		PUF2 ABCDE 3 BRIGHT
 		Stop
@@ -243,7 +253,8 @@ ACTOR Crossbow : HereticWeapon 2001
 	Weapon.AmmoType "CrossbowAmmo"
 	Weapon.SisterWeapon "CrossbowPowered"
 	Weapon.YAdjust 15
-	Inventory.PickupMessage "$TxT_WPNCROSSBOW"
+	Inventory.PickupMessage "$TXT_WPNCROSSBOW"
+	Tag "$TAG_CROSSBOW"
 
 	action native A_FireCrossbowPL1 ();
 
@@ -277,6 +288,7 @@ ACTOR CrossbowPowered : Crossbow
 	+WEAPON.POWERED_UP
 	Weapon.AmmoGive 0
 	Weapon.SisterWeapon "Crossbow"
+	Tag "$TAG_CROSSBOWP"
 
 	action native A_FireCrossbowPL2();
 
@@ -310,6 +322,7 @@ ACTOR CrossbowFX1
 	RenderStyle Add
 	SeeSound "weapons/bowshoot"
 	DeathSound "weapons/bowhit"
+	Obituary "$OB_MPCROSSBOW"
 	States
 	{
 	Spawn:
@@ -330,6 +343,7 @@ ACTOR CrossbowFX2 : CrossbowFX1
 	SpawnID 148
 	Speed 32
 	Damage 6
+	Obituary "$OB_MPPCROSSBOW"
 	States
 	{
 	Spawn:
@@ -394,6 +408,8 @@ ACTOR Gauntlets : Weapon 2005
 	Weapon.UpSound "weapons/gauntletsactivate"
 	Weapon.SisterWeapon "GauntletsPowered"
 	Inventory.PickupMessage "$TXT_WPNGAUNTLETS"
+	Tag "$TAG_GAUNTLETS"
+	Obituary "$OB_MPGAUNTLETS"
 
 	action native A_GauntletAttack (int power);
 
@@ -427,6 +443,8 @@ ACTOR GauntletsPowered : Gauntlets
 {
 	Game Heretic
 	+POWERED_UP
+	Tag "$TAG_GAUNTLETSP"
+	Obituary "$OB_MPPGAUNTLETS"
 	Weapon.SisterWeapon "Gauntlets"
 	States
 	{
@@ -469,7 +487,7 @@ ACTOR GauntletPuff1
 	}
 }
 
-// Gauntlett puff 2 ---------------------------------------------------------
+// Gauntlet puff 2 ---------------------------------------------------------
 
 ACTOR GauntletPuff2 : GauntletPuff1
 {
@@ -494,7 +512,8 @@ ACTOR Mace : HereticWeapon
 	Weapon.YAdjust 15
 	Weapon.AmmoType "MaceAmmo"
 	Weapon.SisterWeapon "MacePowered"
-	Inventory.PickupMessage "$TxT_WPNMACE"
+	Inventory.PickupMessage "$TXT_WPNMACE"
+	Tag "$TAG_MACE"
 	
 	action native A_FireMacePL1();
 	
@@ -529,6 +548,7 @@ ACTOR MacePowered : Mace
 	Weapon.AmmoUse 5
 	Weapon.AmmoGive 0
 	Weapon.SisterWeapon "Mace"
+	Tag "$TAG_MACEP"
 	
 	action native A_FireMacePL2();
 	
@@ -558,6 +578,7 @@ ACTOR MaceFX1
 	+THRUGHOST
 	BounceType "HereticCompat"
 	SeeSound "weapons/maceshoot"
+	Obituary "$OB_MPMACE"
 
 	action native A_MacePL1Check();
 	action native A_MaceBallImpact();
@@ -636,6 +657,7 @@ ACTOR MaceFX4 native
 	-NOTELEPORT
 	BounceType "HereticCompat"
 	SeeSound ""
+	Obituary "$OB_MPPMACE"
 
 	action native A_DeathBallImpact();
 
@@ -682,7 +704,9 @@ ACTOR Blaster : HereticWeapon 53
 	Weapon.YAdjust 15
 	Weapon.AmmoType "BlasterAmmo"
 	Weapon.SisterWeapon "BlasterPowered"
-	Inventory.PickupMessage "$TxT_WPNBLASTER"
+	Inventory.PickupMessage "$TXT_WPNBLASTER"
+	Tag "$TAG_BLASTER"
+	Obituary "$OB_MPBLASTER"
 
 	action native A_FireBlasterPL1();
 
@@ -740,6 +764,8 @@ ACTOR BlasterFX1 : FastProjectile native
 	SeeSound "weapons/blastershoot"
 	DeathSound "weapons/blasterhit"
 	+SPAWNSOUNDSOURCE
+	Obituary "$OB_MPPBLASTER"
+	Tag "$TAG_BLASTERP"
 
 	action native A_SpawnRippers();
 
@@ -787,6 +813,7 @@ ACTOR Ripper native
 	Projectile
 	+RIPPER
 	DeathSound "weapons/blasterpowhit"
+	Obituary "$OB_MPPBLASTER"
 	States
 	{
 	Spawn:
@@ -832,7 +859,8 @@ ACTOR SkullRod : HereticWeapon 2004
 	Weapon.YAdjust 15
 	Weapon.AmmoType1 "SkullRodAmmo"
 	Weapon.SisterWeapon "SkullRodPowered"
-	Inventory.PickupMessage "$TxT_WPNSKULLROD"
+	Inventory.PickupMessage "$TXT_WPNSKULLROD"
+	Tag "$TAG_SKULLROD"
 
 	action native A_FireSkullRodPL1();
 
@@ -864,6 +892,7 @@ ACTOR SkullRodPowered : SkullRod
 	Weapon.AmmoUse1 5
 	Weapon.AmmoGive1 0
 	Weapon.SisterWeapon "SkullRod"
+	Tag "$TAG_SKULLRODP"
 
 	action native A_FireSkullRodPL2();
 
@@ -899,6 +928,7 @@ ACTOR HornRodFX1
 	RenderStyle Add
 	SeeSound "weapons/hornrodshoot"
 	DeathSound "weapons/hornrodhit"
+	Obituary "$OB_MPSKULLROD"
 	States
 	{
 	Spawn:
@@ -926,6 +956,7 @@ ACTOR HornRodFX2 native
 	RenderStyle Add
 	SeeSound "weapons/hornrodpowshoot"
 	DeathSound "weapons/hornrodpowhit"
+	Obituary "$OB_MPPSKULLROD"
 
 	action native A_AddPlayerRain();
 	action native A_HideInCeiling();
@@ -963,6 +994,7 @@ ACTOR RainPillar native
 	-ACTIVATEPCROSS
 	-ACTIVATEIMPACT
 	RenderStyle Add
+	Obituary "$OB_MPPSKULLROD"
 
 	action native A_RainImpact();
 
@@ -1003,7 +1035,8 @@ ACTOR PhoenixRod : Weapon 2003 native
 	Weapon.AmmoGive 2
 	Weapon.AmmoType "PhoenixRodAmmo"
 	Weapon.Sisterweapon "PhoenixRodPowered"
-	Inventory.PickupMessage "$TxT_WPNPHOENIxROD"
+	Inventory.PickupMessage "$TXT_WPNPHOENIxROD"
+	Tag "$TAG_PHOENIxROD"
 
 	action native A_FirePhoenixPL1();
 
@@ -1037,6 +1070,7 @@ ACTOR PhoenixRodPowered : PhoenixRod native
 	+WEAPON.MELEEWEAPON
 	Weapon.SisterWeapon "PhoenixRod"
 	Weapon.AmmoGive 0
+	Tag "$TAG_PHOENIxRODP"
 
 	action native A_InitPhoenixPL2();
 	action native A_FirePhoenixPL2();
@@ -1071,6 +1105,7 @@ ACTOR PhoenixFX1 native
 	+SPECIALFIREDAMAGE
 	SeeSound "weapons/phoenixshoot"
 	DeathSound "weapons/phoenixhit"
+	Obituary "$OB_MPPHOENIXROD"
 
 	action native A_PhoenixPuff();
 
@@ -1116,6 +1151,7 @@ ACTOR PhoenixFX2 native
 	DamageType Fire
 	Projectile
 	RenderStyle Add
+	Obituary "$OB_MPPPHOENIXROD"
 
 	action native A_FlameEnd();
 	action native A_FloatPuff();

wadsrc/static/actors/hexen/blastradius.txt

@@ -10,6 +10,7 @@ ACTOR ArtiBlastRadius : CustomInventory 10110
 	Inventory.Icon "ARTIBLST"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIBLASTRADIUS"
+	Tag "$TAG_ARTIBLASTRADIUS"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/boostarmor.txt

@@ -13,6 +13,7 @@ ACTOR ArtiBoostArmor : Inventory 8041 native
 	Inventory.Icon "ARTIBRAC"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIBOOSTARMOR"
+	Tag "$TAG_ARTIBOOSTARMOR"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/clericflame.txt

@@ -12,6 +12,7 @@ ACTOR CWeapFlame : ClericWeapon 8009
 	Weapon.YAdjust 10
 	Weapon.AmmoType1 "Mana2"
 	Inventory.PickupMessage "$TXT_WEAPON_C3"
+	Tag "$TAG_CWEAPFLAME"
 
 	action native A_CFlameAttack();
 
@@ -126,6 +127,7 @@ ACTOR CircleFlame
 	-ACTIVATEPCROSS
 	RenderStyle Add
 	DeathSound "ClericFlameCircle"
+	Obituary "$OB_MPCWEAPFLAME"
 
 	action native A_CFlameRotate();
 
@@ -166,6 +168,7 @@ ACTOR CFlameMissile : FastProjectile native
 	DamageType "Fire"
 	+INVISIBLE
 	RenderStyle Add
+	Obituary "$OB_MPCWEAPFLAME"
 
 	action native A_CFlamePuff();
 	action native A_CFlameMissile();

wadsrc/static/actors/hexen/clericholy.txt

@@ -84,6 +84,7 @@ ACTOR CWeapWraithverge : ClericWeapon native
 	Weapon.AmmoType1 "Mana1"
 	Weapon.AmmoType2 "Mana2"
 	Inventory.PickupMessage "$TXT_WEAPON_C4"
+	Tag "$TAG_CWEAPWRAITHVERGE"
 	Inventory.PickupSound "WeaponBuild"
 
 	action native A_CHolyAttack();
@@ -187,6 +188,7 @@ ACTOR HolySpirit native
 	RenderStyle Translucent
 	Alpha 0.4
 	DeathSound "SpiritDie"
+	Obituary "$OB_MPCWEAPWRAITHVERGE"
 
 	action native A_CHolySeek();
 	action native A_CHolyCheckScream();

wadsrc/static/actors/hexen/clericmace.txt

@@ -8,6 +8,8 @@ ACTOR CWeapMace : ClericWeapon
 	Weapon.KickBack 150
 	Weapon.YAdjust -8
 	+BLOODSPLATTER
+	Obituary "$OB_MPCWEAPMACE"
+	Tag "$TAG_CWEAPMACE"
 
 	action native A_CMaceAttack();
 

wadsrc/static/actors/hexen/clericstaff.txt

@@ -12,6 +12,8 @@ ACTOR CWeapStaff : ClericWeapon 10
 	Weapon.YAdjust 10
 	Weapon.AmmoType1 "Mana1"
 	Inventory.PickupMessage "$TXT_WEAPON_C2"
+	Obituary "$OB_MPCWEAPSTAFFM"
+	Tag "$TAG_CWEAPSTAFF"
 
 	action native A_CStaffInitBlink();
 	action native A_CStaffCheckBlink();
@@ -65,6 +67,7 @@ ACTOR CStaffMissile native
 	RenderStyle Add
 	Projectile
 	DeathSound "ClericCStaffExplode"
+	Obituary "$OB_MPCWEAPSTAFFR"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/fighteraxe.txt

@@ -13,6 +13,8 @@ ACTOR FWeapAxe : FighterWeapon 8010 native
 	Weapon.YAdjust -12
 	Weapon.AmmoType1 "Mana1"
 	Inventory.PickupMessage "$TXT_WEAPON_F2"
+	Obituary "$OB_MPFWEAPAXE"
+	Tag "$TAG_FWEAPAXE"
 
 	action native A_FAxeCheckUp();
 	action native A_FAxeCheckReady();

wadsrc/static/actors/hexen/fighterfist.txt

@@ -8,6 +8,8 @@ ACTOR FWeapFist : FighterWeapon
 	Weapon.SelectionOrder 3400
 	+WEAPON.MELEEWEAPON
 	Weapon.KickBack 150
+	Obituary "$OB_MPFWEAPFIST"
+	Tag "$TAG_FWEAPFIST"
 
 	action native A_FPunchAttack();
 

wadsrc/static/actors/hexen/fighterhammer.txt

@@ -14,6 +14,8 @@ ACTOR FWeapHammer : FighterWeapon 123
 	Weapon.YAdjust -10
 	Weapon.AmmoType1 "Mana2"
 	Inventory.PickupMessage "$TXT_WEAPON_F3"
+	Obituary "$OB_MPFWEAPHAMMERM"
+	Tag "$TAG_FWEAPHAMMER"
 
 	action native A_FHammerAttack();
 	action native A_FHammerThrow();
@@ -60,6 +62,7 @@ ACTOR HammerMissile
 	DamageType "Fire"
 	Projectile
 	DeathSound "FighterHammerExplode"
+	Obituary "$OB_MPFWEAPHAMMERR"
 
 	States
 	{

wadsrc/static/actors/hexen/fighterquietus.txt

@@ -86,6 +86,7 @@ ACTOR FWeapQuietus : FighterWeapon
 	Weapon.AmmoType2 "Mana2"
 	Inventory.PickupMessage "$TXT_WEAPON_F4"
 	Inventory.PickupSound "WeaponBuild"
+	Tag "$TAG_FWEAPQUIETUS"
 
 	action native A_FSwordAttack();
 
@@ -131,6 +132,7 @@ ACTOR FSwordMissile native
 	+EXTREMEDEATH
 	RenderStyle Add
 	DeathSound "FighterSwordExplode"
+	Obituary "$OB_MPFWEAPQUIETUS"
 
 	action native A_FSwordFlames();
 

wadsrc/static/actors/hexen/flechette.txt

@@ -105,6 +105,7 @@ ACTOR ArtiPoisonBag : Inventory 8000 native
 	Inventory.Icon "ARTIPSBG"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIPOISONBAG"
+	Tag "$TAG_ARTIPOISONBAG"
 	States
 	{
 	Spawn:
@@ -118,6 +119,7 @@ ACTOR ArtiPoisonBag : Inventory 8000 native
 ACTOR ArtiPoisonBag1 : ArtiPoisonBag native
 {
 	Inventory.Icon "ARTIPSB1"
+	Tag "$TAG_ARTIPOISONBAG1"
 }
 
 // Poison Bag 2 (The Mage's) ------------------------------------------------
@@ -125,6 +127,7 @@ ACTOR ArtiPoisonBag1 : ArtiPoisonBag native
 ACTOR ArtiPoisonBag2 : ArtiPoisonBag native
 {
 	Inventory.Icon "ARTIPSB2"
+	Tag "$TAG_ARTIPOISONBAG2"
 }
 
 // Poison Bag 3 (The Fighter's) ---------------------------------------------
@@ -132,6 +135,7 @@ ACTOR ArtiPoisonBag2 : ArtiPoisonBag native
 ACTOR ArtiPoisonBag3 : ArtiPoisonBag native
 {
 	Inventory.Icon "ARTIPSB3"
+	Tag "$TAG_ARTIPOISONBAG3"
 }
 // Poison Cloud -------------------------------------------------------------
 

wadsrc/static/actors/hexen/healingradius.txt

@@ -13,6 +13,7 @@ ACTOR ArtiHealingRadius : Inventory 10120 native
 	Inventory.Icon "ARTIHRAD"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIHEALINGRADIUS"
+	Tag "$TAG_ARTIHEALINGRADIUS"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/magecone.txt

@@ -13,6 +13,8 @@ ACTOR MWeapFrost : MageWeapon 53
 	Weapon.YAdjust 20
 	Weapon.AmmoType1 "Mana1"
 	Inventory.PickupMessage "$TXT_WEAPON_M2"
+	Obituary "$OB_MPMWEAPFROST"
+	Tag "$TAG_MWEAPFROST"
 
 	action native A_FireConePL1();
 
@@ -55,6 +57,7 @@ ACTOR FrostMissile native
 	DamageType "Ice"
 	Projectile
 	DeathSound "MageShardsExplode"
+	Obituary "$OB_MPMWEAPFROST"
 
 	action native A_ShedShard();
 

wadsrc/static/actors/hexen/magelightning.txt

@@ -12,6 +12,7 @@ ACTOR MWeapLightning : MageWeapon 8040
 	Weapon.YAdjust 20
 	Weapon.AmmoType1 "Mana2"
 	Inventory.PickupMessage "$TXT_WEAPON_M3"
+	Tag "$TAG_MWEAPLIGHTNING"
 
 	action native A_LightningReady();
 	action native A_MLightningAttack(class<Actor> floor = "LightningFloor", class<Actor> ceiling = "LightningCeiling");
@@ -56,6 +57,7 @@ ACTOR Lightning native
 	MissileType "LightningZap"
 	AttackSound "MageLightningZap"
 	ActiveSound "MageLightningContinuous"
+	Obituary "$OB_MPMWEAPLIGHTNING"
 }
 
 ACTOR LightningCeiling : Lightning
@@ -137,6 +139,7 @@ ACTOR LightningZap native
 	-ACTIVATEIMPACT
 	-ACTIVATEPCROSS
 	RenderStyle Add
+	Obituary "$OB_MPMWEAPLIGHTNING"
 
 	action native A_ZapMimic();
 

wadsrc/static/actors/hexen/magestaff.txt

@@ -86,6 +86,7 @@ ACTOR MWeapBloodscourge : MageWeapon native
 	+Inventory.NoAttenPickupSound
 	Inventory.PickupMessage "$TXT_WEAPON_M4"
 	Inventory.PickupSound "WeaponBuild"
+	Tag "$TAG_MWEAPBLOODSCOURGE"
 
 	action native A_MStaffAttack();
 	action native A_MStaffPalette();
@@ -128,6 +129,7 @@ ACTOR MageStaffFX2 native
 	+SCREENSEEKER
 	+EXTREMEDEATH
 	DeathSound "MageStaffExplode"
+	Obituary "$OB_MPMWEAPBLOODSCOURGE"
 
 	action native A_MStaffTrack();
 

wadsrc/static/actors/hexen/magewand.txt

@@ -7,6 +7,7 @@ ACTOR MWeapWand : MageWeapon
 	Weapon.SelectionOrder 3600
 	Weapon.KickBack 0
 	Weapon.YAdjust 9
+	Tag "$TAG_MWEAPWAND"
 
 	States
 	{
@@ -56,6 +57,7 @@ ACTOR MageWandMissile : FastProjectile
 	+SPAWNSOUNDSOURCE
 	MissileType "MageWandSmoke"
 	SeeSound "MageWandFire"
+	Obituary "$OB_MPMWEAPWAND"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/mana.txt

@@ -81,6 +81,7 @@ ACTOR ArtiBoostMana : CustomInventory 8003
 	Inventory.Icon "ARTIBMAN"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIBOOSTMANA"
+	Tag "$TAG_ARTIBOOSTMANA"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/puzzleitems.txt

@@ -8,6 +8,7 @@ ACTOR PuzzSkull : PuzzleItem 9002
 	PuzzleItem.Number 0
 	Inventory.Icon ARTISKLL
 	Inventory.PickupMessage "$TXT_ARTIPUZZSKULL"
+	Tag "$TAG_ARTIPUZZSKULL"
 	States
 	{
 	Spawn:
@@ -26,6 +27,7 @@ ACTOR PuzzGemBig : PuzzleItem 9003
 	PuzzleItem.Number 1
 	Inventory.Icon ARTIBGEM
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEMBIG"
+	Tag "$TAG_ARTIPUZZGEMBIG"
 	States
 	{
 	Spawn:
@@ -43,6 +45,7 @@ ACTOR PuzzGemRed : PuzzleItem 9004
 	PuzzleItem.Number 2
 	Inventory.Icon ARTIGEMR
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEMRED"
+	Tag "$TAG_ARTIPUZZGEMRED"
 	States
 	{
 	Spawn:
@@ -61,6 +64,7 @@ ACTOR PuzzGemGreen1 : PuzzleItem 9005
 	PuzzleItem.Number 3
 	Inventory.Icon ARTIGEMG
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEMGREEN1"
+	Tag "$TAG_ARTIPUZZGEMGREEN1"
 	States
 	{
 	Spawn:
@@ -79,6 +83,7 @@ ACTOR PuzzGemGreen2 : PuzzleItem 9009
 	PuzzleItem.Number 4
 	Inventory.Icon ARTIGMG2
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEMGREEN2"
+	Tag "$TAG_ARTIPUZZGEMGREEN2"
 	States
 	{
 	Spawn:
@@ -97,6 +102,7 @@ ACTOR PuzzGemBlue1 : PuzzleItem 9006
 	PuzzleItem.Number 5
 	Inventory.Icon ARTIGEMB
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEMBLUE1"
+	Tag "$TAG_ARTIPUZZGEMBLUE1"
 	States
 	{
 	Spawn:
@@ -115,6 +121,7 @@ ACTOR PuzzGemBlue2 : PuzzleItem 9010
 	PuzzleItem.Number 6
 	Inventory.Icon ARTIGMB2
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEMBLUE2"
+	Tag "$TAG_ARTIPUZZGEMBLUE2"
 	States
 	{
 	Spawn:
@@ -133,6 +140,7 @@ ACTOR PuzzBook1 : PuzzleItem 9007
 	PuzzleItem.Number 7
 	Inventory.Icon ARTIBOK1
 	Inventory.PickupMessage "$TXT_ARTIPUZZBOOK1"
+	Tag "$TAG_ARTIPUZZBOOK1"
 	States
 	{
 	Spawn:
@@ -151,6 +159,7 @@ ACTOR PuzzBook2 : PuzzleItem 9008
 	PuzzleItem.Number 8
 	Inventory.Icon ARTIBOK2
 	Inventory.PickupMessage "$TXT_ARTIPUZZBOOK2"
+	Tag "$TAG_ARTIPUZZBOOK2"
 	States
 	{
 	Spawn:
@@ -169,6 +178,7 @@ ACTOR PuzzFlameMask : PuzzleItem 9014
 	PuzzleItem.Number 9
 	Inventory.Icon ARTISKL2
 	Inventory.PickupMessage "$TXT_ARTIPUZZSKULL2"
+	Tag "$TAG_ARTIPUZZSKULL2"
 	States
 	{
 	Spawn:
@@ -185,6 +195,7 @@ ACTOR PuzzFWeapon : PuzzleItem 9015
 	PuzzleItem.Number 10
 	Inventory.Icon ARTIFWEP
 	Inventory.PickupMessage "$TXT_ARTIPUZZFWEAPON"
+	Tag "$TAG_ARTIPUZZFWEAPON"
 	States
 	{
 	Spawn:
@@ -202,6 +213,7 @@ ACTOR PuzzCWeapon : PuzzleItem 9016
 	PuzzleItem.Number 11
 	Inventory.Icon ARTICWEP
 	Inventory.PickupMessage "$TXT_ARTIPUZZCWEAPON"
+	Tag "$TAG_ARTIPUZZCWEAPON"
 	States
 	{
 	Spawn:
@@ -219,6 +231,7 @@ ACTOR PuzzMWeapon : PuzzleItem 9017
 	PuzzleItem.Number 12
 	Inventory.Icon ARTIMWEP
 	Inventory.PickupMessage "$TXT_ARTIPUZZMWEAPON"
+	Tag "$TAG_ARTIPUZZMWEAPON"
 	States
 	{
 	Spawn:
@@ -235,6 +248,7 @@ ACTOR PuzzGear1 : PuzzleItem 9018
 	PuzzleItem.Number 13
 	Inventory.Icon ARTIGEAR
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEAR"
+	Tag "$TAG_ARTIPUZZGEAR1"
 	States
 	{
 	Spawn:
@@ -252,6 +266,7 @@ ACTOR PuzzGear2 : PuzzleItem 9019
 	PuzzleItem.Number 14
 	Inventory.Icon ARTIGER2
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEAR"
+	Tag "$TAG_ARTIPUZZGEAR2"
 	States
 	{
 	Spawn:
@@ -269,6 +284,7 @@ ACTOR PuzzGear3 : PuzzleItem 9020
 	PuzzleItem.Number 15
 	Inventory.Icon ARTIGER3
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEAR"
+	Tag "$TAG_ARTIPUZZGEAR3"
 	States
 	{
 	Spawn:
@@ -286,6 +302,7 @@ ACTOR PuzzGear4 : PuzzleItem 9021
 	PuzzleItem.Number 16
 	Inventory.Icon ARTIGER4
 	Inventory.PickupMessage "$TXT_ARTIPUZZGEAR"
+	Tag "$TAG_ARTIPUZZGEAR4"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/speedboots.txt

@@ -9,6 +9,7 @@ ACTOR ArtiSpeedBoots : PowerupGiver 8002
 	+INVENTORY.PICKUPFLASH
 	Inventory.Icon ARTISPED
 	Inventory.PickupMessage "$TXT_ARTISPEED"
+	Tag "$TAG_ARTISPEED"
 	Powerup.Type Speed
 	States
 	{

wadsrc/static/actors/hexen/summon.txt

@@ -14,6 +14,7 @@ ACTOR ArtiDarkServant : Inventory 86 native
 	Inventory.Icon "ARTISUMN"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTISUMMON"
+	Tag "$TAG_ARTISUMMON"
 	States
 	{
 	Spawn:

wadsrc/static/actors/hexen/teleportother.txt

@@ -14,6 +14,7 @@ ACTOR ArtiTeleportOther : Inventory 10040 native
 	Inventory.Icon "ARTITELO"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTITELEPORTOTHER"
+	Tag "$TAG_ARTITELEPORTOTHER"
 	States
 	{
 	Spawn:

wadsrc/static/actors/raven/artiegg.txt

@@ -38,6 +38,7 @@ ACTOR ArtiEgg : CustomInventory 30
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIEGG"
 	Inventory.DefMaxAmount
+	Tag "$TAG_ARTIEGG"
 	States
 	{
 	Spawn:
@@ -91,6 +92,7 @@ ACTOR ArtiPork : CustomInventory 30
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIEGG2"
 	Inventory.DefMaxAmount
+	Tag "$TAG_ARTIPORK"
 	States
 	{
 	Spawn:

wadsrc/static/actors/raven/artitele.txt

@@ -13,6 +13,7 @@ ACTOR ArtiTeleport : Inventory 36 native
 	Inventory.Icon "ARTIATLP"
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTITELEPORT"
+	Tag "$TAG_ARTITELEPORT"
 	States
 	{
 	Spawn:

wadsrc/static/actors/raven/ravenartifacts.txt

@@ -13,6 +13,7 @@ ACTOR ArtiHealth : HealthPickup 82
 	Inventory.Icon ARTIPTN2
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTIHEALTH"
+	Tag "$TAG_ARTIHEALTH"
 	HealthPickup.Autouse 1
 	States
 	{
@@ -36,6 +37,7 @@ ACTOR ArtiSuperHealth : HealthPickup 32
 	Inventory.Icon ARTISPHL
 	Inventory.PickupSound "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_ARTISUPERHEALTH"
+	Tag "$TAG_ARTISUPERHEALTH"
 	HealthPickup.Autouse 2
 	States
 	{
@@ -58,6 +60,7 @@ ACTOR ArtiFly : PowerupGiver 83
 	Inventory.RespawnTics 4230
 	Inventory.Icon ARTISOAR
 	Inventory.PickupMessage "$TXT_ARTIFLY"
+	Tag "$TAG_ARTIFLY"
 	Powerup.Type Flight
 	States
 	{
@@ -79,6 +82,7 @@ ACTOR ArtiInvulnerability : PowerupGiver 84
 	Inventory.RespawnTics 4230
 	Inventory.Icon ARTIINVU
 	Inventory.PickupMessage "$TXT_ARTIINVULNERABILITY"
+	Tag "$TAG_ARTIINVULNERABILITY"
 	Powerup.Type Invulnerable
 	Powerup.Color GoldMap
 	States
@@ -102,6 +106,7 @@ ACTOR ArtiInvulnerability2 : PowerupGiver 84
 	Inventory.Icon ARTIDEFN
 	Inventory.PickupMessage "$TXT_ARTIINVULNERABILITY2"
 	Powerup.Type Invulnerable
+	Tag "$TAG_ARTIDEFENDER"
 	States
 	{
 	Spawn:
@@ -121,6 +126,7 @@ ACTOR ArtiTorch : PowerupGiver 33
 	+INVENTORY.PICKUPFLASH
 	Inventory.Icon ARTITRCH
 	Inventory.PickupMessage "$TXT_ARTITORCH"
+	Tag "$TAG_ARTITORCH"
 	Powerup.Type Torch
 	States
 	{

wadsrc/static/actors/strife/acolyte.txt

@@ -15,7 +15,7 @@ ACTOR Acolyte : StrifeHumanoid
 	+FLOORCLIP
 	+NEVERRESPAWN
 	MinMissileChance 150
-	Tag "ACOLYTE"
+	Tag "$TAG_ACOLYTE"
 	SeeSound "acolyte/sight"
 	PainSound "acolyte/pain"
 	AttackSound "acolyte/rifle"

wadsrc/static/actors/strife/beggars.txt

@@ -13,7 +13,7 @@ ACTOR Beggar : StrifeHumanoid
 	-COUNTKILL
 	+NOSPLASHALERT
 	MinMissileChance 150
-	Tag "Beggar"
+	Tag "$TAG_BEGGAR"
 	MaxStepHeight 16
 	MaxDropoffHeight 32
 	HitObituary "$OB_BEGGAR"

wadsrc/static/actors/strife/coin.txt

@@ -10,7 +10,7 @@ ACTOR Coin : Inventory 93 native
 	+FLOORCLIP
 	Inventory.MaxAmount 0x7fffffff
 	+INVENTORY.INVBAR
-	Tag "coin"
+	Tag "$TAG_COIN"
 	Inventory.Icon "I_COIN"
 	Inventory.PickupMessage "$TXT_COIN"
 	States
@@ -29,7 +29,7 @@ ACTOR Gold10 : Coin 138
 	Game Strife
 	ConversationID 169, 162, 166
 	Inventory.Amount 10
-	Tag "10 gold"
+	Tag "$TAG_10GOLD"
 	Inventory.PickupMessage "$TXT_10GOLD"
 	States
 	{
@@ -46,7 +46,7 @@ ACTOR Gold25 : Coin 139
 	Game Strife
 	ConversationID 170, 163, 167
 	Inventory.Amount 25
-	Tag "25 gold"
+	Tag "$TAG_25GOLD"
 	Inventory.PickupMessage "$TXT_25GOLD"
 	States
 	{
@@ -63,7 +63,7 @@ ACTOR Gold50 : Coin 140
 	Game Strife
 	ConversationID 171, 164, 168
 	Inventory.Amount 50
-	Tag "50 gold"
+	Tag "$TAG_50GOLD"
 	Inventory.PickupMessage "$TXT_50GOLD"
 	States
 	{
@@ -79,7 +79,7 @@ ACTOR Gold300 : Coin
 {
 	ConversationID 172, -1, -1
 	Inventory.Amount 300
-	Tag "300 gold"
+	Tag "$TAG_300GOLD"
 	Inventory.PickupMessage "$TXT_300GOLD"
 	Inventory.GiveQuest 3
 	+INVENTORY.ALWAYSPICKUP

wadsrc/static/actors/strife/loremaster.txt

@@ -23,7 +23,7 @@ ACTOR Loremaster 12
 	+NEVERRESPAWN
 	DamageFactor "Fire", 0.5
 	MinMissileChance 150
-	Tag "PRIEST"
+	Tag "$TAG_PRIEST"
 	SeeSound "loremaster/sight"
 	AttackSound "loremaster/attack"
 	PainSound "loremaster/pain"

wadsrc/static/actors/strife/macil.txt

@@ -23,7 +23,7 @@ ACTOR Macil1 64
 	PainSound "macil/pain"
 	ActiveSound "macil/active"
 	CrushPainSound "misc/pcrush"
-	Tag "MACIL"
+	Tag "$TAG_MACIL1"
 	Obituary "$OB_MACIL"
 	DropItem "BoxOfBullets"
 	MaxStepHeight 16
@@ -66,6 +66,7 @@ ACTOR Macil2 : Macil1 200
 	+COUNTKILL
 	+SPECTRAL
 	-NODAMAGE
+	Tag "$TAG_MACIL2"
 	DeathSound "macil/slop"
 	DropItem "None"
 	DamageFactor "SpectralLow", 0

wadsrc/static/actors/strife/merchants.txt

@@ -59,7 +59,7 @@ ACTOR WeaponSmith : Merchant 116
 	Game Strife
 	ConversationID 2
 	PainSound "smith/pain"
-	Tag "Weapon Smith"
+	Tag "$TAG_WEAPONSMITH"
 }
 
 
@@ -72,7 +72,7 @@ ACTOR BarKeep : Merchant 72
 	ConversationID 3
 	PainSound "barkeep/pain"
 	ActiveSound "barkeep/active"
-	Tag "Bar Keep"
+	Tag "$TAG_BARKEEP"
 }
 
 
@@ -84,7 +84,7 @@ ACTOR Armorer : Merchant 73
 	Translation 5
 	ConversationID 4
 	PainSound "armorer/pain"
-	Tag "Armorer"
+	Tag "$TAG_ARMORER"
 }
 
 
@@ -96,6 +96,6 @@ ACTOR Medic : Merchant 74
 	Translation 6
 	ConversationID 5
 	PainSound "medic/pain"
-	Tag "Medic"
+	Tag "$TAG_MEDIC"
 }
 

wadsrc/static/actors/strife/oracle.txt

@@ -15,7 +15,7 @@ ACTOR Oracle 199
 	DamageFactor "Fire", 0.5
 	DamageFactor "SpectralLow", 0
 	MaxDropoffHeight 32
-	Tag "Oracle"
+	Tag "$TAG_ORACLE"
 	DropItem "Meat"
 
 	action native A_WakeOracleSpectre ();

wadsrc/static/actors/strife/questitems.txt

@@ -64,19 +64,19 @@ ACTOR QuestItem3 : QuestItem
 ACTOR QuestItem4 : QuestItem
 {
 	ConversationID 315, 296, 313
-	Tag "quest4"
+	Tag "$TAG_QUEST4"
 }
 
 ACTOR QuestItem5 : QuestItem
 {
 	ConversationID 316, 297, 314
-	Tag "quest5"
+	Tag "$TAG_QUEST5"
 }
 
 ACTOR QuestItem6 : QuestItem
 {
 	ConversationID 317, 298, 315
-	Tag "quest4"
+	Tag "TAG_QUEST6"
 }
 
 ACTOR QuestItem7 : QuestItem

wadsrc/static/actors/strife/ratbuddy.txt

@@ -12,7 +12,7 @@ ACTOR RatBuddy 85
 	MinMissileChance 150
 	MaxStepHeight 16
 	MaxDropoffHeight 32
-	Tag "rat buddy"
+	Tag "$TAG_RATBUDDY"
 	SeeSound "rat/sight"
 	DeathSound "rat/death"
 	ActiveSound "rat/active"

wadsrc/static/actors/strife/rebels.txt

@@ -14,7 +14,7 @@ ACTOR Rebel : StrifeHumanoid
 	-COUNTKILL
 	+NOSPLASHALERT
 	MinMissileChance 150
-	Tag "Rebel"
+	Tag "$TAG_REBEL"
 	SeeSound "rebel/sight"
 	PainSound "rebel/pain"
 	DeathSound "rebel/death"
@@ -124,7 +124,7 @@ ACTOR TeleporterBeacon : Inventory 10 native
 	+DROPPED
 	+INVENTORY.INVBAR
 	Inventory.Icon "I_BEAC"
-	Tag "Teleporter Beacon"
+	Tag "$TAG_TELEPORTERBEACON"
 	Inventory.PickupMessage "$TXT_BEACON"
 
 	action native A_Beacon ();

wadsrc/static/actors/strife/sigil.txt

@@ -11,7 +11,7 @@ ACTOR Sigil : Weapon native
 	+FLOORCLIP
 	+WEAPON.CHEATNOTWEAPON
 	Inventory.PickupSound "weapons/sigilcharge"
-	Tag "SIGIL"
+	Tag "$TAG_SIGIL"
 	Inventory.Icon "I_SGL1"
 	Inventory.PickupMessage "$TXT_SIGIL"
 	

wadsrc/static/actors/strife/strifeammo.txt

@@ -10,7 +10,7 @@ ACTOR HEGrenadeRounds : Ammo 152
 	Ammo.BackpackAmount 6
 	Ammo.BackpackMaxAmount 60
 	Inventory.Icon "I_GRN1"
-	Tag "HE-Grenade Rounds"
+	Tag "$TAG_HEGRENADES"
 	Inventory.PickupMessage "$TXT_HEGRENADES"
 	States
 	{
@@ -32,7 +32,7 @@ ACTOR PhosphorusGrenadeRounds : Ammo 153
 	Ammo.BackpackAmount 4
 	Ammo.BackpackMaxAmount 32
 	Inventory.Icon "I_GRN2"
-	Tag "Phoshorus-Grenade Rounds"	// "Fire-Grenade_Rounds" in the Teaser
+	Tag "$TAG_PHGRENADES"
 	Inventory.PickupMessage "$TXT_PHGRENADES"
 	States
 	{
@@ -55,7 +55,7 @@ ACTOR ClipOfBullets : Ammo 2007
 	Ammo.BackpackAmount 10
 	Ammo.BackpackMaxAmount 500
 	Inventory.Icon "I_BLIT"
-	Tag "Clip of Bullets"	// "bullets" in the Teaser
+	Tag "$TAG_CLIPOFBULLETS"
 	Inventory.PickupMessage "$TXT_CLIPOFBULLETS"
 	States
 	{
@@ -73,7 +73,7 @@ ACTOR BoxOfBullets : ClipOfBullets 2048
 	SpawnID 139
 	ConversationID 180, 174, 178
 	Inventory.Amount 50
-	Tag "Ammo"
+	Tag "$TAG_BOXOFBULLETS"
 	Inventory.PickupMessage "$TXT_BOXOFBULLETS"
 	States
 	{
@@ -96,7 +96,7 @@ ACTOR MiniMissiles : Ammo 2010
 	Ammo.BackpackAmount 4
 	Ammo.BackpackMaxAmount 200
 	Inventory.Icon "I_ROKT"
-	Tag "Mini Missiles"	//"rocket" in the Teaser
+	Tag "$TAG_MINIMISSILES"
 	Inventory.PickupMessage "$TXT_MINIMISSILES"
 	States
 	{
@@ -114,7 +114,7 @@ ACTOR CrateOfMissiles : MiniMissiles 2046
 	SpawnID 141
 	ConversationID 182, 176, 180
 	Inventory.Amount 20
-	Tag "Crate of Missiles"	//"box_of_rockets" in the Teaser
+	Tag "$TAG_CRATEOFMISSILES"
 	Inventory.PickupMessage "$TXT_CRATEOFMISSILES"
 	States
 	{
@@ -138,7 +138,7 @@ ACTOR EnergyPod : Ammo 2047
 	Ammo.BackpackMaxAmount 800
 	Ammo.DropAmount 20
 	Inventory.Icon "I_BRY1"
-	Tag "Energy Pod"
+	Tag "$TAG_ENERGYPOD"
 	Inventory.PickupMessage "$TXT_ENERGYPOD"
 	States
 	{
@@ -156,7 +156,7 @@ ACTOR EnergyPack : EnergyPod 17
 	SpawnID 142
 	ConversationID 184, 178, 182
 	Inventory.Amount 100
-	Tag "Energy Pack"
+	Tag "$TAG_ENERGYPACK"
 	Inventory.PickupMessage "$TXT_ENERGYPACK"
 	States
 	{
@@ -178,7 +178,7 @@ ACTOR PoisonBolts : Ammo 115
 	Ammo.BackpackAmount 2
 	Ammo.BackpackMaxAmount 50
 	Inventory.Icon "I_PQRL"
-	Tag "Poison Bolts"	// "poison_arrows" in the Teaser
+	Tag "$TAG_POISONBOLTS"
 	Inventory.PickupMessage "$TXT_POISONBOLTS"
 	States
 	{
@@ -200,7 +200,7 @@ ACTOR ElectricBolts : Ammo 114
 	Ammo.BackpackAmount 4
 	Ammo.BackpackMaxAmount 100
 	Inventory.Icon "I_XQRL"
-	Tag "Electric Bolts"	// "electric_arrows" in the Teaser
+	Tag "$TAG_ELECTRICBOLTS"
 	Inventory.PickupMessage "$TXT_ELECTRICBOLTS"
 	States
 	{
@@ -219,7 +219,7 @@ ACTOR AmmoSatchel : BackpackItem 183
 	ConversationID 187, 181, 184
 	+FLOORCLIP
 	Inventory.Icon "I_BKPK"
-	Tag "Ammo Satchel"	// "Back_pack" in the Teaser
+	Tag "$TAG_AMMOSATCHEL"
 	Inventory.PickupMessage "$TXT_AMMOSATCHEL"
 	States
 	{

wadsrc/static/actors/strife/strifearmor.txt

@@ -14,7 +14,7 @@ ACTOR MetalArmor : BasicArmorPickup 2019
 	Inventory.PickupMessage "$TXT_METALARMOR"
 	Armor.SaveAmount 200
 	Armor.SavePercent 50
-	Tag "Metal Armor"
+	Tag "$TAG_METALARMOR"
 	States
 	{
 	Spawn:
@@ -38,7 +38,7 @@ ACTOR LeatherArmor : BasicArmorPickup 2018
 	Inventory.PickupMessage "$TXT_LEATHERARMOR"
 	Armor.SaveAmount 100
 	Armor.SavePercent 33.335
-	Tag "Leather Armor"
+	Tag "$TAG_LEATHER"
 	States
 	{
 	Spawn:

wadsrc/static/actors/strife/strifeitems.txt

@@ -8,7 +8,7 @@ ACTOR MedPatch : HealthPickup 2011
 	+FLOORCLIP
 	+INVENTORY.INVBAR
 	Inventory.MaxAmount 20
-	Tag "Med patch"
+	Tag "$TAG_MEDPATCH"
 	Inventory.Icon "I_STMP"
 	Inventory.PickupMessage "$TXT_MEDPATCH"
 	HealthPickup.Autouse 3
@@ -31,7 +31,7 @@ ACTOR MedicalKit : HealthPickup 2012
 	+FLOORCLIP
 	+INVENTORY.INVBAR
 	Inventory.MaxAmount 15
-	Tag "Medical kit"
+	Tag "$TAG_MEDICALKIT"
 	Inventory.Icon "I_MDKT"
 	Inventory.PickupMessage "$TXT_MEDICALKIT"
 	HealthPickup.Autouse 3
@@ -54,7 +54,7 @@ ACTOR SurgeryKit : HealthPickup 83
 	+INVENTORY.INVBAR
 	Health -100
 	Inventory.MaxAmount 5
-	Tag "Surgery Kit"	// "full_health" in the Teaser
+	Tag "$TAG_SURGERYKIT"
 	Inventory.Icon "I_FULL"
 	Inventory.PickupMessage "$TXT_SURGERYKIT"
 	States
@@ -75,7 +75,7 @@ ACTOR StrifeMap : MapRevealer 2026
 	ConversationID 164, 160, 163
 	+FLOORCLIP
 	Inventory.PickupSound "misc/p_pkup"
-	Inventory.PickupMessage "$TXT_STRIFEMAP"	
+	Inventory.PickupMessage "$TXT_STRIFEMAP"
 	States
 	{
 	Spawn:
@@ -94,7 +94,7 @@ ACTOR BeldinsRing : Inventory
 	+FLOORCLIP
 	+INVENTORY.INVBAR
 	ConversationID 173, 165, 169
-	Tag "Ring"
+	Tag "$TAG_BELDINSRING"
 	Inventory.Icon "I_RING"
 	Inventory.GiveQuest 1
 	Inventory.PickupMessage "$TXT_BELDINSRING"
@@ -118,7 +118,7 @@ ACTOR OfferingChalice : Inventory 205
 	ConversationID 174, 166, 170
 	Radius 10
 	Height 16
-	Tag "Offering Chalice"
+	Tag "$TAG_OFFERINGCHALICE"
 	Inventory.Icon "I_RELC"
 	Inventory.PickupMessage "$TXT_OFFERINGCHALICE"
 	Inventory.GiveQuest 2
@@ -139,7 +139,7 @@ ACTOR Ear : Inventory
 	+FLOORCLIP
 	+INVENTORY.INVBAR
 	ConversationID 175, 167, 171
-	Tag "Ear"
+	Tag "$TAG_EAR"
 	Inventory.Icon "I_EARS"
 	Inventory.PickupMessage "$TXT_EAR"
 	Inventory.GiveQuest 9
@@ -164,7 +164,7 @@ ACTOR BrokenPowerCoupling : Inventory 226
 	+INVENTORY.INVBAR
 	Radius 16
 	Height 16
-	Tag "Broken Power Coupling"
+	Tag "$TAG_BROKENCOUPLING"
 	Inventory.MaxAmount 1
 	Inventory.Icon "I_COUP"
 	Inventory.PickupMessage "$TXT_BROKENCOUPLING"
@@ -190,7 +190,7 @@ ACTOR ShadowArmor : PowerupGiver 2024
 	+INVENTORY.INVBAR
 	-INVENTORY.FANCYPICKUPSOUND
 	RenderStyle Translucent
-	Tag "Shadow Armor"
+	Tag "$TAG_SHADOWARMOR"
 	Inventory.MaxAmount 2
 	Powerup.Type "Shadow"
 	Inventory.Icon "I_SHD1"
@@ -217,7 +217,7 @@ ACTOR EnvironmentalSuit : PowerupGiver 2025
 	-INVENTORY.FANCYPICKUPSOUND
 	Inventory.MaxAmount 5
 	Powerup.Type "Mask"
-	Tag "Environmental Suit"
+	Tag "$TAG_ENVSUIT"
 	Inventory.Icon "I_MASK"
 	Inventory.PickupSound "misc/i_pkup"
 	Inventory.PickupMessage "$TXT_ENVSUIT"
@@ -238,7 +238,7 @@ ACTOR GuardUniform : Inventory 90
 	ConversationID 162, 158, 161
 	+FLOORCLIP
 	+INVENTORY.INVBAR
-	Tag "Guard Uniform"
+	Tag "$TAG_GUARDUNIFORM"
 	Inventory.Icon "I_UNIF"
 	Inventory.PickupMessage "$TXT_GUARDUNIFORM"
 	Inventory.GiveQuest 15
@@ -259,7 +259,7 @@ ACTOR OfficersUniform : Inventory 52
 	ConversationID 163, 159, 162
 	+FLOORCLIP
 	+INVENTORY.INVBAR
-	Tag "Officer's Uniform"
+	Tag "$TAG_OFFICERSUNIFORM"
 	Inventory.Icon "I_OFIC"
 	Inventory.PickupMessage "$TXT_OFFICERSUNIFORM"
 	States
@@ -280,7 +280,7 @@ ACTOR FlameThrowerParts : Inventory
 	+FLOORCLIP
 	+INVENTORY.INVBAR
 	Inventory.Icon "I_BFLM"
-	Tag "Flame Thrower Parts"
+	Tag "$TAG_FTHROWERPARTS"
 	Inventory.PickupMessage "$TXT_FTHROWERPARTS"
 	States
 	{
@@ -300,7 +300,7 @@ ACTOR InterrogatorReport : Inventory
 	Game Strife
 	ConversationID 308, 289, 306
 	+FLOORCLIP
-	Tag "Report"
+	Tag "$TAG_REPORT"
 	Inventory.PickupMessage "$TXT_REPORT"
 	States
 	{
@@ -319,7 +319,7 @@ ACTOR Info : Inventory
 	ConversationID 300, 282, 299
 	+FLOORCLIP
 	+INVENTORY.INVBAR
-	Tag "Info"
+	Tag "$TAG_INFO"
 	Inventory.Icon "I_TOKN"
 	Inventory.PickupMessage "$TXT_INFO"
 	States
@@ -340,7 +340,7 @@ ACTOR Targeter : PowerupGiver 207
 	+FLOORCLIP
 	+INVENTORY.INVBAR
 	-INVENTORY.FANCYPICKUPSOUND
-	Tag "Targeter"
+	Tag "$TAG_TARGETER"
 	Powerup.Type "Targeter"
 	Inventory.MaxAmount 5
 	Inventory.Icon "I_TARG"
@@ -361,7 +361,7 @@ ACTOR Communicator : Inventory 206
 	Game Strife
 	ConversationID 176, 168, 172
 	+NOTDMATCH
-	Tag "Communicator"
+	Tag "$TAG_COMMUNICATOR"
 	Inventory.Icon "I_COMM"
 	Inventory.PickupSound  "misc/p_pkup"
 	Inventory.PickupMessage "$TXT_COMMUNICATOR"
@@ -389,7 +389,7 @@ ACTOR DegninOre : Inventory 59 native
 	+FLOORCLIP
 	+INCOMBAT
 	+INVENTORY.INVBAR
-	Tag "Degnin Ore"
+	Tag "$TAG_DEGNINORE"
 	DeathSound "ore/explode"
 	Inventory.Icon "I_XPRK"
 	Inventory.PickupMessage "$TXT_DEGNINORE"
@@ -418,7 +418,7 @@ ACTOR GunTraining : Inventory
 	+INVENTORY.INVBAR
 	+INVENTORY.UNDROPPABLE
 	Inventory.MaxAmount 100
-	Tag "Accuracy"
+	Tag "$TAG_GUNTRAINING"
 	Inventory.Icon "I_GUNT"
 	States
 	{
@@ -438,7 +438,7 @@ ACTOR HealthTraining : Inventory native
 	+INVENTORY.INVBAR
 	+INVENTORY.UNDROPPABLE
 	Inventory.MaxAmount 100
-	Tag "Toughness"
+	Tag "$TAG_HEALTHTRAINING"
 	Inventory.Icon "I_HELT"
 	States
 	{
@@ -459,7 +459,7 @@ ACTOR Scanner : PowerupGiver 2027 native
 	+FLOORCLIP
 	+INVENTORY.FANCYPICKUPSOUND
 	Inventory.MaxAmount 1
-	Tag "Scanner"
+	Tag "$TAG_SCANNER"
 	Inventory.Icon "I_PMUP"
 	Powerup.Type "Scanner"
 	Inventory.PickupSound "misc/i_pkup"
@@ -479,8 +479,8 @@ ACTOR PrisonPass : Key native
 	Game Strife
 	ConversationID 304, 286, 303
 	Inventory.Icon "I_TOKN"
-	Tag "Prison Pass"
-	Inventory.PickupMessage "TXT_PRISONPASS"
+	Tag "$TAG_PRISONPASS"
+	Inventory.PickupMessage "$TXT_PRISONPASS"
 	States
 	{
 	Spawn:
@@ -509,7 +509,7 @@ ACTOR DummyStrifeItem : Inventory native
 ACTOR RaiseAlarm : DummyStrifeItem native
 {	
 	ConversationID 301, 283, 300
-	Tag "Alarm"
+	Tag "$TAG_ALARM"
 }
 
 // Open door tag 222 --------------------------------------------------------
@@ -538,7 +538,7 @@ ACTOR OpenDoor224 : DummyStrifeItem native
 ACTOR AmmoFillup : DummyStrifeItem native
 {
 	ConversationID 298,280,297
-	Tag "Ammo"
+	Tag "$TAG_AMMOFILLUP"
 }
 
 // Health -------------------------------------------------------------------
@@ -546,7 +546,7 @@ ACTOR AmmoFillup : DummyStrifeItem native
 ACTOR HealthFillup : DummyStrifeItem native
 {
 	ConversationID 299,281,298
-	Tag "Health"
+	Tag "$TAG_HEALTHFILLUP"
 }
 
 // Upgrade Stamina ----------------------------------------------------------

wadsrc/static/actors/strife/strifekeys.txt

@@ -13,7 +13,7 @@ ACTOR BaseKey : StrifeKey 230
 	Game Strife
 	ConversationID 133, 129, 132
 	Inventory.Icon "I_FUSL"
-	Tag "Base Key"
+	Tag "$TAG_BASEKEY"
 	Inventory.PickupMessage "$TXT_BASEKEY"
 	States
 	{
@@ -31,7 +31,7 @@ ACTOR GovsKey : StrifeKey
 	Game Strife
 	ConversationID 134, 130, 133
 	Inventory.Icon "I_REBL"
-	Tag "Govs Key"	// "Rebel_Key" in the Teaser
+	Tag "$TAG_GOVSKEY"
 	Inventory.PickupMessage "$TXT_GOVSKEY"
 	States
 	{
@@ -49,7 +49,7 @@ ACTOR Passcard : StrifeKey 185
 	Game Strife
 	ConversationID 135, 131, 134
 	Inventory.Icon "I_TPAS"
-	Tag "Passcard"
+	Tag "$TAG_PASSCARD"
 	Inventory.PickupMessage "$TXT_PASSCARD"
 	States
 	{
@@ -67,7 +67,7 @@ ACTOR IDBadge : StrifeKey 184
 	Game Strife
 	ConversationID 136, 132, 135
 	Inventory.Icon "I_CRD1"
-	Tag "ID Badge"
+	Tag "$TAG_IDBADGE"
 	Inventory.PickupMessage "$TXT_IDBADGE"
 	States
 	{
@@ -85,7 +85,7 @@ ACTOR PrisonKey : StrifeKey
 	Game Strife
 	ConversationID 137, 133, 136
 	Inventory.Icon "I_PRIS"
-	Tag "Prison Key"
+	Tag "$TAG_PRISONKEY"
 	Inventory.GiveQuest 11
 	Inventory.PickupMessage "$TXT_PRISONKEY"
 	States
@@ -104,7 +104,7 @@ ACTOR SeveredHand : StrifeKey 91
 	Game Strife
 	ConversationID 138, 134, 137
 	Inventory.Icon "I_HAND"
-	Tag "Severed Hand"
+	Tag "$TAG_SEVEREDHAND"
 	Inventory.GiveQuest 12
 	Inventory.PickupMessage "$TXT_SEVEREDHAND"
 	States
@@ -123,7 +123,7 @@ ACTOR Power1Key : StrifeKey
 	Game Strife
 	ConversationID 139, 135, 138
 	Inventory.Icon "I_PWR1"
-	Tag "Power1 Key"
+	Tag "$TAG_POWER1KEY"
 	Inventory.PickupMessage "$TXT_POWER1KEY"
 	States
 	{
@@ -141,7 +141,7 @@ ACTOR Power2Key : StrifeKey
 	Game Strife
 	ConversationID 140, 136, 139
 	Inventory.Icon "I_PWR2"
-	Tag "Power2 Key"
+	Tag "$TAG_POWER2KEY"
 	Inventory.PickupMessage "$TXT_POWER2KEY"
 	States
 	{
@@ -159,7 +159,7 @@ ACTOR Power3Key : StrifeKey
 	Game Strife
 	ConversationID 141, 137, 140
 	Inventory.Icon "I_PWR3"
-	Tag "Power3 Key"
+	Tag "$TAG_POWER3KEY"
 	Inventory.PickupMessage "$TXT_POWER3KEY"
 	States
 	{
@@ -177,7 +177,7 @@ ACTOR GoldKey : StrifeKey 40
 	Game Strife
 	ConversationID 142, 138, 141
 	Inventory.Icon "I_KY1G"
-	Tag "Gold Key"
+	Tag "$TAG_GOLDKEY"
 	Inventory.PickupMessage "$TXT_GOLDKEY"
 	States
 	{
@@ -195,7 +195,7 @@ ACTOR IDCard : StrifeKey 13
 	Game Strife
 	ConversationID 143, 139, 142
 	Inventory.Icon "I_CRD2"
-	Tag "ID Card"
+	Tag "$TAG_IDCARD"
 	Inventory.PickupMessage "$TXT_IDCARD"
 	States
 	{
@@ -213,7 +213,7 @@ ACTOR SilverKey : StrifeKey 38
 	Game Strife
 	ConversationID 144, 140, 143
 	Inventory.Icon "I_KY2S"
-	Tag "Silver Key"
+	Tag "$TAG_SILVERKEY"
 	Inventory.PickupMessage "$TXT_SILVERKEY"
 	States
 	{
@@ -231,7 +231,7 @@ ACTOR OracleKey : StrifeKey 61
 	Game Strife
 	ConversationID 145, 141, 144
 	Inventory.Icon "I_ORAC"
-	Tag "Oracle Key"
+	Tag "$TAG_ORACLEKEY"
 	Inventory.PickupMessage "$TXT_ORACLEKEY"
 	States
 	{
@@ -249,7 +249,7 @@ ACTOR MilitaryID : StrifeKey
 	Game Strife
 	ConversationID 146, 142, 145
 	Inventory.Icon "I_GYID"
-	Tag "Military ID"
+	Tag "$TAG_MILITARYID"
 	Inventory.PickupMessage "$TXT_MILITARYID"
 	States
 	{
@@ -267,7 +267,7 @@ ACTOR OrderKey : StrifeKey 86
 	Game Strife
 	ConversationID 147, 143, 146
 	Inventory.Icon "I_FUBR"
-	Tag "Order Key"
+	Tag "$TAG_ORDERKEY"
 	Inventory.PickupMessage "$TXT_ORDERKEY"
 	States
 	{
@@ -285,7 +285,7 @@ ACTOR WarehouseKey : StrifeKey 166
 	Game Strife
 	ConversationID 148, 144, 147
 	Inventory.Icon "I_WARE"
-	Tag "Warehouse Key"
+	Tag "$TAG_WAREHOUSEKEY"
 	Inventory.PickupMessage "$TXT_WAREHOUSEKEY"
 	States
 	{
@@ -303,7 +303,7 @@ ACTOR BrassKey : StrifeKey 39
 	Game Strife
 	ConversationID 149, 145, 148
 	Inventory.Icon "I_KY3B"
-	Tag "Brass Key"
+	Tag "$TAG_BRASSKEY"
 	Inventory.PickupMessage "$TXT_BRASSKEY"
 	States
 	{
@@ -321,7 +321,7 @@ ACTOR RedCrystalKey : StrifeKey 192
 	Game Strife
 	ConversationID 150, 146, 149
 	Inventory.Icon "I_RCRY"
-	Tag "Red Crystal Key"
+	Tag "$TAG_REDCRYSTALKEY"
 	Inventory.PickupMessage "$TXT_REDCRYSTAL"
 	States
 	{
@@ -339,7 +339,7 @@ ACTOR BlueCrystalKey : StrifeKey 193
 	Game Strife
 	ConversationID 151, 147, 150
 	Inventory.Icon "I_BCRY"
-	Tag "Blue Crystal Key"
+	Tag "$TAG_BLUECRYSTALKEY"
 	Inventory.PickupMessage "$TXT_BLUECRYSTAL"
 	States
 	{
@@ -357,7 +357,7 @@ ACTOR ChapelKey : StrifeKey 195
 	Game Strife
 	ConversationID 152, 148, 151
 	Inventory.Icon "I_CHAP"
-	Tag "Chapel Key"
+	Tag "$TAG_CHAPELKEY"
 	Inventory.PickupMessage "$TXT_CHAPELKEY"
 	States
 	{
@@ -375,7 +375,7 @@ ACTOR CatacombKey : StrifeKey
 	Game Strife
 	ConversationID 153, 149, 152
 	Inventory.Icon "I_TUNL"
-	Tag "Catacomb Key"	// "Tunnel_Key" in the Teaser
+	Tag "$TAG_CATACOMBKEY"
 	Inventory.GiveQuest 28
 	Inventory.PickupMessage "$TXT_CATACOMBKEY"
 	States
@@ -394,7 +394,7 @@ ACTOR SecurityKey : StrifeKey
 	Game Strife
 	ConversationID 154, 150, 153
 	Inventory.Icon "I_SECK"
-	Tag "Security Key"
+	Tag "$TAG_SECURITYKEY"
 	Inventory.PickupMessage "$TXT_SECURITYKEY"
 	States
 	{
@@ -412,7 +412,7 @@ ACTOR CoreKey : StrifeKey 236
 	Game Strife
 	ConversationID 155, 151, 154
 	Inventory.Icon "I_GOID"
-	Tag "Core Key"	// "New_Key1" in the Teaser
+	Tag "$TAG_COREKEY"
 	Inventory.PickupMessage "$TXT_COREKEY"
 	States
 	{
@@ -430,7 +430,7 @@ ACTOR MaulerKey : StrifeKey 233
 	Game Strife
 	ConversationID 156, 152, 155
 	Inventory.Icon "I_BLTK"
-	Tag "Mauler Key"	// "New_Key2" in the Teaser
+	Tag "$TAG_MAULERKEY"
 	Inventory.PickupMessage "$TXT_MAULERKEY"
 	States
 	{
@@ -448,7 +448,7 @@ ACTOR FactoryKey : StrifeKey 234
 	Game Strife
 	ConversationID 157, 153, 156
 	Inventory.Icon "I_PROC"
-	Tag "Factory Key"	// "New_Key3" in the Teaser
+	Tag "$TAG_FACTORYKEY"
 	Inventory.PickupMessage "$TXT_FACTORYKEY"
 	States
 	{
@@ -465,8 +465,8 @@ ACTOR MineKey : StrifeKey 235
 {
 	Game Strife
 	ConversationID 158, 154, 157
-	Inventory.Icon "I_MINE"	// "New_Key4" in the Teaser
-	Tag "Mine_Key"
+	Inventory.Icon "I_MINE"
+	Tag "$TAG_MINEKEY"
 	Inventory.PickupMessage "$TXT_MINEKEY"
 	States
 	{
@@ -484,7 +484,7 @@ ACTOR NewKey5 : StrifeKey
 	Game Strife
 	ConversationID 159, 155, 158
 	Inventory.Icon "I_BLTK"
-	Tag "New Key5"
+	Tag "$TAG_NEWKEY5"
 	Inventory.PickupMessage "$TXT_NEWKEY5"
 	States
 	{
@@ -505,7 +505,7 @@ ACTOR OraclePass : Inventory
 	Inventory.Icon "I_OTOK"
 	Inventory.GiveQuest 18
 	Inventory.PickupMessage "$TXT_ORACLEPASS"
-	Tag "Oracle Pass"
+	Tag "$TAG_ORACLEPASS"
 	States
 	{
 	Spawn:

wadsrc/static/actors/strife/strifeweapons.txt

@@ -48,6 +48,8 @@ ACTOR PunchDagger : StrifeWeapon
 	Game Strife
 	Weapon.SelectionOrder 3900
 	+WEAPON.NOALERT
+	Obituary "$OB_MPPUNCHDAGGER"
+	Tag "$TAG_PUNCHDAGGER"
 	
 	action native A_JabDagger ();
 	
@@ -109,6 +111,7 @@ ACTOR ElectricBolt : StrifeZap1
 	SeeSound "misc/swish"
 	ActiveSound "misc/swish"
 	DeathSound "weapons/xbowhit"
+	Obituary "$OB_MPELECTRICBOLT"
 	States
 	{
 	Spawn:
@@ -132,6 +135,7 @@ ACTOR PoisonBolt native
 	MaxStepHeight 4
 	SeeSound "misc/swish"
 	ActiveSound "misc/swish"
+	Obituary "$OB_MPPOISONBOLT"
 	States
 	{
 	Spawn:
@@ -158,8 +162,8 @@ ACTOR StrifeCrossbow : StrifeWeapon 2001
 	Weapon.AmmoType1 "ElectricBolts"
 	Weapon.SisterWeapon "StrifeCrossbow2"
 	Inventory.PickupMessage "$TXT_STRIFECROSSBOW"
+	Tag "$TAG_STRIFECROSSBOW1"
 	Inventory.Icon "CBOWA0"
-	Tag "Crossbow"
 	
 	action native A_ClearFlash ();
 	action native A_ShowElectricFlash ();
@@ -205,6 +209,7 @@ ACTOR StrifeCrossbow2 : StrifeCrossbow
 	Weapon.AmmoGive1 0
 	Weapon.AmmoType1 "PoisonBolts"
 	Weapon.SisterWeapon "StrifeCrossbow"
+	Tag "$TAG_STRIFECROSSBOW2"
 
 	States
 	{
@@ -243,8 +248,9 @@ actor AssaultGun : StrifeWeapon 2002
 	Weapon.AmmoGive1 20
 	Weapon.AmmoType1 "ClipOfBullets"
 	Inventory.Icon "RIFLA0"
-	Tag "Assault Gun"
+	Tag "$TAG_ASSAULTGUN"
 	Inventory.PickupMessage "$TXT_ASSAULTGUN"
+	Obituary "$OB_MPASSAULTGUN"
 	States
 	{
 	Spawn:
@@ -299,7 +305,7 @@ ACTOR MiniMissileLauncher : StrifeWeapon 2003
 	Weapon.AmmoGive1 8
 	Weapon.AmmoType1 "MiniMissiles"
 	Inventory.Icon "MMSLA0"
-	Tag "Mini Missile Launcher"
+	Tag "$TAG_MMLAUNCHER"
 	Inventory.PickupMessage "$TXT_MMLAUNCHER"
 
 	action native A_FireMiniMissile ();
@@ -376,6 +382,7 @@ ACTOR MiniMissile
 	MaxStepHeight 4
 	SeeSound "weapons/minimissile"
 	DeathSound "weapons/minimissilehit"
+	Obituary "$OB_MPMINIMISSILELAUNCHER"
 	States
 	{
 	Spawn:
@@ -407,7 +414,7 @@ ACTOR FlameThrower : StrifeWeapon 2005
 	Weapon.ReadySound "weapons/flameidle"
 	Weapon.AmmoType1 "EnergyPod"
 	Inventory.Icon "FLAMA0"
-	Tag "Flame Thrower"
+	Tag "$TAG_FLAMER"
 	Inventory.PickupMessage "$TXT_FLAMER"
 	
 	action native A_FireFlamer ();
@@ -451,6 +458,7 @@ ACTOR FlameMissile
 	MaxStepHeight 4
 	RenderStyle Add
 	SeeSound "weapons/flamethrower"
+	Obituary "$OB_MPFLAMETHROWER"
 
 	action native A_FlameDie ();
 
@@ -483,8 +491,9 @@ ACTOR Mauler : StrifeWeapon 2004
 	Weapon.AmmoType1 "EnergyPod"
 	Weapon.SisterWeapon "Mauler2"
 	Inventory.Icon "TRPDA0"
-	Tag "Mauler"
+	Tag "$TAG_MAULER1"
 	Inventory.PickupMessage "$TXT_MAULER"
+	Obituary "$OB_MPMAULER1"
 
 	action native A_FireMauler1 ();
 
@@ -525,6 +534,8 @@ ACTOR Mauler2 : Mauler
 	Weapon.AmmoGive1 0
 	Weapon.AmmoType1 "EnergyPod"
 	Weapon.SisterWeapon "Mauler"
+	Obituary "$OB_MPMAULER2"
+	Tag "$TAG_MAULER2"
 
 	action native A_FireMauler2Pre ();
 	action native A_FireMauler2 ();
@@ -586,6 +597,7 @@ ACTOR MaulerTorpedo
 	RenderStyle Add
 	SeeSound "weapons/mauler2fire"
 	DeathSound "weapons/mauler2hit"
+	Obituary "$OB_MPMAULER"
 
 	action native A_MaulerTorpedoWave ();
 
@@ -616,6 +628,7 @@ ACTOR MaulerTorpedoWave
 	+STRIFEDAMAGE
 	MaxStepHeight 4
 	RenderStyle Add
+	Obituary "$OB_MPMAULER"
 	States
 	{
 	Spawn:
@@ -650,6 +663,7 @@ ACTOR HEGrenade
 	BounceCount 2
 	SeeSound "weapons/hegrenadeshoot"
 	DeathSound "weapons/hegrenadebang"
+	Obituary "$OB_MPSTRIFEGRENADE"
 	States
 	{
 	Spawn:
@@ -687,6 +701,7 @@ ACTOR PhosphorousGrenade
 	BounceCount 2
 	SeeSound "weapons/phgrenadeshoot"
 	DeathSound "weapons/phgrenadebang"
+	Obituary "$OB_MPPHOSPHOROUSGRENADE"
 	States
 	{
 	Spawn:
@@ -710,6 +725,7 @@ ACTOR PhosphorousFire native
 	+NODAMAGETHRUST
 	+DONTSPLASH
 	RenderStyle Add
+	Obituary "$OB_MPPHOSPHOROUSGRENADE"
 
 	action native A_Burnarea ();
 	action native A_Burnination ();
@@ -748,7 +764,7 @@ ACTOR StrifeGrenadeLauncher : StrifeWeapon 154
 	Weapon.AmmoType1 "HEGrenadeRounds"
 	Weapon.SisterWeapon "StrifeGrenadeLauncher2"
 	Inventory.Icon "GRNDA0"
-	Tag "Grenade Launcher"
+	Tag "$TAG_GLAUNCHER1"
 	Inventory.PickupMessage "$TXT_GLAUNCHER"
 
 	action native A_FireGrenade (class<Actor> grenadetype, int angleofs, state flash);
@@ -794,6 +810,7 @@ ACTOR StrifeGrenadeLauncher2 : StrifeGrenadeLauncher
 	Weapon.AmmoGive1 0
 	Weapon.AmmoType1 "PhosphorusGrenadeRounds"
 	Weapon.SisterWeapon "StrifeGrenadeLauncher"
+	Tag "$TAG_GLAUNCHER2"
 
 	States
 	{

wadsrc/static/actors/strife/templar.txt

@@ -20,7 +20,7 @@ ACTOR Templar 3003
 	DeathSound "templar/death"
 	ActiveSound "templar/active"
 	CrushPainSound "misc/pcrush"
-	Tag "TEMPLAR"
+	Tag "$TAG_TEMPLAR"
 	HitObituary "$OB_TEMPLARHIT"
 	Obituary "$OB_TEMPLAR"
 	DropItem "EnergyPod"

wadsrc/static/language.enu

@@ -727,6 +727,50 @@ OB_MPTELEFRAG = "%o was telefragged by %k.";
 OB_RAILGUN = "%o was railed by %k.";
 OB_MPBFG_MBF = "%o was burned by %k's BFG.";
 
+OB_MPSTAFF = "%o got staffed by %k.";
+OB_MPGAUNTLETS = "%o got a shock from %k's gauntlets.";
+OB_MPGOLDWAND = "%o waved goodbye to %k's elven wand.";
+OB_MPCROSSBOW = "%o was pegged by %k's ethereal crossbow.";
+OB_MPBLASTER = "%o was blasted a new one by %k's dragon claw.";
+OB_MPSKULLROD = "%o got sent down under by %k's hellstaff.";
+OB_MPPHOENIXROD = "%o was scorched to cinders by %k's phoenix rod.";
+OB_MPMACE = "%o was bounced by $k's firemace.";
+
+OB_MPPSTAFF = "%o got clapped by %k's charged staff.";
+OB_MPPGAUNTLETS = "%o was bled dry by %k's gauntlets.";
+OB_MPPGOLDWAND = "%o was assaulted by %k's elven wand.";
+OB_MPPCROSSBOW = "%o was shafted by %k's ethereal crossbow.";
+OB_MPPBLASTER = "%o was ripped apart by %k's dragon claw.";
+OB_MPPSKULLROD = "%k poured his hellstaff on %o.";
+OB_MPPPHOENIXROD = "%o was burned down by %k's phoenix staff.";
+OB_MPPMACE = "%o was squished by %k's giant mace sphere.";
+
+OB_MPFWEAPFIST = "%o was beaten to a pulp by %k's bare fists."; 
+OB_MPFWEAPAXE = "%o got the axe from %k."; 
+OB_MPFWEAPHAMMERM = "%o had %p head caved in by %k's hammer."; 
+OB_MPFWEAPHAMMERR = "%o's soul was forged anew by %k's hammer."; 
+OB_MPFWEAPQUIETUS = "%o was silenced by %k's mighty Quietus."; 
+OB_MPCWEAPMACE = "%o got a mace to the face from %k."; 
+OB_MPCWEAPSTAFFM = "%o was bitten by %k's serpent staff."; 
+OB_MPCWEAPSTAFFR = "%o choked on %k's serpent staff."; 
+OB_MPCWEAPFLAME = "%o was lit up by %k's flames."; 
+OB_MPCWEAPWRAITHVERGE = "%o was cleansed by %k's Wraithverge."; 
+OB_MPMWEAPWAND = "%o took one too many sapphire beams from %k."; 
+OB_MPMWEAPFROST = "%o was turned into a frosty fellow by %k."; 
+OB_MPMWEAPLIGHTNING = "%o recieved a shocking revelation from %k."; 
+OB_MPMWEAPBLOODSCOURGE = "%o was wiped off the face of the universe by %k's Bloodscourge.";
+
+OB_MPPUNCHDAGGER = "%o was unwittingly backstabbed by %k."; 
+OB_MPELECTRICBOLT = "%o got bolted to the wall by %k."; 
+OB_MPPOISONBOLT = "%o recieved a lethal dose of %k's wrath."; 
+OB_MPASSAULTGUN = "%o was drilled full of holes by %k's assault gun."; 
+OB_MPMINIMISSILELAUNCHER = "%o gulped down %k's missile."; 
+OB_MPSTRIFEGRENADE = "%o was inverted by %k's H-E grenade."; 
+OB_MPPHOSPHOROUSGRENADE = "%o took a flame bath in %k's phosphorous pyre."; 
+OB_MPFLAMETHROWER = "%o was barbecued by %k."; 
+OB_MPMAULER = "%o was viciously vaporized by %k."; 
+OB_MPSIGIL = "%o bowed down to the sheer power of %k's Sigil.";
+
 // Same as OB_MPTELEFRAG, but shown when a monster telefrags you
 OB_MONTELEFRAG = "%o was telefragged.";
 
@@ -743,6 +787,207 @@ STARTUP3 = "";
 STARTUP4 = "";
 STARTUP5 = "";
 
+
+// Item tags: Doom weapons
+TAG_FIST = "Brass Knuckles";
+TAG_CHAINSAW = "Chainsaw";
+TAG_PISTOL = "Pistol";
+TAG_SHOTGUN = "Shotgun";
+TAG_SUPERSHOTGUN = "Super Shotgun";
+TAG_CHAINGUN = "Chaingun";
+TAG_ROCKETLAUNCHER = "Rocket Launcher";
+TAG_PLASMARIFLE = "Plama Rifle";
+TAG_BFG9000 = "BFG 9000";
+
+// Item tags: Heretic weapons
+TAG_STAFF = "Staff";
+TAG_GAUNTLETS = "Gauntlets of the Necromancer";
+TAG_GOLDWAND = "Elven Wand";
+TAG_CROSSBOW = "Ethereal Crossbow";
+TAG_BLASTER = "Dragon Claw";
+TAG_SKULLROD = "Hellstaff";
+TAG_PHOENIXROD = "Phoenix Rod";
+TAG_MACE = "Firemace";
+
+// Item tags: Heretic artifacts
+TAG_ARTIEGG = "Morph Ovum";
+TAG_ARTIFIREBOMB = "Timebomb of the Ancients";
+TAG_ARTIFLY = "Wings of Wrath";
+TAG_ARTIHEALTH = "Quartz Flask";
+TAG_ARTIINVISIBILITY = "Shadowsphere";
+TAG_ARTIINVULNERABILITY = "Ring of Invincibility";
+TAG_ARTISUPERHEALTH = "Mystic Urn";
+TAG_ARTITELEPORT = "Chaos Device";
+TAG_ARTITOMEOFPOWER = "Tome of Power";
+TAG_ARTITORCH = "Torch";
+
+// Item tags: Hexen weapons
+TAG_CWEAPMACE = "Mace of Contrition";
+TAG_CWEAPSTAFF = "Serpent Staff";
+TAG_CWEAPFLAME = "Firestorm";
+TAG_CWEAPWRAITHVERGE = "Wraithverge";
+TAG_FWEAPFIST = "Spiked Gauntlets";
+TAG_FWEAPAXE = "Timon's Axe";
+TAG_FWEAPHAMMER = "Hammer of Retribution";
+TAG_FWEAPQUIETUS = "Quietus";
+TAG_MWEAPWAND = "Sapphire Wand";
+TAG_MWEAPFROST = "Frost Shards";
+TAG_MWEAPLIGHTNING = "Arcs of Death";
+TAG_MWEAPBLOODSCOURGE = "Bloodscourge";
+
+// Item tags: Hexen artifacts
+TAG_ARTIBLASTRADIUS = "Disc of Repulsion";
+TAG_ARTIBOOSTARMOR = "Dragonskin Bracers";
+TAG_ARTIBOOSTMANA = "Krater of Might";
+TAG_ARTIPOISONBAG = "Flechette";
+TAG_ARTIPOISONBAG1 = "Poison Cloud Flechette";
+TAG_ARTIPOISONBAG2 = "Timebomb Flechette";
+TAG_ARTIPOISONBAG3 = "Grenade Flechette";
+TAG_ARTIHEALINGRADIUS = "Mystic Ambit Incant";
+TAG_ARTIDEFENDER = "Icon of the Defender";
+TAG_ARTIPORK = "Porkelator";
+TAG_ARTISPEED = "Boots of Speed";
+TAG_ARTISUMMON = "Dark Servant";
+TAG_ARTITELEPORTOTHER = "Banishment Device";
+
+// Item tags: Hexen puzzle items
+TAG_ARTIPUZZSKULL = "Yorick's Skull";
+TAG_ARTIPUZZGEMBIG = "Heart of D'Sparil";
+TAG_ARTIPUZZGEMRED = "Ruby Planet";
+TAG_ARTIPUZZGEMGREEN1 = "Emerald Planet (1)";
+TAG_ARTIPUZZGEMGREEN2 = "Emerald Planet (2)";
+TAG_ARTIPUZZGEMBLUE1 = "Sapphire Planet (1)";
+TAG_ARTIPUZZGEMBLUE2 = "Sapphire Planet (2)";
+TAG_ARTIPUZZBOOK1 = "Daemon Codex";
+TAG_ARTIPUZZBOOK2 = "Liber Obscura";
+TAG_ARTIPUZZSKULL2 = "Flame Mask";
+TAG_ARTIPUZZFWEAPON = "Glaive Seal";
+TAG_ARTIPUZZCWEAPON = "Holy Relic";
+TAG_ARTIPUZZMWEAPON = "Sigil of the Magus";
+TAG_ARTIPUZZGEAR1 = "Iron gear";
+TAG_ARTIPUZZGEAR2 = "Brass gear";
+TAG_ARTIPUZZGEAR3 = "Brass and iron gear";
+TAG_ARTIPUZZGEAR4 = "Silver and brass gear";
+
+// Item tags: Strife weapons
+TAG_PUNCHDAGGER = "Dagger";
+TAG_STRIFECROSSBOW1 = "Crossbow";
+TAG_STRIFECROSSBOW2 = "Crossbow";
+TAG_ASSAULTGUN = "Assault Gun";
+TAG_MMLAUNCHER = "Mini Missile Launcher";
+TAG_FLAMER = "Flame Thrower";
+TAG_MAULER1 = "Mauler";
+TAG_MAULER2 = "Mauler";
+TAG_GLAUNCHER1 = "Grenade Launcher";
+TAG_GLAUNCHER2 = "Grenade Launcher";
+TAG_SIGIL = "SIGIL";
+
+// Item tags: Strife artifacts
+TAG_COIN = "coin";
+TAG_MEDPATCH = "Med patch";
+TAG_MEDICALKIT = "Medical kit";
+TAG_SURGERYKIT = "Surgery Kit";	// "full_health" in the Teaser
+TAG_BELDINSRING = "Ring";
+TAG_OFFERINGCHALICE = "Offering Chalice";
+TAG_EAR = "Ear";
+TAG_BROKENCOUPLING = "Broken Power Coupling";
+TAG_SHADOWARMOR = "Shadow Armor";
+TAG_ENVSUIT = "Environmental Suit";
+TAG_GUARDUNIFORM = "Guard Uniform";
+TAG_OFFICERSUNIFORM = "Officer's Uniform";
+TAG_FTHROWERPARTS = "Flame Thrower Parts";
+TAG_REPORT = "Report";
+TAG_INFO = "Info";
+TAG_TARGETER = "Targeter";
+TAG_COMMUNICATOR = "Communicator";
+TAG_DEGNINORE = "Degnin Ore";
+TAG_GUNTRAINING = "Accuracy";
+TAG_HEALTHTRAINING = "Toughness";
+TAG_SCANNER = "Scanner";
+TAG_PRISONPASS = "Prison Pass";
+TAG_ALARM = "Alarm";
+TAG_AMMOFILLUP = "Ammo";
+TAG_HEALTHFILLUP = "Health";
+TAG_TELEPORTERBEACON = "Teleporter Beacon";
+TAG_METALARMOR = "Metal Armor";
+TAG_LEATHER = "Leather Armor";
+TAG_HEGRENADES = "HE-Grenade Rounds";
+TAG_PHGRENADES = "Phoshorus-Grenade Rounds";	// "Fire-Grenade_Rounds" in the Teaser
+TAG_CLIPOFBULLETS = "Clip of Bullets";	// "bullets" in the Teaser
+TAG_BOXOFBULLETS = "Ammo";
+TAG_MINIMISSILES = "Mini Missiles";	//"rocket" in the Teaser
+TAG_CRATEOFMISSILES = "Crate of Missiles";	//"box_of_rockets" in the Teaser
+TAG_ENERGYPOD = "Energy Pod";
+TAG_ENERGYPACK = "Energy Pack";
+TAG_POISONBOLTS = "Poison Bolts";	// "poison_arrows" in the Teaser
+TAG_ELECTRICBOLTS = "Electric Bolts";	// "electric_arrows" in the Teaser
+TAG_AMMOSATCHEL = "Ammo Satchel";	// "Back_pack" in the Teaser
+
+// Item tags: Strife keys
+TAG_BASEKEY = "Base Key";
+TAG_GOVSKEY = "Govs Key";	// "Rebel_Key" in the Teaser
+TAG_PASSCARD = "Passcard";
+TAG_IDBADGE = "ID Badge";
+TAG_PRISONKEY = "Prison Key";
+TAG_SEVEREDHAND = "Severed Hand";
+TAG_POWER1KEY = "Power1 Key";
+TAG_POWER2KEY = "Power2 Key";
+TAG_POWER3KEY = "Power3 Key";
+TAG_GOLDKEY = "Gold Key";
+TAG_IDCARD = "ID Card";
+TAG_SILVERKEY = "Silver Key";
+TAG_ORACLEKEY = "Oracle Key";
+TAG_MILITARYID = "Military ID";
+TAG_ORDERKEY = "Order Key";
+TAG_WAREHOUSEKEY = "Warehouse Key";
+TAG_BRASSKEY = "Brass Key";
+TAG_REDCRYSTALKEY = "Red Crystal Key";
+TAG_BLUECRYSTALKEY = "Blue Crystal Key";
+TAG_CHAPELKEY = "Chapel Key";
+TAG_CATACOMBKEY = "Catacomb Key";	// "Tunnel_Key" in the Teaser
+TAG_SECURITYKEY = "Security Key";
+TAG_COREKEY = "Core Key";	// "New_Key1" in the Teaser
+TAG_MAULERKEY = "Mauler Key";	// "New_Key2" in the Teaser
+TAG_FACTORYKEY = "Factory Key";	// "New_Key3" in the Teaser
+TAG_MINEKEY = "Mine_Key";	// "New_Key4" in the Teaser
+TAG_NEWKEY5 = "New Key5";
+TAG_ORACLEPASS = "Oracle Pass";
+
+// Item tags: misc Strife stuff
+TAG_10GOLD = "10 gold";
+TAG_25GOLD = "25 gold";
+TAG_50GOLD = "50 gold";
+TAG_300GOLD = "300 gold";
+TAG_QUEST4 = "quest4";
+TAG_QUEST5 = "quest5";
+TAG_QUEST6 = "quest4";
+
+// Item tags: Strife NPCs
+TAG_ACOLYTE = "ACOLYTE";
+TAG_ARMORER = "Armorer";
+TAG_BARKEEP = "Bar Keep";
+TAG_BEGGAR = "Beggar";
+TAG_MACIL1 = "MACIL";
+TAG_MACIL2 = "MACIL";
+TAG_MEDIC = "Medic";
+TAG_ORACLE = "Oracle";
+TAG_PRIEST = "PRIEST";
+TAG_RATBUDDY = "rat buddy";
+TAG_REBEL = "Rebel";
+TAG_TEMPLAR = "TEMPLAR";
+TAG_WEAPONSMITH = "Weapon Smith";
+
+// Item tags: Chex weapons
+TAG_SPOON = "Spoon";
+TAG_SPORK = "Super Bootspork";
+TAG_MINIZORCHER = "Mini Zorcher";
+TAG_LARGEZORCHER = "Large Zorcher";
+TAG_SUPERLARGEZORCHER = "Super-Large Zorcher";
+TAG_RAPIDZORCHER = "Rapid Zorcher";
+TAG_ZORCHPROPULSOR = "Zorch Propulsor";
+TAG_PHASINGZORCHER = "Phasing Zorcher";
+TAG_LAZDEVICE = "LAZ Device";
+
 // Heretic strings
 HE1TEXT =
 		"with the destruction of the iron\n"