diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 16be90bf6..ad65d572c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -748,6 +748,7 @@ set( NOT_COMPILED_SOURCE_FILES
 	g_hexen/a_fighterquietus.cpp
 	g_hexen/a_firedemon.cpp
 	g_hexen/a_flechette.cpp
+	g_hexen/a_flies.cpp
 	g_hexen/a_fog.cpp
 	g_hexen/a_healingradius.cpp
 	g_hexen/a_heresiarch.cpp
@@ -843,6 +844,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE
 	f_wipe.cpp
 	farchive.cpp
 	files.cpp
+	g_doomedmap.cpp
 	g_game.cpp
 	g_hub.cpp
 	g_level.cpp
diff --git a/src/actor.h b/src/actor.h
index 30809b5fb..6c07c99dc 100644
--- a/src/actor.h
+++ b/src/actor.h
@@ -1005,7 +1005,7 @@ public:
 	virtual bool UpdateWaterLevel (fixed_t oldz, bool splash=true);
 	bool isFast();
 	bool isSlow();
-	void SetIdle();
+	void SetIdle(bool nofunction=false);
 	void ClearCounters();
 	FState *GetRaiseState();
 	void Revive();
diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index 39dbd2e5f..aa6af4b43 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -639,6 +639,23 @@ CCMD (error_fatal)
 	}
 }
 
+//==========================================================================
+//
+// CCMD crashout
+//
+// Debugging routine for testing the crash logger.
+// Useless in a win32 debug build, because that doesn't enable the crash logger.
+//
+//==========================================================================
+
+#if !defined(_WIN32) || !defined(_DEBUG)
+CCMD (crashout)
+{
+	*(volatile int *)0 = 0;
+}
+#endif
+
+
 CCMD (dir)
 {
 	FString dir, path;
diff --git a/src/cmdlib.cpp b/src/cmdlib.cpp
index 557c80cf8..b3c406ee0 100644
--- a/src/cmdlib.cpp
+++ b/src/cmdlib.cpp
@@ -957,7 +957,7 @@ void ScanDirectory(TArray<FFileList> &list, const char *dirpath)
 	}
 }
 
-#elif defined(__sun) || defined(linux)
+#elif defined(__sun) || defined(__linux__)
 
 //==========================================================================
 //
diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp
index 393ca11cc..4bb53e3fe 100644
--- a/src/d_iwad.cpp
+++ b/src/d_iwad.cpp
@@ -47,6 +47,7 @@
 #include "v_video.h"
 #include "gameconfigfile.h"
 #include "resourcefiles/resourcefile.h"
+#include "version.h"
 
 
 CVAR (Bool, queryiwad, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
@@ -504,19 +505,19 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
 	if (numwads == 0)
 	{
 		I_FatalError ("Cannot find a game IWAD (doom.wad, doom2.wad, heretic.wad, etc.).\n"
-					  "Did you install ZDoom properly? You can do either of the following:\n"
+					  "Did you install " GAMENAME " properly? You can do either of the following:\n"
 					  "\n"
 #if defined(_WIN32)
-					  "1. Place one or more of these wads in the same directory as ZDoom.\n"
-					  "2. Edit your zdoom-username.ini and add the directories of your iwads\n"
+					  "1. Place one or more of these wads in the same directory as " GAMENAME ".\n"
+					  "2. Edit your " GAMENAMELOWERCASE "-username.ini and add the directories of your iwads\n"
 					  "to the list beneath [IWADSearch.Directories]");
 #elif defined(__APPLE__)
-					  "1. Place one or more of these wads in ~/Library/Application Support/zdoom/\n"
-					  "2. Edit your ~/Library/Preferences/zdoom.ini and add the directories\n"
+					  "1. Place one or more of these wads in ~/Library/Application Support/" GAMENAMELOWERCASE "/\n"
+					  "2. Edit your ~/Library/Preferences/" GAMENAMELOWERCASE ".ini and add the directories\n"
 					  "of your iwads to the list beneath [IWADSearch.Directories]");
 #else
-					  "1. Place one or more of these wads in ~/.config/zdoom/.\n"
-					  "2. Edit your ~/.config/zdoom/zdoom.ini and add the directories of your\n"
+					  "1. Place one or more of these wads in ~/.config/" GAMENAMELOWERCASE "/.\n"
+					  "2. Edit your ~/.config/" GAMENAMELOWERCASE "/" GAMENAMELOWERCASE ".ini and add the directories of your\n"
 					  "iwads to the list beneath [IWADSearch.Directories]");
 #endif
 	}
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 648df0f04..e7fe3a696 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2441,8 +2441,8 @@ void D_DoomMain (void)
 		// Create replacements for dehacked pickups
 		FinishDehPatch();
 
+		InitActorNumsFromMapinfo();
 		PClassActor::StaticSetActorNums ();
-
 		//Added by MC:
 		bglobal.getspawned.Clear();
 		argcount = Args->CheckParmList("-bots", &args);
diff --git a/src/doomdata.h b/src/doomdata.h
index f190be37d..1dcd8e6b4 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -429,10 +429,10 @@ struct FPlayerStart
 	short angle, type;
 
 	FPlayerStart() { }
-	FPlayerStart(const FMapThing *mthing)
+	FPlayerStart(const FMapThing *mthing, int pnum)
 	: x(mthing->x), y(mthing->y), z(mthing->z),
 	  angle(mthing->angle),
-	  type(mthing->type)
+	  type(pnum)
 	{ }
 };
 // Player spawn spots for deathmatch.
diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp
index f83528bb3..57e436137 100644
--- a/src/fragglescript/t_func.cpp
+++ b/src/fragglescript/t_func.cpp
@@ -1420,7 +1420,7 @@ void FParser::SF_PointToDist(void)
 		double y = floatvalue(t_argv[3]) - floatvalue(t_argv[1]);
    
 		t_return.type = svt_fixed;
-		t_return.value.f = FLOAT2FIXED(sqrt(x*x+y*y)*65536.f);
+		t_return.value.f = FLOAT2FIXED(sqrt(x*x+y*y));
 	}
 }
 
diff --git a/src/g_doomedmap.cpp b/src/g_doomedmap.cpp
new file mode 100644
index 000000000..6f847f508
--- /dev/null
+++ b/src/g_doomedmap.cpp
@@ -0,0 +1,264 @@
+/*
+** g_doomedmap.cpp
+**
+**---------------------------------------------------------------------------
+** Copyright 1998-2015 Randy Heit
+** Copyright 2015 Christoph Oelckers
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**---------------------------------------------------------------------------
+**
+**
+*/
+
+#include "info.h"
+#include "p_lnspec.h"
+#include "m_fixed.h"
+#include "c_dispatch.h"
+#include "templates.h"
+#include "cmdlib.h"
+#include "g_level.h"
+#include "v_text.h"
+#include "i_system.h"
+
+
+const char *SpecialMapthingNames[] = {
+	"$PLAYER1START",
+	"$PLAYER2START",
+	"$PLAYER3START",
+	"$PLAYER4START",
+	"$PLAYER5START",
+	"$PLAYER6START",
+	"$PLAYER7START",
+	"$PLAYER8START",
+	"$DEATHMATCHSTART",
+	"$SSEQOVERRIDE",
+	"$POLYANCHOR",
+	"$POLYSPAWN",
+	"$POLYSPAWNCRUSH",
+	"$POLYSPAWNHURT"
+};
+//==========================================================================
+//
+// Stuff that's only valid during definition time
+//
+//==========================================================================
+
+struct MapinfoEdMapItem
+{
+	FName classname;	// DECORATE is read after MAPINFO so we do not have the actual classes available here yet.
+	int special;
+	int args[5];
+	// These are for error reporting. We must store the file information because it's no longer available when these items get resolved.
+	FString filename;
+	int linenum;
+};
+
+typedef TMap<int, MapinfoEdMapItem> IdMap;
+
+static IdMap DoomEdFromMapinfo;
+
+//==========================================================================
+//
+//
+//==========================================================================
+
+FDoomEdMap DoomEdMap;
+
+static int STACK_ARGS sortnums (const void *a, const void *b)
+{
+	return (*(const FDoomEdMap::Pair**)a)->Key - (*(const FDoomEdMap::Pair**)b)->Key;
+}
+
+CCMD (dumpmapthings)
+{
+	TArray<FDoomEdMap::Pair*> infos(DoomEdMap.CountUsed());
+	FDoomEdMap::Iterator it(DoomEdMap);
+	FDoomEdMap::Pair *pair;
+
+	while (it.NextPair(pair))
+	{
+		infos.Push(pair);
+	}
+
+	if (infos.Size () == 0)
+	{
+		Printf ("No map things registered\n");
+	}
+	else
+	{
+		qsort (&infos[0], infos.Size (), sizeof(FDoomEdMap::Pair*), sortnums);
+
+		for (unsigned i = 0; i < infos.Size (); ++i)
+		{
+			if (infos[i]->Value.Type != NULL)
+			{
+				Printf("%6d %s\n", infos[i]->Key, infos[i]->Value.Type->TypeName.GetChars());
+			}
+			else if (infos[i]->Value.Special > 0)
+			{
+				Printf("%6d %s\n", infos[i]->Key, SpecialMapthingNames[infos[i]->Value.Special - 1]);
+			}
+			else
+			{
+				Printf("%6d none", infos[i]->Key);
+			}
+
+		}
+	}
+}
+
+
+void FMapInfoParser::ParseDoomEdNums()
+{
+	TMap<int, bool> defined;
+	int error = 0;
+
+	MapinfoEdMapItem editem;
+
+	editem.filename = sc.ScriptName;
+
+	ParseOpenBrace();
+	while (true)
+	{
+		if (sc.CheckString("}")) return;
+		else if (sc.CheckNumber())
+		{
+			int ednum = sc.Number;
+			sc.MustGetStringName("=");
+			sc.MustGetString();
+
+			bool *def = defined.CheckKey(ednum);
+			if (def != NULL)
+			{
+				sc.ScriptMessage("Editor Number %d defined more than once", ednum);
+				error++;
+			}
+			defined[ednum] = true;
+			if (sc.String[0] == '$')
+			{
+				// todo: add special stuff like playerstarts and sound sequence overrides here, too.
+				editem.classname = NAME_None;
+				editem.special = sc.MustMatchString(SpecialMapthingNames) + 1; // todo: assign proper constants
+			}
+			else
+			{
+				editem.classname = sc.String;
+				editem.special = -1;
+			}
+			memset(editem.args, 0, sizeof(editem.args));
+
+			int minargs = 0;
+			int maxargs = 5;
+			FString specialname;
+			if (sc.CheckString(","))
+			{
+				// todo: parse a special or args
+				if (editem.special < 0) editem.special = 0;	// mark args as used - if this is done we need to prevent assignment of map args in P_SpawnMapThing.
+				if (!sc.CheckNumber())
+				{
+					sc.MustGetString();
+					specialname = sc.String;	// save for later error reporting.
+					editem.special = P_FindLineSpecial(sc.String, &minargs, &maxargs);
+					if (editem.special == 0 || minargs == -1)
+					{
+						sc.ScriptMessage("Invalid special %s for Editor Number %d", sc.String, ednum);
+						error++;
+						minargs = 0;
+						maxargs = 5;
+					}
+					if (!sc.CheckString(","))
+					{
+						// special case: Special without arguments
+						if (minargs != 0)
+						{
+							sc.ScriptMessage("Incorrect number of args for special %s, min = %d, max = %d, found = 0", specialname.GetChars(), minargs, maxargs);
+							error++;
+						}
+						DoomEdFromMapinfo.Insert(ednum, editem);
+						continue;
+					}
+					sc.MustGetStringName(",");
+					sc.MustGetNumber();
+				}
+				int i = 0;
+				while (i < 5)
+				{
+					editem.args[i++] = sc.Number;
+					i++;
+					if (!sc.CheckString(",")) break;
+					sc.MustGetNumber();
+				}
+				if (specialname.IsNotEmpty() && (i < minargs || i > maxargs))
+				{
+					sc.ScriptMessage("Incorrect number of args for special %s, min = %d, max = %d, found = %d", specialname.GetChars(), minargs, maxargs, i);
+					error++;
+				}
+			}
+			DoomEdFromMapinfo.Insert(ednum, editem);
+		}
+		else
+		{
+			sc.ScriptError("Number expected");
+		}
+	}
+	if (error > 0)
+	{
+		sc.ScriptError("%d errors encountered in DoomEdNum definition");
+	}
+}
+
+void InitActorNumsFromMapinfo()
+{
+	DoomEdMap.Clear();
+	IdMap::Iterator it(DoomEdFromMapinfo);
+	IdMap::Pair *pair;
+	int error = 0;
+
+	while (it.NextPair(pair))
+	{
+		PClassActor *cls = NULL;
+		if (pair->Value.classname != NAME_None)
+		{
+			cls = PClass::FindActor(pair->Value.classname);
+			if (cls == NULL)
+			{
+				Printf(TEXTCOLOR_RED "Script error, \"%s\" line %d:\nUnknown actor class %s\n",
+					pair->Value.filename.GetChars(), pair->Value.linenum, pair->Value.classname.GetChars());
+				error++;
+			}
+		}
+		FDoomEdEntry ent;
+		ent.Type = cls;
+		ent.Special = pair->Value.special;
+		memcpy(ent.Args, pair->Value.args, sizeof(ent.Args));
+		DoomEdMap.Insert(pair->Key, ent);
+	}
+	if (error > 0)
+	{
+		I_Error("%d unknown actor classes found", error);
+	}
+	DoomEdFromMapinfo.Clear();	// we do not need this any longer
+}
diff --git a/src/g_hexen/a_flies.cpp b/src/g_hexen/a_flies.cpp
new file mode 100644
index 000000000..c7437235b
--- /dev/null
+++ b/src/g_hexen/a_flies.cpp
@@ -0,0 +1,112 @@
+static FRandom pr_fly("GetOffMeFly");
+
+//===========================================================================
+//
+// FindCorpse
+//
+// Finds a corpse to buzz around. We can't use a blockmap check because
+// corpses generally aren't linked into the blockmap.
+//
+//===========================================================================
+
+static AActor *FindCorpse(AActor *fly, sector_t *sec, int recurselimit)
+{
+	AActor *fallback = NULL;
+	sec->validcount = validcount;
+
+	// Search the current sector
+	for (AActor *check = sec->thinglist; check != NULL; check = check->snext)
+	{
+		if (check == fly)
+			continue;
+		if (!(check->flags & MF_CORPSE))
+			continue;
+		if (!P_CheckSight(fly, check))
+			continue;
+		fallback = check;
+		if (pr_fly(2))	// 50% chance to try to pick a different corpse
+			continue;
+		return check;
+	}
+	if (--recurselimit <= 0 || (fallback != NULL && pr_fly(2)))
+	{
+		return fallback;
+	}
+	// Try neighboring sectors
+	for (int i = 0; i < sec->linecount; ++i)
+	{
+		line_t *line = sec->lines[i];
+		sector_t *sec2 = (line->frontsector == sec) ? line->backsector : line->frontsector;
+		if (sec2 != NULL && sec2->validcount != validcount)
+		{
+			AActor *neighbor = FindCorpse(fly, sec2, recurselimit);
+			if (neighbor != NULL)
+			{
+				return neighbor;
+			}
+		}
+	}
+	return fallback;
+}
+
+DEFINE_ACTION_FUNCTION(AActor, A_FlySearch)
+{
+	// The version from the retail beta is not so great for general use:
+	// 1. Pick one of the first fifty thinkers at random.
+	// 2. Starting from that thinker, find one that is an actor, not itself,
+	//    and within sight. Give up after 100 sequential thinkers.
+	// It's effectively useless if there are more than 150 thinkers on a map.
+	//
+	// So search the sectors instead. We can't potentially find something all
+	// the way on the other side of the map and we can't find invisible corpses,
+	// but at least we aren't crippled on maps with lots of stuff going on.
+	PARAM_ACTION_PROLOGUE;
+
+	validcount++;
+	AActor *other = FindCorpse(self, self->Sector, 5);
+	if (other != NULL)
+	{
+		self->target = other;
+		self->SetState(self->FindState("Buzz"));
+	}
+	return 0;
+}
+
+DEFINE_ACTION_FUNCTION(AActor, A_FlyBuzz)
+{
+	PARAM_ACTION_PROLOGUE;
+
+	AActor *targ = self->target;
+
+	if (targ == NULL || !(targ->flags & MF_CORPSE) || pr_fly() < 5)
+	{
+		self->SetIdle();
+		return 0;
+	}
+
+	angle_t ang = R_PointToAngle2(self->x, self->y, targ->x, targ->y);
+	self->angle = ang;
+	self->args[0]++;
+	ang >>= ANGLETOFINESHIFT;
+	if (!P_TryMove(self, self->x + 6 * finecosine[ang], self->y + 6 * finesine[ang], true))
+	{
+		self->SetIdle(true);
+		return 0;
+	}
+	if (self->args[0] & 2)
+	{
+		self->velx += (pr_fly() - 128) << BOBTOFINESHIFT;
+		self->vely += (pr_fly() - 128) << BOBTOFINESHIFT;
+	}
+	int zrand = pr_fly();
+	if (targ->z + 5*FRACUNIT < self->z && zrand > 150)
+	{
+		zrand = -zrand;
+	}
+	self->velz = zrand << BOBTOFINESHIFT;
+	if (pr_fly() < 40)
+	{
+		S_Sound(self, CHAN_VOICE, self->ActiveSound, 0.5f, ATTN_STATIC);
+	}
+	return 0;
+}
diff --git a/src/g_hexen/a_hexenmisc.cpp b/src/g_hexen/a_hexenmisc.cpp
index fa07a6759..1141f381f 100644
--- a/src/g_hexen/a_hexenmisc.cpp
+++ b/src/g_hexen/a_hexenmisc.cpp
@@ -38,6 +38,7 @@
 #include "a_fighterquietus.cpp"
 #include "a_firedemon.cpp"
 #include "a_flechette.cpp"
+#include "a_flies.cpp"
 #include "a_fog.cpp"
 #include "a_healingradius.cpp"
 #include "a_heresiarch.cpp"
diff --git a/src/g_level.h b/src/g_level.h
index d1b22d232..0da168f30 100644
--- a/src/g_level.h
+++ b/src/g_level.h
@@ -102,6 +102,7 @@ struct FMapInfoParser
 
 	void ParseIntermissionAction(FIntermissionDescriptor *Desc);
 	void ParseIntermission();
+	void ParseDoomEdNums();
 	void ParseAMColors(bool);
 	FName CheckEndSequence();
 	FName ParseEndGame();
diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp
index c034836c8..28afafad2 100644
--- a/src/g_mapinfo.cpp
+++ b/src/g_mapinfo.cpp
@@ -1876,6 +1876,18 @@ void FMapInfoParser::ParseMapInfo (int lump, level_info_t &gamedefaults, level_i
 				sc.ScriptError("intermission definitions not supported with old MAPINFO syntax");
 			}
 		}
+		else if (sc.Compare("doomednums"))
+		{
+			if (format_type != FMT_Old)
+			{
+				format_type = FMT_New;
+				ParseDoomEdNums();
+			}
+			else
+			{
+				sc.ScriptError("doomednums definitions not supported with old MAPINFO syntax");
+			}
+		}
 		else if (sc.Compare("automap") || sc.Compare("automap_overlay"))
 		{
 			if (format_type != FMT_Old)
diff --git a/src/gi.cpp b/src/gi.cpp
index b0edf2a04..ac3818870 100644
--- a/src/gi.cpp
+++ b/src/gi.cpp
@@ -335,7 +335,6 @@ void FMapInfoParser::ParseGameInfo()
 		GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime")
 		GAMEINFOKEY_INT(defaultdropstyle, "defaultdropstyle")
 		GAMEINFOKEY_STRING(Endoom, "endoom")
-		GAMEINFOKEY_INT(player5start, "player5start")
 		GAMEINFOKEY_STRINGARRAY(quitmessages, "addquitmessages", 0, false)
 		GAMEINFOKEY_STRINGARRAY(quitmessages, "quitmessages", 0, true)
 		GAMEINFOKEY_STRING(mTitleColor, "menufontcolor_title")
diff --git a/src/gi.h b/src/gi.h
index d8d19a14b..490981f77 100644
--- a/src/gi.h
+++ b/src/gi.h
@@ -153,7 +153,6 @@ struct gameinfo_t
 	int definventorymaxamount;
 	int defaultrespawntime;
 	int defaultdropstyle;
-	int player5start;
 	DWORD pickupcolor;
 	TArray<FString> quitmessages;
 	FName mTitleColor;
diff --git a/src/info.cpp b/src/info.cpp
index a02e5a3ec..60b2fe4ff 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -169,7 +169,6 @@ void PClassActor::StaticInit()
 void PClassActor::StaticSetActorNums()
 {
 	SpawnableThings.Clear();
-	DoomEdMap.Empty();
 
 	for (unsigned int i = 0; i < PClassActor::AllActorClasses.Size(); ++i)
 	{
@@ -369,22 +368,22 @@ void PClassActor::RegisterIDs()
 		}
 		if (DoomEdNum != -1)
 		{
-			DoomEdMap.AddType(DoomEdNum, cls);
+			FDoomEdEntry *oldent = DoomEdMap.CheckKey(DoomEdNum);
+			if (oldent != NULL && oldent->Special == -2)
+			{
+				Printf(TEXTCOLOR_RED"Editor number %d defined twice for classes '%s' and '%s'\n", DoomEdNum, cls->TypeName.GetChars(), oldent->Type->TypeName.GetChars());
+			}
+			FDoomEdEntry ent;
+			memset(&ent, 0, sizeof(ent));
+			ent.Type = cls;
+			ent.Special = -2;	// use -2 instead of -1 so that we can recognize DECORATE defined entries and print a warning message if duplicates occur.
+			DoomEdMap.Insert(DoomEdNum, ent);
 			if (cls != this) 
 			{
 				Printf(TEXTCOLOR_RED"Editor number %d refers to hidden class type '%s'\n", DoomEdNum, cls->TypeName.GetChars());
 			}
 		}
 	}
-	// Fill out the list for Chex Quest with Doom's actors
-	if (gameinfo.gametype == GAME_Chex && DoomEdMap.FindType(DoomEdNum) == NULL && (GameFilter & GAME_Doom))
-	{
-		DoomEdMap.AddType(DoomEdNum, this, true);
-		if (cls != this) 
-		{
-			Printf(TEXTCOLOR_RED"Editor number %d refers to hidden class type '%s'\n", DoomEdNum, cls->TypeName.GetChars());
-		}
-	}
 }
 
 //==========================================================================
@@ -535,139 +534,6 @@ fixed_t *DmgFactors::CheckFactor(FName type)
 	return pdf;
 }
 
-//==========================================================================
-//
-//
-//==========================================================================
-
-FDoomEdMap DoomEdMap;
-
-FDoomEdMap::FDoomEdEntry *FDoomEdMap::DoomEdHash[DOOMED_HASHSIZE];
-
-FDoomEdMap::~FDoomEdMap()
-{
-	Empty();
-}
-
-void FDoomEdMap::AddType (int doomednum, PClassActor *type, bool temporary)
-{
-	unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE;
-	FDoomEdEntry *entry = DoomEdHash[hash];
-	while (entry && entry->DoomEdNum != doomednum)
-	{
-		entry = entry->HashNext;
-	}
-	if (entry == NULL)
-	{
-		entry = new FDoomEdEntry;
-		entry->HashNext = DoomEdHash[hash];
-		entry->DoomEdNum = doomednum;
-		DoomEdHash[hash] = entry;
-	}
-	else if (!entry->temp)
-	{
-		Printf (PRINT_BOLD, "Warning: %s and %s both have doomednum %d.\n",
-			type->TypeName.GetChars(), entry->Type->TypeName.GetChars(), doomednum);
-	}
-	entry->temp = temporary;
-	entry->Type = type;
-}
-
-void FDoomEdMap::DelType (int doomednum)
-{
-	unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE;
-	FDoomEdEntry **prev = &DoomEdHash[hash];
-	FDoomEdEntry *entry = *prev;
-	while (entry && entry->DoomEdNum != doomednum)
-	{
-		prev = &entry->HashNext;
-		entry = entry->HashNext;
-	}
-	if (entry != NULL)
-	{
-		*prev = entry->HashNext;
-		delete entry;
-	}
-}
-
-void FDoomEdMap::Empty ()
-{
-	int bucket;
-
-	for (bucket = 0; bucket < DOOMED_HASHSIZE; ++bucket)
-	{
-		FDoomEdEntry *probe = DoomEdHash[bucket];
-
-		while (probe != NULL)
-		{
-			FDoomEdEntry *next = probe->HashNext;
-			delete probe;
-			probe = next;
-		}
-		DoomEdHash[bucket] = NULL;
-	}
-}
-
-PClassActor *FDoomEdMap::FindType (int doomednum) const
-{
-	unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE;
-	FDoomEdEntry *entry = DoomEdHash[hash];
-	while (entry && entry->DoomEdNum != doomednum)
-		entry = entry->HashNext;
-	return entry ? entry->Type : NULL;
-}
-
-struct EdSorting
-{
-	PClassActor *Type;
-	int DoomEdNum;
-};
-
-static int STACK_ARGS sortnums (const void *a, const void *b)
-{
-	return ((const EdSorting *)a)->DoomEdNum -
-		((const EdSorting *)b)->DoomEdNum;
-}
-
-void FDoomEdMap::DumpMapThings ()
-{
-	TArray<EdSorting> infos (PClassActor::AllActorClasses.Size());
-	int i;
-
-	for (i = 0; i < DOOMED_HASHSIZE; ++i)
-	{
-		FDoomEdEntry *probe = DoomEdHash[i];
-
-		while (probe != NULL)
-		{
-			EdSorting sorting = { probe->Type, probe->DoomEdNum };
-			infos.Push (sorting);
-			probe = probe->HashNext;
-		}
-	}
-
-	if (infos.Size () == 0)
-	{
-		Printf ("No map things registered\n");
-	}
-	else
-	{
-		qsort (&infos[0], infos.Size (), sizeof(EdSorting), sortnums);
-
-		for (i = 0; i < (int)infos.Size (); ++i)
-		{
-			Printf ("%6d %s\n",
-				infos[i].DoomEdNum, infos[i].Type->TypeName.GetChars());
-		}
-	}
-}
-
-CCMD (dumpmapthings)
-{
-	FDoomEdMap::DumpMapThings ();
-}
-
-
 static void SummonActor (int command, int command2, FCommandLine argv)
 {
 	if (CheckCheatmode ())
diff --git a/src/info.h b/src/info.h
index c211b936b..ff30b7a63 100644
--- a/src/info.h
+++ b/src/info.h
@@ -275,34 +275,39 @@ inline PClassActor *PClass::FindActor(FName name)
 	 return dyn_cast<PClassActor>(FindClass(name));
 }
 
-class FDoomEdMap
+struct FDoomEdEntry
 {
-public:
-	~FDoomEdMap();
-
-	PClassActor *FindType (int doomednum) const;
-	void AddType (int doomednum, PClassActor *type, bool temporary = false);
-	void DelType (int doomednum);
-	void Empty ();
-
-	static void DumpMapThings ();
-
-private:
-	enum { DOOMED_HASHSIZE = 256 };
-
-	struct FDoomEdEntry
-	{
-		FDoomEdEntry *HashNext;
-		PClassActor *Type;
-		int DoomEdNum;
-		bool temp;
-	};
-
-	static FDoomEdEntry *DoomEdHash[DOOMED_HASHSIZE];
+	PClassActor *Type;
+	int Special;
+	int Args[5];
 };
 
+enum ESpecialMapthings
+{
+	SMT_PLAYER1START = 1,
+	SMT_PLAYER2START,
+	SMT_PLAYER3START,
+	SMT_PLAYER4START,
+	SMT_PLAYER5START,
+	SMT_PLAYER6START,
+	SMT_PLAYER7START,
+	SMT_PLAYER8START,
+	SMT_DEATHMATCHSTART,
+	SMT_SSEQOVERRIDE,
+	SMT_POLYANCHOR,
+	SMT_POLYSPAWN,
+	SMT_POLYSPAWNCRUSH,
+	SMT_POLYSPAWNHURT,
+};
+
+
+typedef TMap<int, FDoomEdEntry> FDoomEdMap;
+
 extern FDoomEdMap DoomEdMap;
 
+void InitActorNumsFromMapinfo();
+
+
 int GetSpriteIndex(const char * spritename, bool add = true);
 TArray<FName> &MakeStateNameList(const char * fname);
 void AddStateLight(FState *state, const char *lname);
diff --git a/src/m_specialpaths.cpp b/src/m_specialpaths.cpp
index e6f74eda6..a45c23dc7 100644
--- a/src/m_specialpaths.cpp
+++ b/src/m_specialpaths.cpp
@@ -204,7 +204,7 @@ FString M_GetConfigPath(bool for_reading)
 	{
 		path += "/" GAME_DIR;
 		CreatePath(path);
-		path += "/zdoom.ini";
+		path += "/" GAMENAMELOWERCASE ".ini";
 	}
 	else
 	{ // construct "$PROGDIR/zdoom-$USER.ini"
@@ -224,11 +224,11 @@ FString M_GetConfigPath(bool for_reading)
 					*probe = '_';
 				++probe;
 			}
-			path << "zdoom-" << uname << ".ini";
+			path << GAMENAMELOWERCASE "-" << uname << ".ini";
 		}
 		else
 		{ // Couldn't get user name, so just use zdoom.ini
-			path += "zdoom.ini";
+			path += GAMENAMELOWERCASE ".ini";
 		}
 	}
 
@@ -239,7 +239,7 @@ FString M_GetConfigPath(bool for_reading)
 		if (!FileExists(path))
 		{
 			path = progdir;
-			path << "zdoom.ini";
+			path << GAMENAMELOWERCASE ".ini";
 		}
 	}
 
@@ -411,11 +411,11 @@ FString M_GetConfigPath(bool for_reading)
 		noErr == FSRefMakePath(&folder, (UInt8*)cpath, PATH_MAX))
 	{
 		FString path;
-		path << cpath << "/zdoom.ini";
+		path << cpath << "/" GAMENAMELOWERCASE ".ini";
 		return path;
 	}
 	// Ungh.
-	return "zdoom.ini";
+	return GAMENAMELOWERCASE ".ini";
 }
 
 //===========================================================================
@@ -497,12 +497,12 @@ FString GetUserFile (const char *file)
 		// This can be removed after a release or two
 		// Transfer the old zdoom directory to the new location
 		bool moved = false;
-		FString oldpath = NicePath("~/.zdoom/");
+		FString oldpath = NicePath("~/." GAMENAMELOWERCASE "/");
 		if (stat (oldpath, &extrainfo) != -1)
 		{
 			if (rename(oldpath, path) == -1)
 			{
-				I_Error ("Failed to move old zdoom directory (%s) to new location (%s).",
+				I_Error ("Failed to move old " GAMENAMELOWERCASE " directory (%s) to new location (%s).",
 					oldpath.GetChars(), path.GetChars());
 			}
 			else
@@ -598,7 +598,7 @@ FString M_GetCajunPath(const char *botfilename)
 
 FString M_GetConfigPath(bool for_reading)
 {
-	return GetUserFile("zdoom.ini");
+	return GetUserFile(GAMENAMELOWERCASE ".ini");
 }
 
 //===========================================================================
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index eec073a80..819de6732 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -4759,25 +4759,19 @@ static void SetActorRoll(AActor *activator, int tid, int angle, bool interpolate
 	}
 }
 
-static void SetActorTeleFog(AActor *activator, int tid, FName telefogsrc, FName telefogdest)
+static void SetActorTeleFog(AActor *activator, int tid, FString telefogsrc, FString telefogdest)
 {
-	//Simply put, if it doesn't exist, it won't change. One can use "" in this scenario.
-	PClassActor *check;
+	// Set the actor's telefog to the specified actor. Handle "" as "don't
+	// change" since "None" should work just fine for disabling the fog (given
+	// that it will resolve to NAME_None which is not a valid actor name).
 	if (tid == 0)
 	{
 		if (activator != NULL)
 		{
-			check = PClass::FindActor(telefogsrc);
-			if (check == NULL || !stricmp(telefogsrc, "none") || !stricmp(telefogsrc, "null"))
-				activator->TeleFogSourceType = NULL;
-			else
-				activator->TeleFogSourceType = check;
-
-			check = PClass::FindActor(telefogdest);
-			if (check == NULL || !stricmp(telefogdest, "none") || !stricmp(telefogdest, "null"))
-				activator->TeleFogDestType = NULL;
-			else
-				activator->TeleFogDestType = check;
+			if (telefogsrc.IsNotEmpty())
+				activator->TeleFogSourceType = PClass::FindActor(telefogsrc);
+			if (telefogdest.IsNotEmpty())
+				activator->TeleFogDestType = PClass::FindActor(telefogdest);
 		}
 	}
 	else
@@ -4785,19 +4779,14 @@ static void SetActorTeleFog(AActor *activator, int tid, FName telefogsrc, FName
 		FActorIterator iterator(tid);
 		AActor *actor;
 
+		PClassActor * src = telefogsrc.IsNotEmpty() ? PClass::FindActor(telefogsrc) : NULL;
+		PClassActor * dest = telefogdest.IsNotEmpty() ? PClass::FindActor(telefogdest) : NULL;
 		while ((actor = iterator.Next()))
 		{
-			check = PClass::FindActor(telefogsrc);
-			if (check == NULL || !stricmp(telefogsrc, "none") || !stricmp(telefogsrc, "null"))
-				actor->TeleFogSourceType = NULL;
-			else
-				actor->TeleFogSourceType = check;
-
-			check = PClass::FindActor(telefogdest);
-			if (check == NULL || !stricmp(telefogdest, "none") || !stricmp(telefogdest, "null"))
-				actor->TeleFogDestType = NULL;
-			else
-				actor->TeleFogDestType = check;
+			if (telefogsrc.IsNotEmpty())
+				actor->TeleFogSourceType = src;
+			if (telefogdest.IsNotEmpty())
+				actor->TeleFogDestType = dest;
 		}
 	}
 }
diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp
index a097b4b03..2d06b124b 100644
--- a/src/p_buildmap.cpp
+++ b/src/p_buildmap.cpp
@@ -723,7 +723,7 @@ static int LoadSprites (spritetype *sprites, Xsprite *xsprites, int numsprites,
 			if (xsprites[i].Data1 < 4)
 				mapthings[count].type = 1 + xsprites[i].Data1;
 			else
-				mapthings[count].type = gameinfo.player5start + xsprites[i].Data1 - 4;
+				mapthings[count].type = 4001 + xsprites[i].Data1 - 4;
 		}
 		else if (xsprites != NULL && sprites[i].lotag == 2)
 		{ // Bloodbath start
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index fcaa5a988..a4b849cbc 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -945,6 +945,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 	int fakeDamage = 0;
 	int holdDamage = 0;
 	
+	if (damage < 0) damage = 0;
+
 	if (target == NULL || !((target->flags & MF_SHOOTABLE) || (target->flags6 & MF6_VULNERABLE)))
 	{ // Shouldn't happen
 		return -1;
@@ -1026,6 +1028,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 	{
 		target->velx = target->vely = target->velz = 0;
 	}
+
+	player = target->player;
 	if (!(flags & DMG_FORCED))	// DMG_FORCED skips all special damage checks, TELEFRAG_DAMAGE may not be reduced at all
 	{
 		if (target->flags2 & MF2_DORMANT)
@@ -1033,9 +1037,9 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 			// Invulnerable, and won't wake up
 			return -1;
 		}
+
 		if (damage < TELEFRAG_DAMAGE) // TELEFRAG_DAMAGE may not be reduced at all or it may not guarantee its effect.
 		{
-		player = target->player;
 			if (player && damage > 1)
 		{
 			// Take half damage in trainer mode
@@ -1111,6 +1115,10 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 				return -1;
 			}
 		}
+	}
+		if (target->flags5 & MF5_NODAMAGE)
+		{
+			damage = 0;
 	}
 	}
 	if (damage < 0)
@@ -1319,7 +1327,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 			// but telefragging should still do enough damage to kill the player)
 			// Ignore players that are already dead.
 			// [MC]Buddha2 absorbs telefrag damage, and anything else thrown their way.
-			if (((player->cheats & CF_BUDDHA2) || (((player->cheats & CF_BUDDHA) || (player->mo->flags7 & MF7_BUDDHA)) && (damage < TELEFRAG_DAMAGE))) && (player->playerstate != PST_DEAD))
+			if (!(flags & DMG_FORCED) && (((player->cheats & CF_BUDDHA2) || (((player->cheats & CF_BUDDHA) || (player->mo->flags7 & MF7_BUDDHA)) && (damage < TELEFRAG_DAMAGE))) && (player->playerstate != PST_DEAD)))
 			{
 				// If this is a voodoo doll we need to handle the real player as well.
 				player->mo->health = target->health = player->health = 1;
@@ -1384,7 +1392,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 	if (target->health <= 0)
 	{ 
 		//[MC]Buddha flag for monsters.
-		if ((target->flags7 & MF7_BUDDHA) && (damage < TELEFRAG_DAMAGE) && ((inflictor == NULL || !(inflictor->flags7 & MF7_FOILBUDDHA)) && !(flags & DMG_FOILBUDDHA)))
+		if (!(flags & DMG_FORCED) && ((target->flags7 & MF7_BUDDHA) && (damage < TELEFRAG_DAMAGE) && ((inflictor == NULL || !(inflictor->flags7 & MF7_FOILBUDDHA)) && !(flags & DMG_FOILBUDDHA))))
 		{ //FOILBUDDHA or Telefrag damage must kill it.
 			target->health = 1;
 		}
diff --git a/src/p_local.h b/src/p_local.h
index 3c0d20179..a679b015d 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -595,19 +595,6 @@ struct polyspawns_t
 	short type;
 };
 
-enum
-{
-	PO_HEX_ANCHOR_TYPE = 3000,
-	PO_HEX_SPAWN_TYPE,
-	PO_HEX_SPAWNCRUSH_TYPE,
-
-	// [RH] Thing numbers that don't conflict with Doom things
-	PO_ANCHOR_TYPE = 9300,
-	PO_SPAWN_TYPE,
-	PO_SPAWNCRUSH_TYPE,
-	PO_SPAWNHURT_TYPE
-};
-
 extern int po_NumPolyobjs;
 extern polyspawns_t *polyspawns;	// [RH] list of polyobject things to spawn
 
diff --git a/src/p_map.cpp b/src/p_map.cpp
index 40e3f4b1b..ab0cc4801 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -1034,7 +1034,7 @@ bool PIT_CheckThing(AActor *thing, FCheckPosition &tm)
 	// Both things overlap in x or y direction
 	bool unblocking = false;
 
-	if (tm.FromPMove)
+	if (tm.FromPMove || tm.thing->player != NULL)
 	{
 		// Both actors already overlap. To prevent them from remaining stuck allow the move if it
 		// takes them further apart or the move does not change the position (when called from P_ChangeSector.)
@@ -4793,7 +4793,7 @@ void P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bo
 			points *= thing->GetClass()->RDFactor / (float)FRACUNIT;
 
 			// points and bombdamage should be the same sign
-			if (((bombspot->flags7 & MF7_CAUSEPAIN) || (points * bombdamage) > 0) && P_CheckSight(thing, bombspot, SF_IGNOREVISIBILITY | SF_IGNOREWATERBOUNDARY))
+			if (((points * bombdamage) > 0) && P_CheckSight(thing, bombspot, SF_IGNOREVISIBILITY | SF_IGNOREWATERBOUNDARY))
 			{ // OK to damage; target is in direct path
 				double velz;
 				double thrust;
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 7eab9a72d..d5d725f07 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -4708,69 +4708,82 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 	if (mthing->type == 0 || mthing->type == -1)
 		return NULL;
 
-	// count deathmatch start positions
-	if (mthing->type == 11)
+	// find which type to spawn
+	FDoomEdEntry *mentry = DoomEdMap.CheckKey(mthing->type);
+
+	if (mentry == NULL)
 	{
-		FPlayerStart start(mthing);
-		deathmatchstarts.Push(start);
+		// [RH] Don't die if the map tries to spawn an unknown thing
+		Printf ("Unknown type %i at (%i, %i)\n",
+				 mthing->type,
+				 mthing->x>>FRACBITS, mthing->y>>FRACBITS);
+		mentry = DoomEdMap.CheckKey(0);
+		if (mentry == NULL)	// we need a valid entry for the rest of this function so if we can't find a default, let's exit right away.
+		{
+		return NULL;
+	}
+	}
+	if (mentry->Type == NULL && mentry->Special <= 0)
+	{
+		// has been explicitly set to not spawning anything.
 		return NULL;
 	}
 
-	// Convert Strife starts to Hexen-style starts
-	if (gameinfo.gametype == GAME_Strife && mthing->type >= 118 && mthing->type <= 127)
+	// copy args to mapthing so that we have them in one place for the rest of this function	
+	if (mentry->Special >= 0)
 	{
-		mthing->args[0] = mthing->type - 117;
-		mthing->type = 1;
+		mthing->special = mentry->Special;
+		memcpy(mthing->args, mentry->Args, sizeof(mthing->args));
 	}
 
-	// [RH] Record polyobject-related things
-	if (gameinfo.gametype == GAME_Hexen)
+	int pnum = -1;
+	if (mentry->Type == NULL)
 	{
-		switch (mthing->type)
+
+		switch (mentry->Special)
 		{
-		case PO_HEX_ANCHOR_TYPE:
-			mthing->type = PO_ANCHOR_TYPE;
-			break;
-		case PO_HEX_SPAWN_TYPE:
-			mthing->type = PO_SPAWN_TYPE;
-			break;
-		case PO_HEX_SPAWNCRUSH_TYPE:
-			mthing->type = PO_SPAWNCRUSH_TYPE;
-			break;
+		case SMT_DEATHMATCHSTART:
+		{
+			// count deathmatch start positions
+			FPlayerStart start(mthing, 0);
+			deathmatchstarts.Push(start);
+			return NULL;
 		}
-	}
 
-	if (mthing->type == PO_ANCHOR_TYPE ||
-		mthing->type == PO_SPAWN_TYPE ||
-		mthing->type == PO_SPAWNCRUSH_TYPE ||
-		mthing->type == PO_SPAWNHURT_TYPE)
+		case SMT_POLYANCHOR:
+		case SMT_POLYSPAWN:
+		case SMT_POLYSPAWNCRUSH:
+		case SMT_POLYSPAWNHURT:
 	{
 		polyspawns_t *polyspawn = new polyspawns_t;
 		polyspawn->next = polyspawns;
 		polyspawn->x = mthing->x;
 		polyspawn->y = mthing->y;
 		polyspawn->angle = mthing->angle;
-		polyspawn->type = mthing->type;
+			polyspawn->type = mentry->Special;
 		polyspawns = polyspawn;
-		if (mthing->type != PO_ANCHOR_TYPE)
+			if (mentry->Special != SMT_POLYANCHOR)
 			po_NumPolyobjs++;
 		return NULL;
 	}
 
-	// check for players specially
-	int pnum = -1;
+		case SMT_PLAYER1START:
+		case SMT_PLAYER2START:
+		case SMT_PLAYER3START:
+		case SMT_PLAYER4START:
+		case SMT_PLAYER5START:
+		case SMT_PLAYER6START:
+		case SMT_PLAYER7START:
+		case SMT_PLAYER8START:
+			pnum = mentry->Special - SMT_PLAYER1START;
+			break;
+
+		// Sound sequence override will be handled later
+		default:
+			break;
 
-	if (mthing->type <= 4 && mthing->type > 0)
-	{
-		pnum = mthing->type - 1;
 	}
-	else
-	{
-		if (mthing->type >= gameinfo.player5start && mthing->type < gameinfo.player5start + MAXPLAYERS - 4)
-		{
-			pnum = mthing->type - gameinfo.player5start + 4;
 		}
-	}
 
 	if (pnum == -1 || (level.flags & LEVEL_FILTERSTARTS))
 	{
@@ -4836,7 +4849,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 			return NULL;
 
 		// save spots for respawning in network games
-		FPlayerStart start(mthing);
+		FPlayerStart start(mthing, pnum+1);
 		playerstarts[pnum] = start;
 		AllPlayerStarts.Push(start);
 		if (!deathmatch && !(level.flags2 & LEVEL2_RANDOMPLAYERSTARTS))
@@ -4847,20 +4860,10 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 	}
 
 	// [RH] sound sequence overriders
-	if (mthing->type >= 1400 && mthing->type < 1410)
+	if (mentry->Type == NULL && mentry->Special == SMT_SSEQOVERRIDE)
 	{
-		P_PointInSector (mthing->x, mthing->y)->seqType = mthing->type - 1400;
-		return NULL;
-	}
-	else if (mthing->type == 1411)
-	{
-		int type;
-
-		if (mthing->args[0] == 255)
-			type = -1;
-		else
-			type = mthing->args[0];
-
+		int type = mentry->Args[0];
+		if (type == 255) type = -1;
 		if (type > 63)
 		{
 			Printf ("Sound sequence %d out of range\n", type);
@@ -4872,37 +4875,11 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 		return NULL;
 	}
 
-	// [RH] Determine if it is an old ambient thing, and if so,
-	//		map it to MT_AMBIENT with the proper parameter.
-	if (mthing->type >= 14001 && mthing->type <= 14064)
-	{
-		mthing->args[0] = mthing->type - 14000;
-		mthing->type = 14065;
-	}
-	else if (mthing->type >= 14101 && mthing->type <= 14164)
-	{
-		mthing->args[0] = mthing->type - 14100;
-		mthing->type = 14165;
-	}
-	// find which type to spawn
-	i = DoomEdMap.FindType (mthing->type);
-
-	if (i == NULL)
-	{
-		// [RH] Don't die if the map tries to spawn an unknown thing
-		Printf ("Unknown type %i at (%i, %i)\n",
-				 mthing->type,
-				 mthing->x>>FRACBITS, mthing->y>>FRACBITS);
-		i = PClass::FindActor("Unknown");
-		assert(i->IsKindOf(RUNTIME_CLASS(PClassActor)));
-	}
 	// [RH] If the thing's corresponding sprite has no frames, also map
 	//		it to the unknown thing.
-	else
-	{
 		// Handle decorate replacements explicitly here
 		// to check for missing frames in the replacement object.
-		i = i->GetReplacement();
+	i = mentry->Type->GetReplacement();
 
 		const AActor *defaults = GetDefaultByType (i);
 		if (defaults->SpawnState == NULL ||
@@ -4919,7 +4896,6 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 			i = PClass::FindActor("Unknown");
 			assert(i->IsKindOf(RUNTIME_CLASS(PClassActor)));
 		}
-	}
 
 	const AActor *info = GetDefaultByType (i);
 
@@ -5008,6 +4984,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 		P_FindFloorCeiling(mobj, FFCF_SAMESECTOR | FFCF_ONLY3DFLOORS | FFCF_3DRESTRICT);
 	}
 
+	// if the actor got args defined either in DECORATE or MAPINFO we must ignore the map's properties.
 	if (!(mobj->flags2 & MF2_ARGSDEFINED))
 	{
 		// [RH] Set the thing's special
@@ -6271,11 +6248,6 @@ int AActor::TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FN
 {
 	FState *death;
 
-	if (flags5 & MF5_NODAMAGE)
-	{
-		return 0;
-	}
-
 	// If the actor does not have a corresponding death state, then it does not take damage.
 	// Note that DeathState matches every kind of damagetype, so an actor has that, it can
 	// be hurt with any type of damage. Exception: Massacre damage always succeeds, because
@@ -6348,11 +6320,11 @@ void AActor::Crash()
 	}
 }
 
-void AActor::SetIdle()
+void AActor::SetIdle(bool nofunction)
 {
 	FState *idle = FindState (NAME_Idle);
 	if (idle == NULL) idle = SpawnState;
-	SetState(idle);
+	SetState(idle, nofunction);
 }
 
 int AActor::SpawnHealth() const
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 9655aa758..2765c6e4d 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -3331,32 +3331,16 @@ void P_GetPolySpots (MapData * map, TArray<FNodeBuilder::FPolyStart> &spots, TAr
 {
 	if (map->HasBehavior)
 	{
-		int spot1, spot2, spot3, anchor;
-
-		if (gameinfo.gametype == GAME_Hexen)
-		{
-			spot1 = PO_HEX_SPAWN_TYPE;
-			spot2 = PO_HEX_SPAWNCRUSH_TYPE;
-			anchor = PO_HEX_ANCHOR_TYPE;
-		}
-		else
-		{
-			spot1 = PO_SPAWN_TYPE;
-			spot2 = PO_SPAWNCRUSH_TYPE;
-			anchor = PO_ANCHOR_TYPE;
-		}
-		spot3 = PO_SPAWNHURT_TYPE;
-
 		for (unsigned int i = 0; i < MapThingsConverted.Size(); ++i)
 		{
-			if (MapThingsConverted[i].type == spot1 || MapThingsConverted[i].type == spot2 || 
-				MapThingsConverted[i].type == spot3 || MapThingsConverted[i].type == anchor)
+			FDoomEdEntry *mentry = DoomEdMap.CheckKey(MapThingsConverted[i].type);
+			if (mentry != NULL && mentry->Type == NULL && mentry->Special >= SMT_POLYANCHOR && mentry->Special <= SMT_POLYSPAWNHURT)
 			{
 				FNodeBuilder::FPolyStart newvert;
 				newvert.x = MapThingsConverted[i].x;
 				newvert.y = MapThingsConverted[i].y;
 				newvert.polynum = MapThingsConverted[i].angle;
-				if (MapThingsConverted[i].type == anchor)
+				if (mentry->Special == SMT_POLYANCHOR)
 				{
 					anchors.Push (newvert);
 				}
diff --git a/src/po_man.cpp b/src/po_man.cpp
index 4a3345d5b..9158a7027 100644
--- a/src/po_man.cpp
+++ b/src/po_man.cpp
@@ -1561,8 +1561,8 @@ static void SpawnPolyobj (int index, int tag, int type)
 			sd->linedef->args[0] = 0;
 			IterFindPolySides(&polyobjs[index], sd);
 			po->MirrorNum = sd->linedef->args[1];
-			po->crush = (type != PO_SPAWN_TYPE) ? 3 : 0;
-			po->bHurtOnTouch = (type == PO_SPAWNHURT_TYPE);
+			po->crush = (type != SMT_POLYSPAWN) ? 3 : 0;
+			po->bHurtOnTouch = (type == SMT_POLYSPAWNHURT);
 			po->tag = tag;
 			po->seqType = sd->linedef->args[2];
 			if (po->seqType < 0 || po->seqType > 63)
@@ -1632,8 +1632,8 @@ static void SpawnPolyobj (int index, int tag, int type)
 		}
 		if (po->Sidedefs.Size() > 0)
 		{
-			po->crush = (type != PO_SPAWN_TYPE) ? 3 : 0;
-			po->bHurtOnTouch = (type == PO_SPAWNHURT_TYPE);
+			po->crush = (type != SMT_POLYSPAWN) ? 3 : 0;
+			po->bHurtOnTouch = (type == SMT_POLYSPAWNHURT);
 			po->tag = tag;
 			po->seqType = po->Sidedefs[0]->linedef->args[3];
 			po->MirrorNum = po->Sidedefs[0]->linedef->args[2];
@@ -1756,9 +1756,7 @@ void PO_Init (void)
 	for (polyspawn = polyspawns, prev = &polyspawns; polyspawn;)
 	{
 		// 9301 (3001) = no crush, 9302 (3002) = crushing, 9303 = hurting touch
-		if (polyspawn->type == PO_SPAWN_TYPE ||
-			polyspawn->type == PO_SPAWNCRUSH_TYPE ||
-			polyspawn->type == PO_SPAWNHURT_TYPE)
+		if (polyspawn->type >= SMT_POLYSPAWN &&	polyspawn->type <= SMT_POLYSPAWNHURT)
 		{ 
 			// Polyobj StartSpot Pt.
 			polyobjs[polyIndex].StartSpot.x = polyspawn->x;
@@ -1778,7 +1776,7 @@ void PO_Init (void)
 	for (polyspawn = polyspawns; polyspawn;)
 	{
 		polyspawns_t *next = polyspawn->next;
-		if (polyspawn->type == PO_ANCHOR_TYPE)
+		if (polyspawn->type == SMT_POLYANCHOR)
 		{ 
 			// Polyobj Anchor Pt.
 			TranslateToStartSpot (polyspawn->angle, polyspawn->x, polyspawn->y);
diff --git a/src/posix/sdl/crashcatcher.c b/src/posix/sdl/crashcatcher.c
index 4754a369a..f85713e31 100644
--- a/src/posix/sdl/crashcatcher.c
+++ b/src/posix/sdl/crashcatcher.c
@@ -37,7 +37,7 @@ static struct {
 	pid_t pid;
 	int has_siginfo;
 	siginfo_t siginfo;
-	char buf[1024];
+	char buf[4096];
 } crash_info;
 
 
diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp
index d60494d1a..7c08dacdb 100644
--- a/src/posix/sdl/i_main.cpp
+++ b/src/posix/sdl/i_main.cpp
@@ -240,7 +240,7 @@ int main (int argc, char **argv)
 #if !defined (__APPLE__)
 	{
 		int s[4] = { SIGSEGV, SIGILL, SIGFPE, SIGBUS };
-		cc_install_handlers(argc, argv, 4, s, "zdoom-crash.log", DoomSpecificInfo);
+		cc_install_handlers(argc, argv, 4, s, GAMENAMELOWERCASE "-crash.log", DoomSpecificInfo);
 	}
 #endif // !__APPLE__
 
diff --git a/src/r_swrenderer.cpp b/src/r_swrenderer.cpp
index fb54b6f0a..df928b25e 100644
--- a/src/r_swrenderer.cpp
+++ b/src/r_swrenderer.cpp
@@ -84,7 +84,7 @@ void FSoftwareRenderer::PrecacheTexture(FTexture *tex, int cache)
 {
 	if (tex != NULL)
 	{
-		if (cache & 1)
+		if (cache & FTextureManager::HIT_Columnmode)
 		{
 			const FTexture::Span *spanp;
 			tex->GetColumn(0, &spanp);
diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp
index be0426e98..2944e4200 100644
--- a/src/textures/texturemanager.cpp
+++ b/src/textures/texturemanager.cpp
@@ -1246,7 +1246,7 @@ void FTextureManager::PrecacheLevel (void)
 
 	for (unsigned i = 0; i < level.info->PrecacheTextures.Size(); i++)
 	{
-		hitlist[level.info->PrecacheTextures[i].GetIndex()] |= 1;
+		hitlist[level.info->PrecacheTextures[i].GetIndex()] |= FTextureManager::HIT_Wall;
 	}
 
 	for (int i = cnt - 1; i >= 0; i--)
diff --git a/src/textures/textures.h b/src/textures/textures.h
index 3bfbf4ed6..157f8555f 100644
--- a/src/textures/textures.h
+++ b/src/textures/textures.h
@@ -365,6 +365,16 @@ public:
 		TEXMAN_DontCreate = 32
 	};
 
+	enum
+	{
+		HIT_Wall = 1,
+		HIT_Flat = 2,
+		HIT_Sky = 4,
+		HIT_Sprite = 8,
+
+		HIT_Columnmode = HIT_Wall|HIT_Sky|HIT_Sprite
+	};
+
 	FTextureID CheckForTexture (const char *name, int usetype, BITFIELD flags=TEXMAN_TryAny);
 	FTextureID GetTexture (const char *name, int usetype, BITFIELD flags=0);
 	int ListTextures (const char *name, TArray<FTextureID> &list);
diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index c84c6c1e7..478700103 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -928,7 +928,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Explode)
 	PARAM_INT_OPT	(fulldmgdistance)  { fulldmgdistance = 0; }
 	PARAM_INT_OPT	(nails)			   { nails = 0; }
 	PARAM_INT_OPT	(naildamage)	   { naildamage = 10; }
-	PARAM_CLASS_OPT	(pufftype, AActor) { pufftype = PClass::FindActor("BulletPuff"); }
+	PARAM_CLASS_OPT	(pufftype, AActor) { pufftype = PClass::FindActor(NAME_BulletPuff); }
 
 	if (damage < 0)	// get parameters from metadata
 	{
@@ -4904,7 +4904,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_WolfAttack)
 	PARAM_INT_OPT	(pointblank)		{ pointblank = 2; }
 	PARAM_INT_OPT	(longrange)			{ longrange = 4; }
 	PARAM_FIXED_OPT	(runspeed)			{ runspeed = 160*FRACUNIT; }
-	PARAM_CLASS_OPT	(pufftype, AActor)	{ pufftype = PClass::FindActor("BulletPuff"); }
+	PARAM_CLASS_OPT	(pufftype, AActor)	{ pufftype = PClass::FindActor(NAME_BulletPuff); }
 
 	if (!self->target)
 		return 0;
@@ -6074,39 +6074,17 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Remove)
 // A_SetTeleFog
 //
 // Sets the teleport fog(s) for the calling actor.
-// Takes a name of the classes for te source and destination. 
-// Can set both at the same time. Use "" to retain the previous fog without
-// changing it.
+// Takes a name of the classes for the source and destination.
 //===========================================================================
 
 DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetTeleFog)
 {
 	PARAM_ACTION_PROLOGUE;
-	PARAM_NAME(oldpos);
-	PARAM_NAME(newpos);
-
-	PClassActor *check = PClass::FindActor(oldpos);
-	if (check == NULL || !stricmp(oldpos, "none") || !stricmp(oldpos, "null"))
-		self->TeleFogSourceType = NULL;
-	else if (!stricmp(oldpos, ""))
-	{ //Don't change it if it's just ""
-	}
-	else
-	{
-		self->TeleFogSourceType = check;
-	}
-
-	check = PClass::FindActor(newpos);
-	if (check == NULL || !stricmp(newpos, "none") || !stricmp(newpos, "null"))
-		self->TeleFogDestType = NULL;
-	else if (!stricmp(newpos, ""))
-	{ //Don't change it if it's just ""
-	}
-	else
-	{
-		self->TeleFogDestType = check;
-	}
+	PARAM_CLASS(oldpos, AActor);
+	PARAM_CLASS(newpos, AActor);
 
+	self->TeleFogSourceType = oldpos;
+	self->TeleFogDestType = newpos;
 	return 0;
 }
 
diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp
index 6e47a2a86..a2092d6e2 100644
--- a/src/thingdef/thingdef_properties.cpp
+++ b/src/thingdef/thingdef_properties.cpp
@@ -1459,14 +1459,8 @@ DEFINE_PROPERTY(stamina, I, Actor)
 DEFINE_PROPERTY(telefogsourcetype, S, Actor)
 {
 	PROP_STRING_PARM(str, 0);
-	if (!stricmp(str, "") || (!stricmp(str, "none")) || (!stricmp(str, "null")) || *str == 0)
-	{
-		defaults->TeleFogSourceType = NULL;
-	}
-	else
-	{
-		defaults->TeleFogSourceType = FindClassTentative(str, PClass::FindClass("TeleportFog"));
-	}
+	if (!stricmp(str, "") || !stricmp(str, "none")) defaults->TeleFogSourceType = NULL;
+	else defaults->TeleFogSourceType = FindClassTentative(str, RUNTIME_CLASS(AActor));
 }
 
 //==========================================================================
@@ -1475,14 +1469,8 @@ DEFINE_PROPERTY(telefogsourcetype, S, Actor)
 DEFINE_PROPERTY(telefogdesttype, S, Actor)
 {
 	PROP_STRING_PARM(str, 0);
-	if (!stricmp(str, "") || (!stricmp(str, "none")) || (!stricmp(str, "null")) || *str == 0)
-	{
-		defaults->TeleFogDestType = NULL;
-	}
-	else
-	{
-		defaults->TeleFogDestType = FindClassTentative(str, PClass::FindClass("TeleportFog"));
-	}
+	if (!stricmp(str, "") || !stricmp(str, "none")) defaults->TeleFogDestType = NULL;
+	else defaults->TeleFogDestType = FindClassTentative(str, RUNTIME_CLASS(AActor));
 }
 
 //==========================================================================
diff --git a/src/v_video.cpp b/src/v_video.cpp
index 453772886..d48bd91ae 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -1245,7 +1245,7 @@ void DFrameBuffer::GetHitlist(BYTE *hitlist)
 					FTextureID pic = frame->Texture[k];
 					if (pic.isValid())
 					{
-						hitlist[pic.GetIndex()] = 1;
+						hitlist[pic.GetIndex()] = FTextureManager::HIT_Sprite;
 					}
 				}
 			}
@@ -1257,14 +1257,14 @@ void DFrameBuffer::GetHitlist(BYTE *hitlist)
 	for (i = numsectors - 1; i >= 0; i--)
 	{
 		hitlist[sectors[i].GetTexture(sector_t::floor).GetIndex()] = 
-			hitlist[sectors[i].GetTexture(sector_t::ceiling).GetIndex()] |= 2;
+			hitlist[sectors[i].GetTexture(sector_t::ceiling).GetIndex()] |= FTextureManager::HIT_Flat;
 	}
 
 	for (i = numsides - 1; i >= 0; i--)
 	{
 		hitlist[sides[i].GetTexture(side_t::top).GetIndex()] =
 		hitlist[sides[i].GetTexture(side_t::mid).GetIndex()] =
-		hitlist[sides[i].GetTexture(side_t::bottom).GetIndex()] |= 1;
+		hitlist[sides[i].GetTexture(side_t::bottom).GetIndex()] |= FTextureManager::HIT_Wall;
 	}
 
 	// Sky texture is always present.
@@ -1276,11 +1276,11 @@ void DFrameBuffer::GetHitlist(BYTE *hitlist)
 
 	if (sky1texture.isValid())
 	{
-		hitlist[sky1texture.GetIndex()] |= 1;
+		hitlist[sky1texture.GetIndex()] |= FTextureManager::HIT_Sky;
 	}
 	if (sky2texture.isValid())
 	{
-		hitlist[sky2texture.GetIndex()] |= 1;
+		hitlist[sky2texture.GetIndex()] |= FTextureManager::HIT_Sky;
 	}
 }
 
diff --git a/src/version.h b/src/version.h
index 7f6d9cedd..cbbb8bd21 100644
--- a/src/version.h
+++ b/src/version.h
@@ -88,13 +88,14 @@ const char *GetVersionString();
 
 // More stuff that needs to be different for derivatives.
 #define GAMENAME "ZDoom"
+#define GAMENAMELOWERCASE "zdoom"
 #define FORUM_URL "http://forum.zdoom.org"
 #define BUGS_FORUM_URL	"http://forum.zdoom.org/index.php?c=3"
 
 #if defined(__APPLE__) || defined(_WIN32)
 #define GAME_DIR GAMENAME
 #else
-#define GAME_DIR ".config/zdoom"
+#define GAME_DIR ".config/" GAMENAMELOWERCASE
 #endif
 
 
diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp
index f85365bcc..7647fea95 100644
--- a/src/win32/i_main.cpp
+++ b/src/win32/i_main.cpp
@@ -1288,20 +1288,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 	MainThread = INVALID_HANDLE_VALUE;
 	return 0;
 }
-
-//==========================================================================
-//
-// CCMD crashout
-//
-// Debugging routine for testing the crash logger.
-// Useless in a debug build, because that doesn't enable the crash logger.
-//
-//==========================================================================
-
-#ifndef _DEBUG
-#include "c_dispatch.h"
-CCMD (crashout)
-{
-	*(int *)0 = 0;
-}
-#endif
diff --git a/wadsrc/static/actors/actor.txt b/wadsrc/static/actors/actor.txt
index 1cb1819e9..0d32cf893 100644
--- a/wadsrc/static/actors/actor.txt
+++ b/wadsrc/static/actors/actor.txt
@@ -293,7 +293,7 @@ ACTOR Actor native //: Thinker
 	action native A_GiveToSiblings(class<Inventory> itemtype, int amount = 0);
 	action native A_TakeFromChildren(class<Inventory> itemtype, int amount = 0);
 	action native A_TakeFromSiblings(class<Inventory> itemtype, int amount = 0);
-	action native A_SetTeleFog(name oldpos, name newpos);
+	action native A_SetTeleFog(class<Actor> oldpos, class<Actor> newpos);
 	action native A_SwapTeleFog();
 	action native A_SetFloatBobPhase(int bob);
 	action native A_SetHealth(int health, int ptr = AAPTR_DEFAULT);
diff --git a/wadsrc/static/actors/chex/chexammo.txt b/wadsrc/static/actors/chex/chexammo.txt
index b7d644876..57a4ca285 100644
--- a/wadsrc/static/actors/chex/chexammo.txt
+++ b/wadsrc/static/actors/chex/chexammo.txt
@@ -2,13 +2,13 @@
 
 // Mini Zorch -----------------------------------------------------------------
 
-actor MiniZorchRecharge : Clip 2007
+actor MiniZorchRecharge : Clip
 {
 	Game Chex
 	inventory.pickupmessage "$GOTZORCHRECHARGE"
 }
 
-actor MiniZorchPack : Clip 2048
+actor MiniZorchPack : Clip
 {
 	Game Chex
 	Inventory.PickupMessage "$GOTMINIZORCHPACK"
@@ -23,13 +23,13 @@ actor MiniZorchPack : Clip 2048
 
 // Large Zorch ----------------------------------------------------------------
 
-actor LargeZorchRecharge : Shell 2008
+actor LargeZorchRecharge : Shell
 {
 	Game Chex
 	inventory.pickupmessage "$GOTLARGEZORCHERRECHARGE"
 }
 
-actor LargeZorchPack : Shell 2049
+actor LargeZorchPack : Shell
 {
 	Game Chex
 	Inventory.PickupMessage "$GOTLARGEZORCHERPACK"
@@ -44,13 +44,13 @@ actor LargeZorchPack : Shell 2049
 
 // Zorch Propulsor ------------------------------------------------------------
 
-actor PropulsorZorch : RocketAmmo 2010
+actor PropulsorZorch : RocketAmmo
 {
 	Game Chex
 	inventory.pickupmessage "$GOTPROPULSORRECHARGE"
 }
 
-actor PropulsorZorchPack : RocketAmmo 2046
+actor PropulsorZorchPack : RocketAmmo
 {
 	Game Chex
 	Inventory.PickupMessage "$GOTPROPULSORPACK"
@@ -65,13 +65,13 @@ actor PropulsorZorchPack : RocketAmmo 2046
 
 // Phasing Zorch --------------------------------------------------------------
 
-actor PhasingZorch : Cell 2047
+actor PhasingZorch : Cell
 {
 	Game Chex
 	inventory.pickupmessage "$GOTPHASINGZORCHERRECHARGE"
 }
 
-actor PhasingZorchPack : Cell 17
+actor PhasingZorchPack : Cell
 {
 	Game Chex
 	SpawnID 142
diff --git a/wadsrc/static/actors/chex/chexdecorations.txt b/wadsrc/static/actors/chex/chexdecorations.txt
index 29b0099c1..398e08836 100644
--- a/wadsrc/static/actors/chex/chexdecorations.txt
+++ b/wadsrc/static/actors/chex/chexdecorations.txt
@@ -2,19 +2,19 @@
 
 // Civilians ------------------------------------------------------------------
 
-actor ChexCivilian1 : GreenTorch 45
+actor ChexCivilian1 : GreenTorch
 {
 	game Chex
 	height 54
 }
 
-actor ChexCivilian2 : ShortGreenTorch 56
+actor ChexCivilian2 : ShortGreenTorch
 {
 	game Chex
 	height 54
 }
 
-actor ChexCivilian3 : ShortRedTorch 57
+actor ChexCivilian3 : ShortRedTorch
 {
 	game Chex
 	height 48
@@ -22,13 +22,13 @@ actor ChexCivilian3 : ShortRedTorch 57
 
 // Landing Zone ---------------------------------------------------------------
 
-actor ChexLandingLight : Column 2028
+actor ChexLandingLight : Column
 {
 	game Chex
 	height 35
 }
 
-actor ChexSpaceship : TechPillar 48
+actor ChexSpaceship : TechPillar
 {
 	game Chex
 	height 52
@@ -36,37 +36,37 @@ actor ChexSpaceship : TechPillar 48
 
 // Trees and Plants -----------------------------------------------------------
 
-actor ChexAppleTree : Stalagtite 47
+actor ChexAppleTree : Stalagtite
 {
 	game Chex
 	height 92
 }
 
-actor ChexBananaTree : BigTree 54
+actor ChexBananaTree : BigTree
 {
 	game Chex
 	height 108
 }
 
-actor ChexOrangeTree : TorchTree 43
+actor ChexOrangeTree : TorchTree
 {
 	game Chex
 	height 92
 }
 
-actor ChexSubmergedPlant : ShortGreenColumn 31
+actor ChexSubmergedPlant : ShortGreenColumn
 {
 	game Chex
 	height 42
 }
 
-actor ChexTallFlower : HeadsOnAStick 28
+actor ChexTallFlower : HeadsOnAStick
 {
 	game Chex
 	height 25
 }
 
-actor ChexTallFlower2 : DeadStick 25
+actor ChexTallFlower2 : DeadStick
 {
 	game Chex
 	height 25
@@ -74,7 +74,7 @@ actor ChexTallFlower2 : DeadStick 25
 
 // Slime Fountain -------------------------------------------------------------
 
-actor ChexSlimeFountain : BlueTorch 44
+actor ChexSlimeFountain : BlueTorch
 {
 	game Chex
 	height 48
@@ -88,13 +88,13 @@ actor ChexSlimeFountain : BlueTorch 44
 
 // Cavern Decorations ---------------------------------------------------------
 
-actor ChexCavernColumn : TallRedColumn 32
+actor ChexCavernColumn : TallRedColumn
 {
 	game Chex
 	height 128
 }
 
-actor ChexCavernStalagmite : TallGreenColumn 30
+actor ChexCavernStalagmite : TallGreenColumn
 {
 	game Chex
 	height 60
@@ -102,38 +102,38 @@ actor ChexCavernStalagmite : TallGreenColumn 30
 
 // Misc. Props ----------------------------------------------------------------
 
-actor ChexChemicalBurner : EvilEye 41
+actor ChexChemicalBurner : EvilEye
 {
 	game Chex
 	height 25
 }
 
-actor ChexChemicalFlask : Candlestick 34
+actor ChexChemicalFlask : Candlestick
 {
 	game Chex
 	renderstyle translucent
 	alpha 0.75
 }
 
-actor ChexFlagOnPole : SkullColumn 37
+actor ChexFlagOnPole : SkullColumn
 {
 	game Chex
 	height 128
 }
 
-actor ChexGasTank : Candelabra 35
+actor ChexGasTank : Candelabra
 {
 	game Chex
 	height 36
 }
 
-actor ChexLightColumn : ShortBlueTorch 55
+actor ChexLightColumn : ShortBlueTorch
 {
 	game Chex
 	height 86
 }
 
-actor ChexMineCart : ShortRedColumn 33
+actor ChexMineCart : ShortRedColumn
 {
 	game Chex
 	height 30
diff --git a/wadsrc/static/actors/chex/chexitems.txt b/wadsrc/static/actors/chex/chexitems.txt
index bbdc68dea..b26065395 100644
--- a/wadsrc/static/actors/chex/chexitems.txt
+++ b/wadsrc/static/actors/chex/chexitems.txt
@@ -3,26 +3,26 @@
 
 // Health ---------------------------------------------------------------------
 
-actor GlassOfWater : HealthBonus 2014
+actor GlassOfWater : HealthBonus
 {
 	game Chex
 	inventory.pickupmessage "$GOTWATER"
 }
 
-actor BowlOfFruit : Stimpack 2011
+actor BowlOfFruit : Stimpack
 {
 	game Chex
 	inventory.pickupmessage "$GOTFRUIT"
 }
 
-actor BowlOfVegetables : Medikit 2012
+actor BowlOfVegetables : Medikit
 {
 	game Chex
 	inventory.pickupmessage "$GOTVEGETABLES"
 	health.lowmessage 25, "$GOTVEGETABLESNEED"
 }
 
-actor SuperchargeBreakfast : Soulsphere 2013
+actor SuperchargeBreakfast : Soulsphere
 {
 	game Chex
 	inventory.pickupmessage "$GOTBREAKFAST"
@@ -30,19 +30,19 @@ actor SuperchargeBreakfast : Soulsphere 2013
 
 // Armor ----------------------------------------------------------------------
 
-actor SlimeRepellent : ArmorBonus 2015
+actor SlimeRepellent : ArmorBonus
 {
 	game Chex
 	inventory.pickupmessage "$GOTREPELLENT"
 }
 
-actor ChexArmor : GreenArmor 2018
+actor ChexArmor : GreenArmor
 {
 	game Chex
 	inventory.pickupmessage "$GOTCHEXARMOR"
 }
 
-actor SuperChexArmor : BlueArmor 2019
+actor SuperChexArmor : BlueArmor
 {
 	game Chex
 	inventory.pickupmessage "$GOTSUPERCHEXARMOR"
@@ -50,19 +50,19 @@ actor SuperChexArmor : BlueArmor 2019
 
 // Powerups ===================================================================
 
-actor ComputerAreaMap : Allmap 2026
+actor ComputerAreaMap : Allmap
 {
 	game Chex
 	inventory.pickupmessage "$GOTCHEXMAP"
 }
 
-actor SlimeProofSuit : RadSuit 2025
+actor SlimeProofSuit : RadSuit
 {
 	game Chex
 	inventory.pickupmessage "$GOTSLIMESUIT"
 }
 
-actor Zorchpack : Backpack 8
+actor Zorchpack : Backpack
 {
 	game Chex
 	inventory.pickupmessage "$GOTZORCHPACK"
diff --git a/wadsrc/static/actors/chex/chexkeys.txt b/wadsrc/static/actors/chex/chexkeys.txt
index 60c9ce54e..6142f833c 100644
--- a/wadsrc/static/actors/chex/chexkeys.txt
+++ b/wadsrc/static/actors/chex/chexkeys.txt
@@ -1,18 +1,18 @@
 // These are merely renames of the Doom cards
 
-actor ChexBlueCard : BlueCard 5
+actor ChexBlueCard : BlueCard
 {
 	Game Chex
 	inventory.pickupmessage "$GOTCBLUEKEY"
 }
 
-actor ChexYellowCard : YellowCard 6
+actor ChexYellowCard : YellowCard
 {
 	Game Chex
 	inventory.pickupmessage "$GOTCYELLOWKEY"
 }
 
-actor ChexRedCard : RedCard 13
+actor ChexRedCard : RedCard
 {
 	Game Chex
 	inventory.pickupmessage "$GOTCREDKEY"
diff --git a/wadsrc/static/actors/chex/chexmonsters.txt b/wadsrc/static/actors/chex/chexmonsters.txt
index 3941e8eb9..eae27f6a1 100644
--- a/wadsrc/static/actors/chex/chexmonsters.txt
+++ b/wadsrc/static/actors/chex/chexmonsters.txt
@@ -5,7 +5,7 @@
 //
 //===========================================================================
 
-actor FlemoidusCommonus : ZombieMan 3004
+actor FlemoidusCommonus : ZombieMan
 {
 	Game Chex
 	DropItem ""
@@ -25,7 +25,7 @@ actor FlemoidusCommonus : ZombieMan 3004
 //
 //===========================================================================
 
-actor FlemoidusBipedicus : ShotgunGuy 9
+actor FlemoidusBipedicus : ShotgunGuy
 {
 	Game Chex
 	DropItem ""
@@ -45,7 +45,7 @@ actor FlemoidusBipedicus : ShotgunGuy 9
 //
 //===========================================================================
 
-actor ArmoredFlemoidusBipedicus : DoomImp 3001
+actor ArmoredFlemoidusBipedicus : DoomImp
 {
 	Game Chex
 	Obituary "$OB_BIPEDICUS2"
@@ -58,7 +58,7 @@ actor ArmoredFlemoidusBipedicus : DoomImp 3001
 //
 //===========================================================================
 
-actor FlemoidusCycloptisCommonus : Demon 3002
+actor FlemoidusCycloptisCommonus : Demon
 {
 	Game Chex
 	Obituary "$OB_CYCLOPTIS"
@@ -70,7 +70,7 @@ actor FlemoidusCycloptisCommonus : Demon 3002
 //
 //===========================================================================
 
-actor Flembrane : BaronOfHell 3003
+actor Flembrane : BaronOfHell
 {
 	Game Chex
 	radius 44
@@ -88,7 +88,7 @@ actor Flembrane : BaronOfHell 3003
 
 //===========================================================================
 
-actor ChexSoul : LostSoul 3006
+actor ChexSoul : LostSoul
 {
 	Game Chex
 	height 0
diff --git a/wadsrc/static/actors/chex/chexweapons.txt b/wadsrc/static/actors/chex/chexweapons.txt
index 96d8b4c4b..bb00e255c 100644
--- a/wadsrc/static/actors/chex/chexweapons.txt
+++ b/wadsrc/static/actors/chex/chexweapons.txt
@@ -7,7 +7,7 @@ actor Bootspoon : Fist
 	Tag "$TAG_SPOON"
 }
 
-actor SuperBootspork : Chainsaw 2005
+actor SuperBootspork : Chainsaw
 {
 	game Chex
 	obituary "$OB_MPBOOTSPORK"
@@ -28,7 +28,7 @@ actor MiniZorcher : Pistol
 	}
 }
 
-actor LargeZorcher : Shotgun 2001
+actor LargeZorcher : Shotgun
 {
 	game Chex
 	obituary "$OB_MPZORCH"
@@ -36,7 +36,7 @@ actor LargeZorcher : Shotgun 2001
 	Tag "$TAG_LARGEZORCHER"
 }
 
-actor SuperLargeZorcher : SuperShotgun 82
+actor SuperLargeZorcher : SuperShotgun
 {
 	game Chex
 	obituary "$OB_MPMEGAZORCH"
@@ -44,7 +44,7 @@ actor SuperLargeZorcher : SuperShotgun 82
 	Tag "$TAG_SUPERLARGEZORCHER"
 }
 
-actor RapidZorcher : Chaingun 2002
+actor RapidZorcher : Chaingun
 {
 	game Chex
 	obituary "$OB_MPRAPIDZORCH"
@@ -52,7 +52,7 @@ actor RapidZorcher : Chaingun 2002
 	Tag "$TAG_RAPIDZORCHER"
 }
 
-actor ZorchPropulsor : RocketLauncher 2003
+actor ZorchPropulsor : RocketLauncher
 {
 	game Chex
 	obituary ""
@@ -77,7 +77,7 @@ actor PropulsorMissile : Rocket
 	Alpha 0.75
 }	
 
-actor PhasingZorcher : PlasmaRifle 2004
+actor PhasingZorcher : PlasmaRifle
 {
 	game Chex
 	obituary ""
@@ -107,7 +107,7 @@ actor PhaseZorchMissile : PlasmaBall
 	Alpha 0.75
 }	
 
-actor LAZDevice : BFG9000 2006
+actor LAZDevice : BFG9000
 {
 	game Chex
 	obituary ""
diff --git a/wadsrc/static/actors/doom/arachnotron.txt b/wadsrc/static/actors/doom/arachnotron.txt
index 9348339d5..9831e7ea9 100644
--- a/wadsrc/static/actors/doom/arachnotron.txt
+++ b/wadsrc/static/actors/doom/arachnotron.txt
@@ -3,7 +3,7 @@
 // Arachnotron
 //
 //===========================================================================
-ACTOR Arachnotron 68
+ACTOR Arachnotron
 {
 	Game Doom
 	SpawnID 6
diff --git a/wadsrc/static/actors/doom/archvile.txt b/wadsrc/static/actors/doom/archvile.txt
index 96503d717..ba3a9ca16 100644
--- a/wadsrc/static/actors/doom/archvile.txt
+++ b/wadsrc/static/actors/doom/archvile.txt
@@ -4,7 +4,7 @@
 //
 //===========================================================================
 
-ACTOR Archvile 64
+ACTOR Archvile
 {
 	Game Doom
 	SpawnID 111
diff --git a/wadsrc/static/actors/doom/bossbrain.txt b/wadsrc/static/actors/doom/bossbrain.txt
index 492cb1f80..92b8611f9 100644
--- a/wadsrc/static/actors/doom/bossbrain.txt
+++ b/wadsrc/static/actors/doom/bossbrain.txt
@@ -5,7 +5,7 @@
 //
 //===========================================================================
 
-ACTOR BossBrain 88
+ACTOR BossBrain
 {
 	Game Doom
 	Health 250
@@ -43,7 +43,7 @@ ACTOR BossBrain 88
 //
 //===========================================================================
 
-ACTOR BossEye 89
+ACTOR BossEye
 {
 	Game Doom
 	Height 32
@@ -67,7 +67,7 @@ ACTOR BossEye 89
 //
 //===========================================================================
 
-ACTOR BossTarget : SpecialSpot 87
+ACTOR BossTarget : SpecialSpot
 {
 	Game Doom
 	Height 32
diff --git a/wadsrc/static/actors/doom/bruiser.txt b/wadsrc/static/actors/doom/bruiser.txt
index 3f461f585..57af9e9a0 100644
--- a/wadsrc/static/actors/doom/bruiser.txt
+++ b/wadsrc/static/actors/doom/bruiser.txt
@@ -3,7 +3,7 @@
 // Baron of Hell
 //
 //===========================================================================
-ACTOR BaronOfHell 3003
+ACTOR BaronOfHell
 {
 	Game Doom
 	SpawnID 3
@@ -59,7 +59,7 @@ ACTOR BaronOfHell 3003
 // Hell Knight
 //
 //===========================================================================
-ACTOR HellKnight : BaronOfHell 69
+ACTOR HellKnight : BaronOfHell
 {
 	Game Doom
 	SpawnID 113
diff --git a/wadsrc/static/actors/doom/cacodemon.txt b/wadsrc/static/actors/doom/cacodemon.txt
index 89761e014..c2feabee0 100644
--- a/wadsrc/static/actors/doom/cacodemon.txt
+++ b/wadsrc/static/actors/doom/cacodemon.txt
@@ -3,7 +3,7 @@
 // Cacodemon
 //
 //===========================================================================
-ACTOR Cacodemon 3005
+ACTOR Cacodemon
 {
 	Game Doom
 	SpawnID 19
diff --git a/wadsrc/static/actors/doom/cyberdemon.txt b/wadsrc/static/actors/doom/cyberdemon.txt
index 60bcbcc4b..f4fa16ac2 100644
--- a/wadsrc/static/actors/doom/cyberdemon.txt
+++ b/wadsrc/static/actors/doom/cyberdemon.txt
@@ -4,7 +4,7 @@
 // Cyberdemon
 //
 //===========================================================================
-ACTOR Cyberdemon 16
+ACTOR Cyberdemon
 {
 	Game Doom
 	SpawnID 114
diff --git a/wadsrc/static/actors/doom/deadthings.txt b/wadsrc/static/actors/doom/deadthings.txt
index b8faa2288..74d4184cc 100644
--- a/wadsrc/static/actors/doom/deadthings.txt
+++ b/wadsrc/static/actors/doom/deadthings.txt
@@ -1,6 +1,6 @@
 // Gibbed marine -----------------------------------------------------------
 
-actor GibbedMarine 10
+actor GibbedMarine
 {
 	Game Doom
 	SpawnID 145
@@ -14,14 +14,14 @@ actor GibbedMarine 10
 
 // Gibbed marine (extra copy) ----------------------------------------------
 
-actor GibbedMarineExtra : GibbedMarine 12
+actor GibbedMarineExtra : GibbedMarine
 {
 	Game Doom
 }
 
 // Dead marine -------------------------------------------------------------
 
-actor DeadMarine 15
+actor DeadMarine
 {
 	Game Doom
 	States
@@ -39,7 +39,7 @@ actor DeadMarine 15
 
 // Dead zombie man ---------------------------------------------------------
 
-actor DeadZombieMan : ZombieMan 18
+actor DeadZombieMan : ZombieMan
 {
 	Skip_Super
 	Game Doom
@@ -53,7 +53,7 @@ actor DeadZombieMan : ZombieMan 18
 
 // Dead shotgun guy --------------------------------------------------------
 
-actor DeadShotgunGuy : ShotgunGuy 19
+actor DeadShotgunGuy : ShotgunGuy
 {
 	Skip_Super
 	Game Doom
@@ -67,7 +67,7 @@ actor DeadShotgunGuy : ShotgunGuy 19
 
 // Dead imp ----------------------------------------------------------------
 
-actor DeadDoomImp : DoomImp 20
+actor DeadDoomImp : DoomImp
 {
 	Skip_Super
 	Game Doom
@@ -80,7 +80,7 @@ actor DeadDoomImp : DoomImp 20
 
 // Dead demon --------------------------------------------------------------
 
-actor DeadDemon : Demon 21
+actor DeadDemon : Demon
 {
 	Skip_Super
 	Game Doom
@@ -93,7 +93,7 @@ actor DeadDemon : Demon 21
 
 // Dead cacodemon ----------------------------------------------------------
 
-actor DeadCacodemon : Cacodemon 22
+actor DeadCacodemon : Cacodemon
 {
 	Skip_Super
 	Game Doom
@@ -112,7 +112,7 @@ actor DeadCacodemon : Cacodemon 22
  * a holdover from that.)
  */
 
-actor DeadLostSoul : LostSoul 23
+actor DeadLostSoul : LostSoul
 {
 	Skip_Super
 	Game Doom
diff --git a/wadsrc/static/actors/doom/demon.txt b/wadsrc/static/actors/doom/demon.txt
index ecd6fa8a6..d88d67a72 100644
--- a/wadsrc/static/actors/doom/demon.txt
+++ b/wadsrc/static/actors/doom/demon.txt
@@ -3,7 +3,7 @@
 // Pink Demon
 //
 //===========================================================================
-ACTOR Demon 3002
+ACTOR Demon
 {
 	Game Doom
 	SpawnID 8
@@ -57,7 +57,7 @@ ACTOR Demon 3002
 // Spectre
 //
 //===========================================================================
-ACTOR Spectre : Demon 58
+ACTOR Spectre : Demon
 {
 	Game Doom
 	SpawnID 9
diff --git a/wadsrc/static/actors/doom/doomammo.txt b/wadsrc/static/actors/doom/doomammo.txt
index 78ddc0af9..9d25c3b46 100644
--- a/wadsrc/static/actors/doom/doomammo.txt
+++ b/wadsrc/static/actors/doom/doomammo.txt
@@ -1,6 +1,6 @@
 // Clip --------------------------------------------------------------------
 
-ACTOR Clip : Ammo 2007
+ACTOR Clip : Ammo
 {
 	Game Doom
 	SpawnID 11
@@ -20,7 +20,7 @@ ACTOR Clip : Ammo 2007
 
 // Clip box ----------------------------------------------------------------
 
-ACTOR ClipBox : Clip 2048
+ACTOR ClipBox : Clip
 {
 	Game Doom
 	SpawnID 139
@@ -36,7 +36,7 @@ ACTOR ClipBox : Clip 2048
 
 // Rocket ------------------------------------------------------------------
 
-ACTOR RocketAmmo : Ammo 2010
+ACTOR RocketAmmo : Ammo
 {
 	Game Doom
 	SpawnID 140
@@ -56,7 +56,7 @@ ACTOR RocketAmmo : Ammo 2010
 
 // Rocket box --------------------------------------------------------------
 
-ACTOR RocketBox : RocketAmmo 2046
+ACTOR RocketBox : RocketAmmo
 {
 	Game Doom
 	SpawnID 141
@@ -72,7 +72,7 @@ ACTOR RocketBox : RocketAmmo 2046
 
 // Cell --------------------------------------------------------------------
 
-ACTOR Cell : Ammo 2047
+ACTOR Cell : Ammo
 {
 	Game Doom
 	SpawnID 75
@@ -92,7 +92,7 @@ ACTOR Cell : Ammo 2047
 
 // Cell pack ---------------------------------------------------------------
 
-ACTOR CellPack : Cell 17
+ACTOR CellPack : Cell
 {
 	Game Doom
 	SpawnID 142
@@ -108,7 +108,7 @@ ACTOR CellPack : Cell 17
 
 // Shells ------------------------------------------------------------------
 
-ACTOR Shell : Ammo 2008
+ACTOR Shell : Ammo
 {
 	Game Doom
 	SpawnID 12
@@ -128,7 +128,7 @@ ACTOR Shell : Ammo 2008
 
 // Shell box ---------------------------------------------------------------
 
-ACTOR ShellBox : Shell 2049
+ACTOR ShellBox : Shell
 {
 	Game Doom
 	SpawnID 143
@@ -144,7 +144,7 @@ ACTOR ShellBox : Shell 2049
 
 // Backpack ---------------------------------------------------------------
 
-ACTOR Backpack : BackpackItem 8
+ACTOR Backpack : BackpackItem
 {
 	Game Doom
 	SpawnID 144
diff --git a/wadsrc/static/actors/doom/doomarmor.txt b/wadsrc/static/actors/doom/doomarmor.txt
index 486fc0611..1cc6847ed 100644
--- a/wadsrc/static/actors/doom/doomarmor.txt
+++ b/wadsrc/static/actors/doom/doomarmor.txt
@@ -1,7 +1,7 @@
 
 // Armor bonus --------------------------------------------------------------
 
-Actor ArmorBonus : BasicArmorBonus 2015
+Actor ArmorBonus : BasicArmorBonus
 {
 	Game Doom
 	SpawnID 22
@@ -24,7 +24,7 @@ Actor ArmorBonus : BasicArmorBonus 2015
 
 // Green armor --------------------------------------------------------------
 
-Actor GreenArmor : BasicArmorPickup 2018
+Actor GreenArmor : BasicArmorPickup
 {
 	Game Doom
 	SpawnID 68
@@ -45,7 +45,7 @@ Actor GreenArmor : BasicArmorPickup 2018
 
 // Blue armor ---------------------------------------------------------------
 
-Actor BlueArmor : BasicArmorPickup 2019
+Actor BlueArmor : BasicArmorPickup
 {
 	Game Doom
 	SpawnID 69
diff --git a/wadsrc/static/actors/doom/doomartifacts.txt b/wadsrc/static/actors/doom/doomartifacts.txt
index fb822f30f..6335d1b16 100644
--- a/wadsrc/static/actors/doom/doomartifacts.txt
+++ b/wadsrc/static/actors/doom/doomartifacts.txt
@@ -1,6 +1,6 @@
 // Invulnerability Sphere ---------------------------------------------------
 
-ACTOR InvulnerabilitySphere : PowerupGiver 2022
+ACTOR InvulnerabilitySphere : PowerupGiver
 {
 	Game Doom
 	SpawnID 133
@@ -22,7 +22,7 @@ ACTOR InvulnerabilitySphere : PowerupGiver 2022
 
 // Soulsphere --------------------------------------------------------------
 
-ACTOR Soulsphere : Health 2013
+ACTOR Soulsphere : Health
 {
 	Game Doom
 	SpawnID 25
@@ -58,7 +58,7 @@ actor BlueArmorForMegasphere : BlueArmor
 	Armor.SaveAmount 200
 }
 
-ACTOR Megasphere : CustomInventory 83
+ACTOR Megasphere : CustomInventory
 {
 	Game Doom
 	SpawnID 132
@@ -80,7 +80,7 @@ ACTOR Megasphere : CustomInventory 83
 
 // Invisibility -------------------------------------------------------------
 
-ACTOR BlurSphere : PowerupGiver 2024
+ACTOR BlurSphere : PowerupGiver
 {
 	Game Doom
 	SpawnID 135
@@ -103,7 +103,7 @@ ACTOR BlurSphere : PowerupGiver 2024
 
 // Radiation suit (aka iron feet) -------------------------------------------
 
-ACTOR RadSuit : PowerupGiver 2025
+ACTOR RadSuit : PowerupGiver
 {
 	Game Doom
 	SpawnID 136
@@ -123,7 +123,7 @@ ACTOR RadSuit : PowerupGiver 2025
 
 // infrared -----------------------------------------------------------------
 
-ACTOR Infrared : PowerupGiver 2045
+ACTOR Infrared : PowerupGiver
 {
 	Game Doom
 	SpawnID 138
@@ -144,7 +144,7 @@ ACTOR Infrared : PowerupGiver 2045
 	
 // Allmap -------------------------------------------------------------------
 
-ACTOR Allmap : MapRevealer 2026
+ACTOR Allmap : MapRevealer
 {
 	Game Doom
 	SpawnID 137
@@ -164,7 +164,7 @@ ACTOR Allmap : MapRevealer 2026
 
 // Berserk ------------------------------------------------------------------
 
-ACTOR Berserk : CustomInventory 2023
+ACTOR Berserk : CustomInventory
 {
 	Game Doom
 	SpawnID 134
diff --git a/wadsrc/static/actors/doom/doomdecorations.txt b/wadsrc/static/actors/doom/doomdecorations.txt
index 9d2d230eb..7233657d8 100644
--- a/wadsrc/static/actors/doom/doomdecorations.txt
+++ b/wadsrc/static/actors/doom/doomdecorations.txt
@@ -1,7 +1,7 @@
 
 // Tech lamp ---------------------------------------------------------------
 
-ACTOR TechLamp 85
+ACTOR TechLamp
 {
 	Game Doom
 	Radius 16
@@ -18,7 +18,7 @@ ACTOR TechLamp 85
 
 // Tech lamp 2 -------------------------------------------------------------
 
-ACTOR TechLamp2 86
+ACTOR TechLamp2
 {
 	Game Doom
 	Radius 16
@@ -35,7 +35,7 @@ ACTOR TechLamp2 86
 
 // Column ------------------------------------------------------------------
 
-ACTOR Column 2028
+ACTOR Column
 {
 	Game Doom
 	Radius 16
@@ -52,7 +52,7 @@ ACTOR Column 2028
 
 // Tall green column -------------------------------------------------------
 
-ACTOR TallGreenColumn 30
+ACTOR TallGreenColumn
 {
 	Game Doom
 	Radius 16
@@ -69,7 +69,7 @@ ACTOR TallGreenColumn 30
 
 // Short green column ------------------------------------------------------
 
-ACTOR ShortGreenColumn 31
+ACTOR ShortGreenColumn
 {
 	Game Doom
 	Radius 16
@@ -86,7 +86,7 @@ ACTOR ShortGreenColumn 31
 
 // Tall red column ---------------------------------------------------------
 
-ACTOR TallRedColumn 32
+ACTOR TallRedColumn
 {
 	Game Doom
 	Radius 16
@@ -103,7 +103,7 @@ ACTOR TallRedColumn 32
 
 // Short red column --------------------------------------------------------
 
-ACTOR ShortRedColumn 33
+ACTOR ShortRedColumn
 {
 	Game Doom
 	Radius 16
@@ -120,7 +120,7 @@ ACTOR ShortRedColumn 33
 
 // Skull column ------------------------------------------------------------
 
-ACTOR SkullColumn 37
+ACTOR SkullColumn
 {
 	Game Doom
 	Radius 16
@@ -137,7 +137,7 @@ ACTOR SkullColumn 37
 
 // Heart column ------------------------------------------------------------
 
-ACTOR HeartColumn 36
+ACTOR HeartColumn
 {
 	Game Doom
 	Radius 16
@@ -154,7 +154,7 @@ ACTOR HeartColumn 36
 
 // Evil eye ----------------------------------------------------------------
 
-ACTOR EvilEye 41
+ACTOR EvilEye
 {
 	Game Doom
 	Radius 16
@@ -171,7 +171,7 @@ ACTOR EvilEye 41
 
 // Floating skull ----------------------------------------------------------
 
-ACTOR FloatingSkull 42
+ACTOR FloatingSkull
 {
 	Game Doom
 	Radius 16
@@ -188,7 +188,7 @@ ACTOR FloatingSkull 42
 
 // Torch tree --------------------------------------------------------------
 
-ACTOR TorchTree 43
+ACTOR TorchTree
 {
 	Game Doom
 	Radius 16
@@ -205,7 +205,7 @@ ACTOR TorchTree 43
 
 // Blue torch --------------------------------------------------------------
 
-ACTOR BlueTorch 44
+ACTOR BlueTorch
 {
 	Game Doom
 	Radius 16
@@ -222,7 +222,7 @@ ACTOR BlueTorch 44
 
 // Green torch -------------------------------------------------------------
 
-ACTOR GreenTorch 45
+ACTOR GreenTorch
 {
 	Game Doom
 	Radius 16
@@ -239,7 +239,7 @@ ACTOR GreenTorch 45
 
 // Red torch ---------------------------------------------------------------
 
-ACTOR RedTorch 46
+ACTOR RedTorch
 {
 	Game Doom
 	Radius 16
@@ -256,7 +256,7 @@ ACTOR RedTorch 46
 
 // Short blue torch --------------------------------------------------------
 
-ACTOR ShortBlueTorch 55
+ACTOR ShortBlueTorch
 {
 	Game Doom
 	Radius 16
@@ -273,7 +273,7 @@ ACTOR ShortBlueTorch 55
 
 // Short green torch -------------------------------------------------------
 
-ACTOR ShortGreenTorch 56
+ACTOR ShortGreenTorch
 {
 	Game Doom
 	Radius 16
@@ -290,7 +290,7 @@ ACTOR ShortGreenTorch 56
 
 // Short red torch ---------------------------------------------------------
 
-ACTOR ShortRedTorch 57
+ACTOR ShortRedTorch
 {
 	Game Doom
 	Radius 16
@@ -307,7 +307,7 @@ ACTOR ShortRedTorch 57
 
 // Stalagtite --------------------------------------------------------------
 
-ACTOR Stalagtite 47
+ACTOR Stalagtite
 {
 	Game Doom
 	Radius 16
@@ -324,7 +324,7 @@ ACTOR Stalagtite 47
 
 // Tech pillar -------------------------------------------------------------
 
-ACTOR TechPillar 48
+ACTOR TechPillar
 {
 	Game Doom
 	Radius 16
@@ -341,7 +341,7 @@ ACTOR TechPillar 48
 
 // Candle stick ------------------------------------------------------------
 
-ACTOR Candlestick 34
+ACTOR Candlestick
 {
 	Game Doom
 	Radius 20
@@ -357,7 +357,7 @@ ACTOR Candlestick 34
 
 // Candelabra --------------------------------------------------------------
 
-ACTOR Candelabra 35
+ACTOR Candelabra
 {
 	Game Doom
 	Radius 16
@@ -374,7 +374,7 @@ ACTOR Candelabra 35
 
 // Bloody twitch -----------------------------------------------------------
 
-ACTOR BloodyTwitch 49
+ACTOR BloodyTwitch
 {
 	Game Doom
 	Radius 16
@@ -395,7 +395,7 @@ ACTOR BloodyTwitch 49
 
 // Meat 2 ------------------------------------------------------------------
 
-ACTOR Meat2 50
+ACTOR Meat2
 {
 	Game Doom
 	Radius 16
@@ -413,7 +413,7 @@ ACTOR Meat2 50
 
 // Meat 3 ------------------------------------------------------------------
 
-ACTOR Meat3 51
+ACTOR Meat3
 {
 	Game Doom
 	Radius 16
@@ -431,7 +431,7 @@ ACTOR Meat3 51
 
 // Meat 4 ------------------------------------------------------------------
 
-ACTOR Meat4 52
+ACTOR Meat4
 {
 	Game Doom
 	Radius 16
@@ -449,7 +449,7 @@ ACTOR Meat4 52
 
 // Meat 5 ------------------------------------------------------------------
 
-ACTOR Meat5 53
+ACTOR Meat5
 {
 	Game Doom
 	Radius 16
@@ -467,28 +467,28 @@ ACTOR Meat5 53
 
 // Nonsolid meat -----------------------------------------------------------
 
-ACTOR NonsolidMeat2 : Meat2 59
+ACTOR NonsolidMeat2 : Meat2
 {
 	Game Doom
 	-SOLID
 	Radius 20
 }
 
-ACTOR NonsolidMeat3 : Meat3 61
+ACTOR NonsolidMeat3 : Meat3
 {
 	Game Doom
 	-SOLID
 	Radius 20
 }
 
-ACTOR NonsolidMeat4 : Meat4 60
+ACTOR NonsolidMeat4 : Meat4
 {
 	Game Doom
 	-SOLID
 	Radius 20
 }
 
-ACTOR NonsolidMeat5 : Meat5 62
+ACTOR NonsolidMeat5 : Meat5
 {
 	Game Doom
 	-SOLID
@@ -497,7 +497,7 @@ ACTOR NonsolidMeat5 : Meat5 62
 
 // Nonsolid bloody twitch --------------------------------------------------
 
-ACTOR NonsolidTwitch : BloodyTwitch 63
+ACTOR NonsolidTwitch : BloodyTwitch
 {
 	Game Doom
 	-SOLID
@@ -506,7 +506,7 @@ ACTOR NonsolidTwitch : BloodyTwitch 63
 
 // Head on a stick ---------------------------------------------------------
 
-ACTOR HeadOnAStick 27
+ACTOR HeadOnAStick
 {
 	Game Doom
 	Radius 16
@@ -523,7 +523,7 @@ ACTOR HeadOnAStick 27
 
 // Heads (plural!) on a stick ----------------------------------------------
 
-ACTOR HeadsOnAStick 28
+ACTOR HeadsOnAStick
 {
 	Game Doom
 	Radius 16
@@ -540,7 +540,7 @@ ACTOR HeadsOnAStick 28
 
 // Head candles ------------------------------------------------------------
 
-ACTOR HeadCandles 29
+ACTOR HeadCandles
 {
 	Game Doom
 	Radius 16
@@ -557,7 +557,7 @@ ACTOR HeadCandles 29
 
 // Dead on a stick ---------------------------------------------------------
 
-ACTOR DeadStick 25
+ACTOR DeadStick
 {
 	Game Doom
 	Radius 16
@@ -574,7 +574,7 @@ ACTOR DeadStick 25
 
 // Still alive on a stick --------------------------------------------------
 
-ACTOR LiveStick 26
+ACTOR LiveStick
 {
 	Game Doom
 	Radius 16
@@ -592,7 +592,7 @@ ACTOR LiveStick 26
 
 // Big tree ----------------------------------------------------------------
 
-ACTOR BigTree 54
+ACTOR BigTree
 {
 	Game Doom
 	Radius 32
@@ -609,7 +609,7 @@ ACTOR BigTree 54
 
 // Burning barrel ----------------------------------------------------------
 
-ACTOR BurningBarrel 70
+ACTOR BurningBarrel
 {
 	Game Doom
 	SpawnID 149
@@ -627,7 +627,7 @@ ACTOR BurningBarrel 70
 
 // Hanging with no guts ----------------------------------------------------
 
-ACTOR HangNoGuts 73
+ACTOR HangNoGuts
 {
 	Game Doom
 	Radius 16
@@ -645,7 +645,7 @@ ACTOR HangNoGuts 73
 
 // Hanging from bottom with no brain ---------------------------------------
 
-ACTOR HangBNoBrain 74
+ACTOR HangBNoBrain
 {
 	Game Doom
 	Radius 16
@@ -663,7 +663,7 @@ ACTOR HangBNoBrain 74
 
 // Hanging from top, looking down ------------------------------------------
 
-ACTOR HangTLookingDown 75
+ACTOR HangTLookingDown
 {
 	Game Doom
 	Radius 16
@@ -681,7 +681,7 @@ ACTOR HangTLookingDown 75
 
 // Hanging from top, looking up --------------------------------------------
 
-ACTOR HangTLookingUp 77
+ACTOR HangTLookingUp
 {
 	Game Doom
 	Radius 16
@@ -699,7 +699,7 @@ ACTOR HangTLookingUp 77
 
 // Hanging from top, skully ------------------------------------------------
 
-ACTOR HangTSkull 76
+ACTOR HangTSkull
 {
 	Game Doom
 	Radius 16
@@ -717,7 +717,7 @@ ACTOR HangTSkull 76
 
 // Hanging from top without a brain ----------------------------------------
 
-ACTOR HangTNoBrain 78
+ACTOR HangTNoBrain
 {
 	Game Doom
 	Radius 16
@@ -735,7 +735,7 @@ ACTOR HangTNoBrain 78
 
 // Colon gibs --------------------------------------------------------------
 
-ACTOR ColonGibs 79
+ACTOR ColonGibs
 {
 	Game Doom
 	SpawnID 147
@@ -753,7 +753,7 @@ ACTOR ColonGibs 79
 
 // Small pool o' blood -----------------------------------------------------
 
-ACTOR SmallBloodPool 80
+ACTOR SmallBloodPool
 {
 	Game Doom
 	SpawnID 148
@@ -771,7 +771,7 @@ ACTOR SmallBloodPool 80
 
 // brain stem lying on the ground ------------------------------------------
 
-ACTOR BrainStem 81
+ACTOR BrainStem
 {
 	Game Doom
 	SpawnID 150
@@ -790,7 +790,7 @@ ACTOR BrainStem 81
 
 // Grey stalagmite (unused Doom sprite, definition taken from Skulltag -----
 
-ACTOR Stalagmite 5050
+ACTOR Stalagmite
 {
 	Game Doom
 	Radius 16
diff --git a/wadsrc/static/actors/doom/doomhealth.txt b/wadsrc/static/actors/doom/doomhealth.txt
index dce00ace9..bc68c1017 100644
--- a/wadsrc/static/actors/doom/doomhealth.txt
+++ b/wadsrc/static/actors/doom/doomhealth.txt
@@ -1,6 +1,6 @@
 // Health bonus -------------------------------------------------------------
 
-ACTOR HealthBonus : Health 2014
+ACTOR HealthBonus : Health
 {
 	Game Doom
 	SpawnID 152
@@ -19,7 +19,7 @@ ACTOR HealthBonus : Health 2014
 	
 // Stimpack -----------------------------------------------------------------
 
-ACTOR Stimpack : Health 2011
+ACTOR Stimpack : Health
 {
 	Game Doom
 	SpawnID 23
@@ -35,7 +35,7 @@ ACTOR Stimpack : Health 2011
 
 // Medikit -----------------------------------------------------------------
 
-ACTOR Medikit : Health 2012
+ACTOR Medikit : Health
 {
 	Game Doom
 	SpawnID 24
diff --git a/wadsrc/static/actors/doom/doomimp.txt b/wadsrc/static/actors/doom/doomimp.txt
index d91227484..0cf3665c8 100644
--- a/wadsrc/static/actors/doom/doomimp.txt
+++ b/wadsrc/static/actors/doom/doomimp.txt
@@ -3,7 +3,7 @@
 // Imp
 //
 //===========================================================================
-ACTOR DoomImp 3001
+ACTOR DoomImp
 {
 	Game Doom
 	SpawnID 5
diff --git a/wadsrc/static/actors/doom/doomkeys.txt b/wadsrc/static/actors/doom/doomkeys.txt
index 9072582d1..0b61af192 100644
--- a/wadsrc/static/actors/doom/doomkeys.txt
+++ b/wadsrc/static/actors/doom/doomkeys.txt
@@ -8,7 +8,7 @@ Actor DoomKey : Key
 
 // Blue key card ------------------------------------------------------------
 
-Actor BlueCard : DoomKey 5
+Actor BlueCard : DoomKey
 {
 	Game Doom
 	SpawnID 85
@@ -25,7 +25,7 @@ Actor BlueCard : DoomKey 5
 
 // Yellow key card ----------------------------------------------------------
 
-Actor YellowCard : DoomKey 6
+Actor YellowCard : DoomKey
 {
 	Game Doom
 	SpawnID 87
@@ -42,7 +42,7 @@ Actor YellowCard : DoomKey 6
 
 // Red key card -------------------------------------------------------------
 
-Actor RedCard : DoomKey 13
+Actor RedCard : DoomKey
 {
 	Game Doom
 	SpawnID 86
@@ -59,7 +59,7 @@ Actor RedCard : DoomKey 13
 
 // Blue skull key -----------------------------------------------------------
 
-Actor BlueSkull : DoomKey 40
+Actor BlueSkull : DoomKey
 {
 	Game Doom
 	SpawnID 90
@@ -76,7 +76,7 @@ Actor BlueSkull : DoomKey 40
 
 // Yellow skull key ---------------------------------------------------------
 
-Actor YellowSkull : DoomKey 39
+Actor YellowSkull : DoomKey
 {
 	Game Doom
 	SpawnID 88
@@ -93,7 +93,7 @@ Actor YellowSkull : DoomKey 39
 
 // Red skull key ------------------------------------------------------------
 
-Actor RedSkull : DoomKey 38
+Actor RedSkull : DoomKey
 {
 	Game Doom
 	SpawnID 89
diff --git a/wadsrc/static/actors/doom/doommisc.txt b/wadsrc/static/actors/doom/doommisc.txt
index fadab2b05..0727726f8 100644
--- a/wadsrc/static/actors/doom/doommisc.txt
+++ b/wadsrc/static/actors/doom/doommisc.txt
@@ -1,6 +1,6 @@
 // The barrel of green goop ------------------------------------------------
 
-ACTOR ExplosiveBarrel 2035
+ACTOR ExplosiveBarrel
 {
 	Game Doom
 	SpawnID 125
@@ -85,7 +85,7 @@ ACTOR DoomUnusedStates
 
 // MBF Beta emulation items
 
-Actor EvilSceptre : ScoreItem 2016
+Actor EvilSceptre : ScoreItem
 {
 	Game Doom
 	Inventory.PickupMessage "$BETA_BONUS3"
@@ -97,7 +97,7 @@ Actor EvilSceptre : ScoreItem 2016
 	}
 }
 
-Actor UnholyBible : ScoreItem 2017
+Actor UnholyBible : ScoreItem
 {
 	Game Doom
 	Inventory.PickupMessage "$BETA_BONUS4"
diff --git a/wadsrc/static/actors/doom/doomweapons.txt b/wadsrc/static/actors/doom/doomweapons.txt
index 8be33c0ca..ece9da40a 100644
--- a/wadsrc/static/actors/doom/doomweapons.txt
+++ b/wadsrc/static/actors/doom/doomweapons.txt
@@ -52,7 +52,7 @@ ACTOR Fist : Weapon
 //
 // --------------------------------------------------------------------------
 
-ACTOR Pistol : DoomWeapon 5010
+ACTOR Pistol : DoomWeapon
 {
 	Game Doom
 	Weapon.SelectionOrder 1900
@@ -97,7 +97,7 @@ ACTOR Pistol : DoomWeapon 5010
 //
 // --------------------------------------------------------------------------
 
-ACTOR Chainsaw : Weapon 2005
+ACTOR Chainsaw : Weapon
 {
 	Game Doom
 	SpawnID 32
@@ -137,7 +137,7 @@ ACTOR Chainsaw : Weapon 2005
 //
 // --------------------------------------------------------------------------
 
-ACTOR Shotgun : DoomWeapon 2001
+ACTOR Shotgun : DoomWeapon
 {
 	Game Doom
 	SpawnID 27
@@ -184,7 +184,7 @@ ACTOR Shotgun : DoomWeapon 2001
 //
 // --------------------------------------------------------------------------
 
-ACTOR SuperShotgun : DoomWeapon 82
+ACTOR SuperShotgun : DoomWeapon
 {
 	Game Doom
 	SpawnID 33
@@ -238,7 +238,7 @@ ACTOR SuperShotgun : DoomWeapon 82
 //
 // --------------------------------------------------------------------------
 
-ACTOR Chaingun : DoomWeapon 2002
+ACTOR Chaingun : DoomWeapon
 {
 	Game Doom
 	SpawnID 28
@@ -281,7 +281,7 @@ ACTOR Chaingun : DoomWeapon 2002
 //
 // --------------------------------------------------------------------------
 
-ACTOR RocketLauncher : DoomWeapon 2003
+ACTOR RocketLauncher : DoomWeapon
 {
 	Game Doom
 	SpawnID 29
@@ -404,7 +404,7 @@ ACTOR Grenade
 //
 // --------------------------------------------------------------------------
 
-ACTOR PlasmaRifle : DoomWeapon 2004
+ACTOR PlasmaRifle : DoomWeapon
 {
 	Game Doom
 	SpawnID 30
@@ -508,7 +508,7 @@ ACTOR PlasmaBall2 : PlasmaBall1
 //
 // --------------------------------------------------------------------------
 
-ACTOR BFG9000 : DoomWeapon 2006
+ACTOR BFG9000 : DoomWeapon
 {
 	Game Doom
 	Height 20
diff --git a/wadsrc/static/actors/doom/fatso.txt b/wadsrc/static/actors/doom/fatso.txt
index 63ae511aa..b77f05b13 100644
--- a/wadsrc/static/actors/doom/fatso.txt
+++ b/wadsrc/static/actors/doom/fatso.txt
@@ -3,7 +3,7 @@
 // Mancubus
 //
 //===========================================================================
-ACTOR Fatso 67
+ACTOR Fatso
 {
 	Game Doom
 	SpawnID 112
diff --git a/wadsrc/static/actors/doom/keen.txt b/wadsrc/static/actors/doom/keen.txt
index fef060435..2bdd2b343 100644
--- a/wadsrc/static/actors/doom/keen.txt
+++ b/wadsrc/static/actors/doom/keen.txt
@@ -3,7 +3,7 @@
 // Commander Keen
 //
 //===========================================================================
-ACTOR CommanderKeen 72
+ACTOR CommanderKeen
 {
 	Game Doom
 	Health 100
diff --git a/wadsrc/static/actors/doom/lostsoul.txt b/wadsrc/static/actors/doom/lostsoul.txt
index beb9ef4dd..f84d85488 100644
--- a/wadsrc/static/actors/doom/lostsoul.txt
+++ b/wadsrc/static/actors/doom/lostsoul.txt
@@ -3,7 +3,7 @@
 // Lost Soul
 //
 //===========================================================================
-ACTOR LostSoul 3006
+ACTOR LostSoul
 {
 	Game Doom
 	SpawnID 110
@@ -50,7 +50,7 @@ ACTOR LostSoul 3006
 	}
 }
 
-Actor BetaSkull : LostSoul 9037
+Actor BetaSkull : LostSoul
 {
 	States
 	{
diff --git a/wadsrc/static/actors/doom/painelemental.txt b/wadsrc/static/actors/doom/painelemental.txt
index e8e359cf3..45d8afccd 100644
--- a/wadsrc/static/actors/doom/painelemental.txt
+++ b/wadsrc/static/actors/doom/painelemental.txt
@@ -3,7 +3,7 @@
 // Pain Elemental
 //
 //===========================================================================
-ACTOR PainElemental 71
+ACTOR PainElemental
 {
 	Game Doom
 	SpawnID 115
diff --git a/wadsrc/static/actors/doom/possessed.txt b/wadsrc/static/actors/doom/possessed.txt
index 62a41a80a..42279317d 100644
--- a/wadsrc/static/actors/doom/possessed.txt
+++ b/wadsrc/static/actors/doom/possessed.txt
@@ -4,7 +4,7 @@
 // Zombie man
 //
 //===========================================================================
-ACTOR ZombieMan 3004
+ACTOR ZombieMan
 {
 	Game Doom
 	SpawnID 4
@@ -65,7 +65,7 @@ ACTOR ZombieMan 3004
 // Sergeant / Shotgun guy
 //
 //===========================================================================
-ACTOR ShotgunGuy 9
+ACTOR ShotgunGuy
 {
 	Game Doom
 	SpawnID 1
@@ -127,7 +127,7 @@ ACTOR ShotgunGuy 9
 // Chaingunner
 //
 //===========================================================================
-ACTOR ChaingunGuy 65
+ACTOR ChaingunGuy
 {
 	Game Doom
 	SpawnID 2
@@ -189,7 +189,7 @@ ACTOR ChaingunGuy 65
 // SS Nazi
 //
 //===========================================================================
-ACTOR WolfensteinSS 84
+ACTOR WolfensteinSS
 {
 	Game Doom
 	SpawnID 116
diff --git a/wadsrc/static/actors/doom/revenant.txt b/wadsrc/static/actors/doom/revenant.txt
index 5ef97789b..1d6b318c7 100644
--- a/wadsrc/static/actors/doom/revenant.txt
+++ b/wadsrc/static/actors/doom/revenant.txt
@@ -3,7 +3,7 @@
 // Revenant
 //
 //===========================================================================
-ACTOR Revenant 66
+ACTOR Revenant
 {
 	Game Doom
 	SpawnID 20
diff --git a/wadsrc/static/actors/doom/scriptedmarine.txt b/wadsrc/static/actors/doom/scriptedmarine.txt
index fecd0ac0d..6c5854ac7 100644
--- a/wadsrc/static/actors/doom/scriptedmarine.txt
+++ b/wadsrc/static/actors/doom/scriptedmarine.txt
@@ -1,7 +1,7 @@
 
 // Scriptable marine -------------------------------------------------------
 
-ACTOR ScriptedMarine 9100 native
+ACTOR ScriptedMarine native
 {
 	Game Doom
 	SpawnID 151
@@ -172,7 +172,7 @@ ACTOR ScriptedMarine 9100 native
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineFist : ScriptedMarine 9101
+ACTOR MarineFist : ScriptedMarine
 {
 	Game Doom
 	States
@@ -187,7 +187,7 @@ ACTOR MarineFist : ScriptedMarine 9101
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineBerserk : MarineFist 9102
+ACTOR MarineBerserk : MarineFist
 {
 	Game Doom
 	States
@@ -200,7 +200,7 @@ ACTOR MarineBerserk : MarineFist 9102
 }
 //---------------------------------------------------------------------------
 
-ACTOR MarineChainsaw : ScriptedMarine 9103
+ACTOR MarineChainsaw : ScriptedMarine
 {
 	Game Doom
 	States
@@ -216,7 +216,7 @@ ACTOR MarineChainsaw : ScriptedMarine 9103
 
 //---------------------------------------------------------------------------
 
-ACTOR MarinePistol : ScriptedMarine 9104
+ACTOR MarinePistol : ScriptedMarine
 {
 	Game Doom
 	States
@@ -229,7 +229,7 @@ ACTOR MarinePistol : ScriptedMarine 9104
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineShotgun : ScriptedMarine 9105
+ACTOR MarineShotgun : ScriptedMarine
 {
 	Game Doom
 	States
@@ -244,7 +244,7 @@ ACTOR MarineShotgun : ScriptedMarine 9105
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineSSG : ScriptedMarine 9106
+ACTOR MarineSSG : ScriptedMarine
 {
 	Game Doom
 	States
@@ -256,7 +256,7 @@ ACTOR MarineSSG : ScriptedMarine 9106
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineChaingun : ScriptedMarine 9107
+ACTOR MarineChaingun : ScriptedMarine
 {
 	Game Doom
 	States
@@ -269,7 +269,7 @@ ACTOR MarineChaingun : ScriptedMarine 9107
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineRocket : MarineFist 9108
+ACTOR MarineRocket : MarineFist
 {
 	Game Doom
 	States
@@ -282,7 +282,7 @@ ACTOR MarineRocket : MarineFist 9108
 
 //---------------------------------------------------------------------------
 
-ACTOR MarinePlasma : ScriptedMarine 9109
+ACTOR MarinePlasma : ScriptedMarine
 {
 	Game Doom
 	States
@@ -295,7 +295,7 @@ ACTOR MarinePlasma : ScriptedMarine 9109
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineRailgun : ScriptedMarine 9110
+ACTOR MarineRailgun : ScriptedMarine
 {
 	Game Doom
 	States
@@ -308,7 +308,7 @@ ACTOR MarineRailgun : ScriptedMarine 9110
 
 //---------------------------------------------------------------------------
 
-ACTOR MarineBFG : ScriptedMarine 9111
+ACTOR MarineBFG : ScriptedMarine
 {
 	Game Doom
 	States
diff --git a/wadsrc/static/actors/doom/spidermaster.txt b/wadsrc/static/actors/doom/spidermaster.txt
index d2939c8ea..8da894245 100644
--- a/wadsrc/static/actors/doom/spidermaster.txt
+++ b/wadsrc/static/actors/doom/spidermaster.txt
@@ -3,7 +3,7 @@
 // Spider boss
 //
 //===========================================================================
-ACTOR SpiderMastermind 7
+ACTOR SpiderMastermind
 {
 	Game Doom
 	SpawnID 7
diff --git a/wadsrc/static/actors/doom/stealthmonsters.txt b/wadsrc/static/actors/doom/stealthmonsters.txt
index f5d7ae31b..5cc859ee0 100644
--- a/wadsrc/static/actors/doom/stealthmonsters.txt
+++ b/wadsrc/static/actors/doom/stealthmonsters.txt
@@ -1,5 +1,5 @@
 
-ACTOR StealthArachnotron : Arachnotron 9050
+ACTOR StealthArachnotron : Arachnotron
 {
 	Game Doom
 	SpawnID 117
@@ -9,7 +9,7 @@ ACTOR StealthArachnotron : Arachnotron 9050
 	Obituary "$OB_STEALTHBABY"
 }
 
-ACTOR StealthArchvile : Archvile 9051
+ACTOR StealthArchvile : Archvile
 {
 	Game Doom
 	SpawnID 118
@@ -19,7 +19,7 @@ ACTOR StealthArchvile : Archvile 9051
 	Obituary "$OB_STEALTHVILE"
 }
 
-ACTOR StealthBaron : BaronOfHell 9052
+ACTOR StealthBaron : BaronOfHell
 {
 	Game Doom
 	SpawnID 100
@@ -30,7 +30,7 @@ ACTOR StealthBaron : BaronOfHell 9052
 	HitObituary "$OB_STEALTHBARON"
 }
 
-ACTOR StealthCacodemon : Cacodemon 9053
+ACTOR StealthCacodemon : Cacodemon
 {
 	Game Doom
 	SpawnID 119
@@ -41,7 +41,7 @@ ACTOR StealthCacodemon : Cacodemon 9053
 	HitObituary "$OB_STEALTHCACO"
 }
 
-ACTOR StealthChaingunGuy : ChaingunGuy 9054
+ACTOR StealthChaingunGuy : ChaingunGuy
 {
 	Game Doom
 	SpawnID 120
@@ -51,7 +51,7 @@ ACTOR StealthChaingunGuy : ChaingunGuy 9054
 	Obituary "$OB_STEALTHCHAINGUY"
 }
 
-ACTOR StealthDemon : Demon 9055
+ACTOR StealthDemon : Demon
 {
 	Game Doom
 	SpawnID 121
@@ -62,7 +62,7 @@ ACTOR StealthDemon : Demon 9055
 	HitObituary "$OB_STEALTHDEMON"
 }
 
-ACTOR StealthHellKnight : HellKnight 9056
+ACTOR StealthHellKnight : HellKnight
 {
 	Game Doom
 	SpawnID 101
@@ -73,7 +73,7 @@ ACTOR StealthHellKnight : HellKnight 9056
 	HitObituary "$OB_STEALTHKNIGHT"
 }
 
-ACTOR StealthDoomImp : DoomImp 9057
+ACTOR StealthDoomImp : DoomImp
 {
 	Game Doom
 	SpawnID 122
@@ -84,7 +84,7 @@ ACTOR StealthDoomImp : DoomImp 9057
 	HitObituary "$OB_STEALTHIMP"
 }
 
-ACTOR StealthFatso : Fatso 9058
+ACTOR StealthFatso : Fatso
 {
 	Game Doom
 	SpawnID 123
@@ -94,7 +94,7 @@ ACTOR StealthFatso : Fatso 9058
 	Obituary "$OB_STEALTHFATSO"
 }
 
-ACTOR StealthRevenant : Revenant 9059
+ACTOR StealthRevenant : Revenant
 {
 	Game Doom
 	SpawnID 124
@@ -105,7 +105,7 @@ ACTOR StealthRevenant : Revenant 9059
 	HitObituary "$OB_STEALTHUNDEAD"
 }
 
-ACTOR StealthShotgunGuy : ShotgunGuy 9060
+ACTOR StealthShotgunGuy : ShotgunGuy
 {
 	Game Doom
 	SpawnID 103
@@ -115,7 +115,7 @@ ACTOR StealthShotgunGuy : ShotgunGuy 9060
 	Obituary "$OB_STEALTHSHOTGUNGUY"
 }
 
-ACTOR StealthZombieMan : ZombieMan 9061
+ACTOR StealthZombieMan : ZombieMan
 {
 	Game Doom
 	SpawnID 102
diff --git a/wadsrc/static/actors/heretic/beast.txt b/wadsrc/static/actors/heretic/beast.txt
index 7f54c3442..956f16dca 100644
--- a/wadsrc/static/actors/heretic/beast.txt
+++ b/wadsrc/static/actors/heretic/beast.txt
@@ -1,7 +1,7 @@
 
 // Beast --------------------------------------------------------------------
 
-ACTOR Beast 70
+ACTOR Beast
 {
 	Game Heretic
 	SpawnID 3
diff --git a/wadsrc/static/actors/heretic/clink.txt b/wadsrc/static/actors/heretic/clink.txt
index ec8cf6b9c..dd3bb4c85 100644
--- a/wadsrc/static/actors/heretic/clink.txt
+++ b/wadsrc/static/actors/heretic/clink.txt
@@ -1,5 +1,5 @@
 
-ACTOR Clink 90
+ACTOR Clink
 {
 	Game Heretic
 	SpawnID 1
diff --git a/wadsrc/static/actors/heretic/dsparil.txt b/wadsrc/static/actors/heretic/dsparil.txt
index 6ecef5b5c..2b2efe3c6 100644
--- a/wadsrc/static/actors/heretic/dsparil.txt
+++ b/wadsrc/static/actors/heretic/dsparil.txt
@@ -1,7 +1,7 @@
 
 // Boss spot ----------------------------------------------------------------
 
-ACTOR BossSpot : SpecialSpot 56
+ACTOR BossSpot : SpecialSpot
 {
 	Game Heretic
 	SpawnID 141
@@ -10,7 +10,7 @@ ACTOR BossSpot : SpecialSpot 56
 
 // Sorcerer (D'Sparil on his serpent) ---------------------------------------
 
-ACTOR Sorcerer1 7
+ACTOR Sorcerer1
 {
 	Game Heretic
 	SpawnID 142
diff --git a/wadsrc/static/actors/heretic/hereticammo.txt b/wadsrc/static/actors/heretic/hereticammo.txt
index 96a20352b..ee17bbdc8 100644
--- a/wadsrc/static/actors/heretic/hereticammo.txt
+++ b/wadsrc/static/actors/heretic/hereticammo.txt
@@ -1,7 +1,7 @@
 
 // Wimpy ammo ---------------------------------------------------------------
 
-ACTOR GoldWandAmmo : Ammo 10
+ACTOR GoldWandAmmo : Ammo
 {
 	Game Heretic
 	SpawnID 11
@@ -21,7 +21,7 @@ ACTOR GoldWandAmmo : Ammo 10
 
 // Hefty ammo ---------------------------------------------------------------
 
-ACTOR GoldWandHefty : GoldWandAmmo 12
+ACTOR GoldWandHefty : GoldWandAmmo
 {
 	Game Heretic
 	SpawnID 12
@@ -36,7 +36,7 @@ ACTOR GoldWandHefty : GoldWandAmmo 12
 }
 // Wimpy ammo ---------------------------------------------------------------
 
-ACTOR CrossbowAmmo : Ammo 18
+ACTOR CrossbowAmmo : Ammo
 {
 	Game Heretic
 	SpawnID 33
@@ -56,7 +56,7 @@ ACTOR CrossbowAmmo : Ammo 18
 
 // Hefty ammo ---------------------------------------------------------------
 
-ACTOR CrossbowHefty : CrossbowAmmo 19
+ACTOR CrossbowHefty : CrossbowAmmo
 {
 	Game Heretic
 	SpawnID 34
@@ -71,7 +71,7 @@ ACTOR CrossbowHefty : CrossbowAmmo 19
 }
 // Wimpy ammo ---------------------------------------------------------------
 
-ACTOR MaceAmmo : Ammo 13
+ACTOR MaceAmmo : Ammo
 {
 	Game Heretic
 	SpawnID 35
@@ -91,7 +91,7 @@ ACTOR MaceAmmo : Ammo 13
 
 // Hefty ammo ---------------------------------------------------------------
 
-ACTOR MaceHefty : MaceAmmo 16
+ACTOR MaceHefty : MaceAmmo
 {
 	Game Heretic
 	SpawnID 36
@@ -107,7 +107,7 @@ ACTOR MaceHefty : MaceAmmo 16
 
 // Wimpy ammo ---------------------------------------------------------------
 
-ACTOR BlasterAmmo : Ammo 54
+ACTOR BlasterAmmo : Ammo
 {
 	Game Heretic
 	SpawnID 37
@@ -127,7 +127,7 @@ ACTOR BlasterAmmo : Ammo 54
 
 // Hefty ammo ---------------------------------------------------------------
 
-ACTOR BlasterHefty : BlasterAmmo 55
+ACTOR BlasterHefty : BlasterAmmo
 {
 	Game Heretic
 	SpawnID 38
@@ -143,7 +143,7 @@ ACTOR BlasterHefty : BlasterAmmo 55
 
 // Wimpy ammo ---------------------------------------------------------------
 
-ACTOR SkullRodAmmo : Ammo 20
+ACTOR SkullRodAmmo : Ammo
 {
 	Game Heretic
 	SpawnID 158
@@ -163,7 +163,7 @@ ACTOR SkullRodAmmo : Ammo 20
 
 // Hefty ammo ---------------------------------------------------------------
 
-ACTOR SkullRodHefty : SkullRodAmmo 21
+ACTOR SkullRodHefty : SkullRodAmmo
 {
 	Game Heretic
 	SpawnID 159
@@ -179,7 +179,7 @@ ACTOR SkullRodHefty : SkullRodAmmo 21
 
 // Wimpy ammo ---------------------------------------------------------------
 
-ACTOR PhoenixRodAmmo : Ammo 22
+ACTOR PhoenixRodAmmo : Ammo
 {
 	Game Heretic
 	SpawnID 161
@@ -198,7 +198,7 @@ ACTOR PhoenixRodAmmo : Ammo 22
 }
 // Hefty ammo ---------------------------------------------------------------
 
-ACTOR PhoenixRodHefty : PhoenixRodAmmo 23
+ACTOR PhoenixRodHefty : PhoenixRodAmmo
 {
 	Game Heretic
 	SpawnID 162
@@ -214,7 +214,7 @@ ACTOR PhoenixRodHefty : PhoenixRodAmmo 23
 
 // --- Bag of holding -------------------------------------------------------
 
-ACTOR BagOfHolding : BackpackItem 8
+ACTOR BagOfHolding : BackpackItem
 {
 	Game Heretic
 	SpawnID 136
diff --git a/wadsrc/static/actors/heretic/hereticarmor.txt b/wadsrc/static/actors/heretic/hereticarmor.txt
index e027f4f47..5f2658d9d 100644
--- a/wadsrc/static/actors/heretic/hereticarmor.txt
+++ b/wadsrc/static/actors/heretic/hereticarmor.txt
@@ -1,7 +1,7 @@
 
 // Silver Shield (Shield1) --------------------------------------------------
 
-Actor SilverShield : BasicArmorPickup 85
+Actor SilverShield : BasicArmorPickup
 {
 	Game Heretic
 	SpawnID 68
@@ -20,7 +20,7 @@ Actor SilverShield : BasicArmorPickup 85
 
 // Enchanted shield (Shield2) -----------------------------------------------
 
-Actor EnchantedShield : BasicArmorPickup 31
+Actor EnchantedShield : BasicArmorPickup
 {
 	Game Heretic
 	SpawnID 69
diff --git a/wadsrc/static/actors/heretic/hereticartifacts.txt b/wadsrc/static/actors/heretic/hereticartifacts.txt
index 67d3946b9..50f7c45e1 100644
--- a/wadsrc/static/actors/heretic/hereticartifacts.txt
+++ b/wadsrc/static/actors/heretic/hereticartifacts.txt
@@ -1,6 +1,6 @@
 // Super map ----------------------------------------------------------------
 
-ACTOR SuperMap : MapRevealer 35
+ACTOR SuperMap : MapRevealer
 {
 	Game Heretic
 	SpawnID 137
@@ -20,7 +20,7 @@ ACTOR SuperMap : MapRevealer 35
 
 // Invisibility -------------------------------------------------------------
 
-ACTOR ArtiInvisibility : PowerupGiver 75
+ACTOR ArtiInvisibility : PowerupGiver
 {
 	Game Heretic
 	SpawnID 135
@@ -45,7 +45,7 @@ ACTOR ArtiInvisibility : PowerupGiver 75
  
 // Tome of power ------------------------------------------------------------
 
-ACTOR ArtiTomeOfPower : PowerupGiver 86 native
+ACTOR ArtiTomeOfPower : PowerupGiver native
 {
 	Game Heretic
 	SpawnID 134
@@ -88,7 +88,7 @@ ACTOR ActivatedTimeBomb
 }
 
 
-ACTOR ArtiTimeBomb : Inventory 34 native
+ACTOR ArtiTimeBomb : Inventory native
 {
 	Game Heretic
 	SpawnID 72
diff --git a/wadsrc/static/actors/heretic/hereticdecorations.txt b/wadsrc/static/actors/heretic/hereticdecorations.txt
index cb090d0ea..2713d3378 100644
--- a/wadsrc/static/actors/heretic/hereticdecorations.txt
+++ b/wadsrc/static/actors/heretic/hereticdecorations.txt
@@ -1,4 +1,4 @@
-ACTOR SkullHang70 17
+ACTOR SkullHang70
 {
 	Game Heretic
 	Radius 20
@@ -13,7 +13,7 @@ ACTOR SkullHang70 17
 	}
 }
 	
-ACTOR SkullHang60 24
+ACTOR SkullHang60
 {
 	Game Heretic
 	Radius 20
@@ -28,7 +28,7 @@ ACTOR SkullHang60 24
 	}
 }
 	
-ACTOR SkullHang45 25
+ACTOR SkullHang45
 {
 	Game Heretic
 	Radius 20
@@ -43,7 +43,7 @@ ACTOR SkullHang45 25
 	}
 }
 	
-ACTOR SkullHang35 26
+ACTOR SkullHang35
 {
 	Game Heretic
 	Radius 20
@@ -58,7 +58,7 @@ ACTOR SkullHang35 26
 	}
 }
 	
-ACTOR Chandelier 28
+ACTOR Chandelier
 {
 	Game Heretic
 	Radius 20
@@ -73,7 +73,7 @@ ACTOR Chandelier 28
 	}
 }
 
-ACTOR SerpentTorch 27
+ACTOR SerpentTorch
 {
 	Game Heretic
 	Radius 12
@@ -87,7 +87,7 @@ ACTOR SerpentTorch 27
 	}
 }
 
-ACTOR SmallPillar 29
+ACTOR SmallPillar
 {
 	Game Heretic
 	Radius 16
@@ -101,7 +101,7 @@ ACTOR SmallPillar 29
 	}
 }
 
-ACTOR StalagmiteSmall 37
+ACTOR StalagmiteSmall
 {
 	Game Heretic
 	Radius 8
@@ -115,7 +115,7 @@ ACTOR StalagmiteSmall 37
 	}
 }
 
-ACTOR StalagmiteLarge 38
+ACTOR StalagmiteLarge
 {
 	Game Heretic
 	Radius 12
@@ -129,7 +129,7 @@ ACTOR StalagmiteLarge 38
 	}
 }
 
-ACTOR StalactiteSmall 39
+ACTOR StalactiteSmall
 {
 	Game Heretic
 	Radius 8
@@ -145,7 +145,7 @@ ACTOR StalactiteSmall 39
 	}
 }
 
-ACTOR StalactiteLarge 40
+ACTOR StalactiteLarge
 {
 	Game Heretic
 	Radius 12
@@ -161,7 +161,7 @@ ACTOR StalactiteLarge 40
 	}
 }
 
-ACTOR FireBrazier 76
+ACTOR FireBrazier
 {
 	Game Heretic
 	Radius 16
@@ -175,7 +175,7 @@ ACTOR FireBrazier 76
 	}
 }
 
-ACTOR Barrel 44
+ACTOR Barrel
 {
 	Game Heretic
 	Radius 12
@@ -189,7 +189,7 @@ ACTOR Barrel 44
 	}
 }
 
-ACTOR BrownPillar 47
+ACTOR BrownPillar
 {
 	Game Heretic
 	Radius 14
@@ -203,7 +203,7 @@ ACTOR BrownPillar 47
 	}
 }
 
-ACTOR Moss1 48
+ACTOR Moss1
 {
 	Game Heretic
 	Radius 20
@@ -218,7 +218,7 @@ ACTOR Moss1 48
 	}
 }
 
-ACTOR Moss2 49
+ACTOR Moss2
 {
 	Game Heretic
 	Radius 20
@@ -233,7 +233,7 @@ ACTOR Moss2 49
 	}
 }
 
-ACTOR WallTorch 50
+ACTOR WallTorch
 {
 	Game Heretic
 	Radius 6
@@ -248,7 +248,7 @@ ACTOR WallTorch 50
 	}
 }
 
-ACTOR HangingCorpse 51
+ACTOR HangingCorpse
 {
 	Game Heretic
 	Radius 8
diff --git a/wadsrc/static/actors/heretic/hereticimp.txt b/wadsrc/static/actors/heretic/hereticimp.txt
index 2659d248a..9a5c30c63 100644
--- a/wadsrc/static/actors/heretic/hereticimp.txt
+++ b/wadsrc/static/actors/heretic/hereticimp.txt
@@ -1,7 +1,7 @@
 
 // Heretic imp (as opposed to the Doom variety) -----------------------------
 
-ACTOR HereticImp 66
+ACTOR HereticImp
 {
 	Game Heretic
 	SpawnID 5
@@ -78,7 +78,7 @@ ACTOR HereticImp 66
 
 // Heretic imp leader -------------------------------------------------------
 
-ACTOR HereticImpLeader : HereticImp 5
+ACTOR HereticImpLeader : HereticImp
 {
 	Game Heretic
 	SpawnID 7
diff --git a/wadsrc/static/actors/heretic/heretickeys.txt b/wadsrc/static/actors/heretic/heretickeys.txt
index 71beab253..3a34fe144 100644
--- a/wadsrc/static/actors/heretic/heretickeys.txt
+++ b/wadsrc/static/actors/heretic/heretickeys.txt
@@ -8,7 +8,7 @@ ACTOR HereticKey : Key
 
 // Green key ------------------------------------------------------------
 
-ACTOR KeyGreen : HereticKey 73
+ACTOR KeyGreen : HereticKey
 {
 	Game Heretic
 	SpawnID 86
@@ -24,7 +24,7 @@ ACTOR KeyGreen : HereticKey 73
 
 // Blue key -----------------------------------------------------------------
 
-ACTOR KeyBlue : HereticKey 79
+ACTOR KeyBlue : HereticKey
 {
 	Game Heretic
 	SpawnID 85
@@ -40,7 +40,7 @@ ACTOR KeyBlue : HereticKey 79
 
 // Yellow key ---------------------------------------------------------------
 
-ACTOR KeyYellow : HereticKey 80
+ACTOR KeyYellow : HereticKey
 {
 	Game Heretic
 	SpawnID 87
@@ -57,7 +57,7 @@ ACTOR KeyYellow : HereticKey 80
  
 // --- Blue Key gizmo -----------------------------------------------------------
 
-ACTOR KeyGizmoBlue 94
+ACTOR KeyGizmoBlue
 {
 	Game Heretic
 	Radius 16
@@ -89,7 +89,7 @@ ACTOR KeyGizmoFloatBlue
 
 // --- Green Key gizmo -----------------------------------------------------------
 
-ACTOR KeyGizmoGreen 95
+ACTOR KeyGizmoGreen
 {
 	Game Heretic
 	Radius 16
@@ -121,7 +121,7 @@ ACTOR KeyGizmoFloatGreen
 
 // --- Yellow Key gizmo -----------------------------------------------------------
 
-ACTOR KeyGizmoYellow 96
+ACTOR KeyGizmoYellow
 {
 	Game Heretic
 	Radius 16
diff --git a/wadsrc/static/actors/heretic/hereticmisc.txt b/wadsrc/static/actors/heretic/hereticmisc.txt
index b6644e444..5231f819d 100644
--- a/wadsrc/static/actors/heretic/hereticmisc.txt
+++ b/wadsrc/static/actors/heretic/hereticmisc.txt
@@ -1,7 +1,7 @@
 
 // Pod ----------------------------------------------------------------------
 
-ACTOR Pod 2035
+ACTOR Pod
 {
 	Game Heretic
 	SpawnID 125
@@ -62,7 +62,7 @@ ACTOR PodGoo
 
 // Pod generator ------------------------------------------------------------
 
-ACTOR PodGenerator 43
+ACTOR PodGenerator
 {
 	Game Heretic
 	SpawnID 126
@@ -84,7 +84,7 @@ ACTOR PodGenerator 43
 
 // Teleglitter generator 1 --------------------------------------------------
 
-ACTOR TeleGlitterGenerator1 74
+ACTOR TeleGlitterGenerator1
 {
 	Game Heretic
 	SpawnID 166
@@ -102,7 +102,7 @@ ACTOR TeleGlitterGenerator1 74
 
 // Teleglitter generator 2 --------------------------------------------------
 
-ACTOR TeleGlitterGenerator2 52
+ACTOR TeleGlitterGenerator2
 {
 	Game Heretic
 	SpawnID 167
@@ -160,7 +160,7 @@ ACTOR TeleGlitter2 : TeleGlitter1
 
 // --- Volcano --------------------------------------------------------------
 
-ACTOR Volcano 87
+ACTOR Volcano
 {
 	Game Heretic
 	SpawnID 150
diff --git a/wadsrc/static/actors/heretic/hereticweaps.txt b/wadsrc/static/actors/heretic/hereticweaps.txt
index ca85437e0..f41a84f87 100644
--- a/wadsrc/static/actors/heretic/hereticweaps.txt
+++ b/wadsrc/static/actors/heretic/hereticweaps.txt
@@ -110,7 +110,7 @@ ACTOR StaffPuff2
 
 // Gold wand ----------------------------------------------------------------
 
-ACTOR GoldWand : HereticWeapon 9042
+ACTOR GoldWand : HereticWeapon
 {
 	Game Heretic
 	+BLOODSPLATTER
@@ -248,7 +248,7 @@ ACTOR GoldWandPuff2 : GoldWandFX1
 
 // Crossbow -----------------------------------------------------------------
 
-ACTOR Crossbow : HereticWeapon 2001
+ACTOR Crossbow : HereticWeapon
 {
 	Game Heretic
 	SpawnID 27
@@ -400,7 +400,7 @@ ACTOR CrossbowFX4
 
 // Gauntlets ----------------------------------------------------------------
 
-ACTOR Gauntlets : Weapon 2005
+ACTOR Gauntlets : Weapon
 {
 	Game Heretic
 	SpawnID 32
@@ -681,7 +681,7 @@ ACTOR MaceFX4 native
 
 // Mace spawn spot ----------------------------------------------------------
 
-ACTOR MaceSpawner : SpecialSpot 2002
+ACTOR MaceSpawner : SpecialSpot
 {
 	Game Heretic
 	+NOSECTOR
@@ -698,7 +698,7 @@ ACTOR MaceSpawner : SpecialSpot 2002
 
 // Blaster ------------------------------------------------------------------
 
-ACTOR Blaster : HereticWeapon 53
+ACTOR Blaster : HereticWeapon
 {
 	Game Heretic
 	SpawnID 28
@@ -854,7 +854,7 @@ ACTOR BlasterPuff
 
 // Skull (Horn) Rod ---------------------------------------------------------
 
-ACTOR SkullRod : HereticWeapon 2004
+ACTOR SkullRod : HereticWeapon
 {
 	Game Heretic
 	SpawnID 30
@@ -1028,7 +1028,7 @@ ACTOR RainTracker : Inventory native
 
 // Phoenix Rod --------------------------------------------------------------
 
-ACTOR PhoenixRod : Weapon 2003 native
+ACTOR PhoenixRod : Weapon native
 {
 	Game Heretic
 	SpawnID 29
diff --git a/wadsrc/static/actors/heretic/ironlich.txt b/wadsrc/static/actors/heretic/ironlich.txt
index 21234cf52..5d9cfa7c0 100644
--- a/wadsrc/static/actors/heretic/ironlich.txt
+++ b/wadsrc/static/actors/heretic/ironlich.txt
@@ -1,7 +1,7 @@
 
 // Ironlich -----------------------------------------------------------------
 
-ACTOR Ironlich 6
+ACTOR Ironlich
 {
 	Game Heretic
 	SpawnID 20
diff --git a/wadsrc/static/actors/heretic/knight.txt b/wadsrc/static/actors/heretic/knight.txt
index 584bcd72e..55ce2728c 100644
--- a/wadsrc/static/actors/heretic/knight.txt
+++ b/wadsrc/static/actors/heretic/knight.txt
@@ -1,7 +1,7 @@
 
 // Knight -------------------------------------------------------------------
 
-ACTOR Knight 64
+ACTOR Knight
 {
 	Game Heretic
 	SpawnID 6
@@ -60,7 +60,7 @@ ACTOR Knight 64
 
 // Knight ghost -------------------------------------------------------------
 
-ACTOR KnightGhost : Knight 65
+ACTOR KnightGhost : Knight
 {
 	Game Heretic
 	SpawnID 129
diff --git a/wadsrc/static/actors/heretic/mummy.txt b/wadsrc/static/actors/heretic/mummy.txt
index af4ff0c23..57b54c622 100644
--- a/wadsrc/static/actors/heretic/mummy.txt
+++ b/wadsrc/static/actors/heretic/mummy.txt
@@ -1,7 +1,7 @@
 
 // Mummy --------------------------------------------------------------------
 
-ACTOR Mummy 68
+ACTOR Mummy
 {
 	Game Heretic
 	SpawnID 4
@@ -51,7 +51,7 @@ ACTOR Mummy 68
 
 // Mummy leader -------------------------------------------------------------
 
-ACTOR MummyLeader : Mummy 45
+ACTOR MummyLeader : Mummy
 {
 	Game Heretic
 	SpawnID 2
@@ -74,7 +74,7 @@ ACTOR MummyLeader : Mummy 45
 
 // Mummy ghost --------------------------------------------------------------
 
-ACTOR MummyGhost : Mummy 69
+ACTOR MummyGhost : Mummy
 {
 	Game Heretic
 	SpawnID 8
@@ -86,7 +86,7 @@ ACTOR MummyGhost : Mummy 69
 
 // Mummy leader ghost -------------------------------------------------------
 
-ACTOR MummyLeaderGhost : MummyLeader 46
+ACTOR MummyLeaderGhost : MummyLeader
 {
 	Game Heretic
 	SpawnID 9
diff --git a/wadsrc/static/actors/heretic/snake.txt b/wadsrc/static/actors/heretic/snake.txt
index 0184da170..1f7af5e51 100644
--- a/wadsrc/static/actors/heretic/snake.txt
+++ b/wadsrc/static/actors/heretic/snake.txt
@@ -1,5 +1,5 @@
 
-ACTOR Snake 92
+ACTOR Snake
 {
 	Game Heretic
 	SpawnID 132
diff --git a/wadsrc/static/actors/heretic/wizard.txt b/wadsrc/static/actors/heretic/wizard.txt
index 18188a321..5ea30d77d 100644
--- a/wadsrc/static/actors/heretic/wizard.txt
+++ b/wadsrc/static/actors/heretic/wizard.txt
@@ -1,7 +1,7 @@
 
 // Wizard --------------------------------------------------------
 
-ACTOR Wizard 15
+ACTOR Wizard
 {
 	Game Heretic
 	SpawnID 19
diff --git a/wadsrc/static/actors/hexen/bats.txt b/wadsrc/static/actors/hexen/bats.txt
index 0d1e08081..79518a4e5 100644
--- a/wadsrc/static/actors/hexen/bats.txt
+++ b/wadsrc/static/actors/hexen/bats.txt
@@ -1,7 +1,7 @@
 
 // Bat Spawner --------------------------------------------------------------
 
-ACTOR BatSpawner : SwitchableDecoration 10225
+ACTOR BatSpawner : SwitchableDecoration
 {
 	Game Hexen
 	+NOBLOCKMAP +NOSECTOR +NOGRAVITY
diff --git a/wadsrc/static/actors/hexen/bishop.txt b/wadsrc/static/actors/hexen/bishop.txt
index 8901a95b3..67d3a753c 100644
--- a/wadsrc/static/actors/hexen/bishop.txt
+++ b/wadsrc/static/actors/hexen/bishop.txt
@@ -1,7 +1,7 @@
 
 // Bishop -------------------------------------------------------------------
 
-ACTOR Bishop 114
+ACTOR Bishop
 {
 	Game Hexen
 	SpawnID 19
diff --git a/wadsrc/static/actors/hexen/blastradius.txt b/wadsrc/static/actors/hexen/blastradius.txt
index ad98d7ecc..6f3fe76ea 100644
--- a/wadsrc/static/actors/hexen/blastradius.txt
+++ b/wadsrc/static/actors/hexen/blastradius.txt
@@ -1,5 +1,5 @@
 
-ACTOR ArtiBlastRadius : CustomInventory 10110
+ACTOR ArtiBlastRadius : CustomInventory
 {
 	Game Hexen
 	SpawnID 74
diff --git a/wadsrc/static/actors/hexen/boostarmor.txt b/wadsrc/static/actors/hexen/boostarmor.txt
index 607c8d66a..aface7971 100644
--- a/wadsrc/static/actors/hexen/boostarmor.txt
+++ b/wadsrc/static/actors/hexen/boostarmor.txt
@@ -1,7 +1,7 @@
 
 // Boost Armor Artifact (Dragonskin Bracers) --------------------------------
 
-ACTOR ArtiBoostArmor : Inventory 8041 native
+ACTOR ArtiBoostArmor : Inventory native
 {
 	Game Hexen
 	SpawnID 22
diff --git a/wadsrc/static/actors/hexen/centaur.txt b/wadsrc/static/actors/hexen/centaur.txt
index 8044fa2ab..b59f79104 100644
--- a/wadsrc/static/actors/hexen/centaur.txt
+++ b/wadsrc/static/actors/hexen/centaur.txt
@@ -1,6 +1,6 @@
 // Centaur ------------------------------------------------------------------
 
-ACTOR Centaur 107
+ACTOR Centaur
 {
 	Game Hexen
 	SpawnID 1
@@ -78,7 +78,7 @@ ACTOR Centaur 107
 
 // Centaur Leader -----------------------------------------------------------
 
-ACTOR CentaurLeader : Centaur 115
+ACTOR CentaurLeader : Centaur
 {
 	Game Hexen
 	SpawnID 2
diff --git a/wadsrc/static/actors/hexen/clericboss.txt b/wadsrc/static/actors/hexen/clericboss.txt
index 3947f6c6d..ee8d4b1e5 100644
--- a/wadsrc/static/actors/hexen/clericboss.txt
+++ b/wadsrc/static/actors/hexen/clericboss.txt
@@ -1,7 +1,7 @@
 
 // Cleric Boss (Traductus) --------------------------------------------------
 
-ACTOR ClericBoss 10101
+ACTOR ClericBoss
 {
 	Game Hexen
 	Health 800
diff --git a/wadsrc/static/actors/hexen/clericflame.txt b/wadsrc/static/actors/hexen/clericflame.txt
index 5fb4175fd..9bb698362 100644
--- a/wadsrc/static/actors/hexen/clericflame.txt
+++ b/wadsrc/static/actors/hexen/clericflame.txt
@@ -1,7 +1,7 @@
 
 // The Cleric's Flame Strike ------------------------------------------------
 
-ACTOR CWeapFlame : ClericWeapon 8009
+ACTOR CWeapFlame : ClericWeapon
 {
 	Game Hexen
 	+NOGRAVITY
diff --git a/wadsrc/static/actors/hexen/clericholy.txt b/wadsrc/static/actors/hexen/clericholy.txt
index e97be8b17..e4f1d808b 100644
--- a/wadsrc/static/actors/hexen/clericholy.txt
+++ b/wadsrc/static/actors/hexen/clericholy.txt
@@ -12,7 +12,7 @@ ACTOR ClericWeaponPiece : WeaponPiece
 
 // Cleric Weapon Piece 1 ----------------------------------------------------
 
-ACTOR CWeaponPiece1 : ClericWeaponPiece 18
+ACTOR CWeaponPiece1 : ClericWeaponPiece
 {
 	Game Hexen
 	SpawnID 33
@@ -27,7 +27,7 @@ ACTOR CWeaponPiece1 : ClericWeaponPiece 18
 
 // Cleric Weapon Piece 2 ----------------------------------------------------
 
-ACTOR CWeaponPiece2 : ClericWeaponPiece 19
+ACTOR CWeaponPiece2 : ClericWeaponPiece
 {
 	Game Hexen
 	SpawnID 34
@@ -42,7 +42,7 @@ ACTOR CWeaponPiece2 : ClericWeaponPiece 19
 
 // Cleric Weapon Piece 3 ----------------------------------------------------
 
-ACTOR CWeaponPiece3 : ClericWeaponPiece 20
+ACTOR CWeaponPiece3 : ClericWeaponPiece
 {
 	Game Hexen
 	SpawnID 35
diff --git a/wadsrc/static/actors/hexen/clericstaff.txt b/wadsrc/static/actors/hexen/clericstaff.txt
index e55674fa5..9b5b050d7 100644
--- a/wadsrc/static/actors/hexen/clericstaff.txt
+++ b/wadsrc/static/actors/hexen/clericstaff.txt
@@ -1,7 +1,7 @@
 
 // The Cleric's Serpent Staff -----------------------------------------------
 
-ACTOR CWeapStaff : ClericWeapon 10
+ACTOR CWeapStaff : ClericWeapon
 {
 	Game Hexen
 	SpawnID 32
diff --git a/wadsrc/static/actors/hexen/demons.txt b/wadsrc/static/actors/hexen/demons.txt
index 1ecb2222c..f6bb7a1bf 100644
--- a/wadsrc/static/actors/hexen/demons.txt
+++ b/wadsrc/static/actors/hexen/demons.txt
@@ -1,7 +1,7 @@
 
 // Demon, type 1 (green, like D'Sparil's) -----------------------------------
 
-ACTOR Demon1 31
+ACTOR Demon1
 {
 	Game Hexen
 	SpawnID 3
@@ -212,7 +212,7 @@ ACTOR Demon1FX1
 
 // Demon, type 2 (brown) ----------------------------------------------------
 
-ACTOR Demon2 : Demon1 8080
+ACTOR Demon2 : Demon1
 {
 	Game Hexen
 	Obituary "$OB_DEMON2"
diff --git a/wadsrc/static/actors/hexen/dragon.txt b/wadsrc/static/actors/hexen/dragon.txt
index 904b2f953..811f1a4b1 100644
--- a/wadsrc/static/actors/hexen/dragon.txt
+++ b/wadsrc/static/actors/hexen/dragon.txt
@@ -1,7 +1,7 @@
 
 // Dragon -------------------------------------------------------------------
 
-ACTOR Dragon 254
+ACTOR Dragon
 {
 	Game Hexen
 	Health 640
diff --git a/wadsrc/static/actors/hexen/ettin.txt b/wadsrc/static/actors/hexen/ettin.txt
index e5104aa11..98d70c995 100644
--- a/wadsrc/static/actors/hexen/ettin.txt
+++ b/wadsrc/static/actors/hexen/ettin.txt
@@ -1,7 +1,7 @@
 
 // Ettin --------------------------------------------------------------------
 
-ACTOR Ettin 10030
+ACTOR Ettin
 {
 	Game Hexen
 	SpawnID 4
diff --git a/wadsrc/static/actors/hexen/fighteraxe.txt b/wadsrc/static/actors/hexen/fighteraxe.txt
index 502de5030..f7b7ae4bf 100644
--- a/wadsrc/static/actors/hexen/fighteraxe.txt
+++ b/wadsrc/static/actors/hexen/fighteraxe.txt
@@ -1,7 +1,7 @@
 
 // The Fighter's Axe --------------------------------------------------------
 
-ACTOR FWeapAxe : FighterWeapon 8010 native
+ACTOR FWeapAxe : FighterWeapon native
 {
 	Game Hexen
 	SpawnID 27
diff --git a/wadsrc/static/actors/hexen/fighterboss.txt b/wadsrc/static/actors/hexen/fighterboss.txt
index 1caf10d12..5f5e20f1e 100644
--- a/wadsrc/static/actors/hexen/fighterboss.txt
+++ b/wadsrc/static/actors/hexen/fighterboss.txt
@@ -1,7 +1,7 @@
 
 // Fighter Boss (Zedek) -----------------------------------------------------
 
-ACTOR FighterBoss 10100
+ACTOR FighterBoss
 {
 	Game Hexen
 	health 800
diff --git a/wadsrc/static/actors/hexen/fighterhammer.txt b/wadsrc/static/actors/hexen/fighterhammer.txt
index 5c7d6dc25..9cfa4f066 100644
--- a/wadsrc/static/actors/hexen/fighterhammer.txt
+++ b/wadsrc/static/actors/hexen/fighterhammer.txt
@@ -1,7 +1,7 @@
 
 // The Fighter's Hammer -----------------------------------------------------
 
-ACTOR FWeapHammer : FighterWeapon 123
+ACTOR FWeapHammer : FighterWeapon
 {
 	Game Hexen
 	SpawnID 28
diff --git a/wadsrc/static/actors/hexen/fighterquietus.txt b/wadsrc/static/actors/hexen/fighterquietus.txt
index a77e851d8..5208d8558 100644
--- a/wadsrc/static/actors/hexen/fighterquietus.txt
+++ b/wadsrc/static/actors/hexen/fighterquietus.txt
@@ -12,7 +12,7 @@ ACTOR FighterWeaponPiece : WeaponPiece
 
 // Fighter Weapon Piece 1 ---------------------------------------------------
 
-ACTOR FWeaponPiece1 : FighterWeaponPiece 12
+ACTOR FWeaponPiece1 : FighterWeaponPiece
 {
 	Game Hexen
 	SpawnID 29
@@ -27,7 +27,7 @@ ACTOR FWeaponPiece1 : FighterWeaponPiece 12
 
 // Fighter Weapon Piece 2 ---------------------------------------------------
 
-ACTOR FWeaponPiece2 : FighterWeaponPiece 13
+ACTOR FWeaponPiece2 : FighterWeaponPiece
 {
 	Game Hexen
 	SpawnID 30
@@ -42,7 +42,7 @@ ACTOR FWeaponPiece2 : FighterWeaponPiece 13
 
 // Fighter Weapon Piece 3 ---------------------------------------------------
 
-ACTOR FWeaponPiece3 : FighterWeaponPiece 16
+ACTOR FWeaponPiece3 : FighterWeaponPiece
 {
 	Game Hexen
 	SpawnID 31
diff --git a/wadsrc/static/actors/hexen/firedemon.txt b/wadsrc/static/actors/hexen/firedemon.txt
index 4873e2609..2c3eb6653 100644
--- a/wadsrc/static/actors/hexen/firedemon.txt
+++ b/wadsrc/static/actors/hexen/firedemon.txt
@@ -1,7 +1,7 @@
 
 // FireDemon ----------------------------------------------------------------
 
-ACTOR FireDemon 10060
+ACTOR FireDemon
 {
 	Game Hexen
 	SpawnID 5
diff --git a/wadsrc/static/actors/hexen/flame.txt b/wadsrc/static/actors/hexen/flame.txt
index 984c2d90c..492e04fde 100644
--- a/wadsrc/static/actors/hexen/flame.txt
+++ b/wadsrc/static/actors/hexen/flame.txt
@@ -1,6 +1,6 @@
 // Temp Small Flame --------------------------------------------------------
 
-ACTOR FlameSmallTemp 10500
+ACTOR FlameSmallTemp
 {
 	Game Hexen
 	SpawnID 96
@@ -21,7 +21,7 @@ ACTOR FlameSmallTemp 10500
 
 // Temp Large Flame ---------------------------------------------------------
 
-ACTOR FlameLargeTemp 10502
+ACTOR FlameLargeTemp
 {
 	Game Hexen
 	SpawnID 98
@@ -52,7 +52,7 @@ ACTOR FlameLargeTemp 10502
 
 // Small Flame --------------------------------------------------------------
 
-ACTOR FlameSmall : SwitchableDecoration 10501
+ACTOR FlameSmall : SwitchableDecoration
 {
 	Game Hexen
 	SpawnID 97
@@ -85,7 +85,7 @@ ACTOR FlameSmall2 : FlameSmall
 
 // Large Flame --------------------------------------------------------------
 
-ACTOR FlameLarge : SwitchableDecoration 10503
+ACTOR FlameLarge : SwitchableDecoration
 {
 	Game Hexen
 	SpawnID 99
diff --git a/wadsrc/static/actors/hexen/flechette.txt b/wadsrc/static/actors/hexen/flechette.txt
index 6e12bff53..e2e157ee5 100644
--- a/wadsrc/static/actors/hexen/flechette.txt
+++ b/wadsrc/static/actors/hexen/flechette.txt
@@ -94,7 +94,7 @@ ACTOR ThrowingBomb
 
 // Poison Bag Artifact (Flechette) ------------------------------------------
 
-ACTOR ArtiPoisonBag : Inventory 8000 native
+ACTOR ArtiPoisonBag : Inventory native
 {
 	Game Hexen
 	SpawnID 72
@@ -189,7 +189,7 @@ ACTOR PoisonCloud native
 
 // Poison Shroom ------------------------------------------------------------
 
-ACTOR ZPoisonShroom : PoisonBag 8104
+ACTOR ZPoisonShroom : PoisonBag
 {
 	Game Hexen
 	Radius 6
diff --git a/wadsrc/static/actors/hexen/flies.txt b/wadsrc/static/actors/hexen/flies.txt
new file mode 100644
index 000000000..138749a44
--- /dev/null
+++ b/wadsrc/static/actors/hexen/flies.txt
@@ -0,0 +1,28 @@
+
+// Buzzy fly ----------------------------------------------------------------
+
+ACTOR LittleFly
+{
+	Game Hexen
+	+NOBLOCKMAP +NOGRAVITY
+	+CANPASS
+	
+	Speed 6
+	Radius 5
+	Height 5
+	Mass 2
+	ActiveSound "FlyBuzz"
+	
+	action native A_FlySearch();
+	action native A_FlyBuzz();
+	
+	States
+	{
+	Spawn:
+		TNT1 A 20 A_FlySearch	// [RH] Invisible when not flying
+		Loop
+	Buzz:
+		AFLY ABCD 3 A_FlyBuzz
+		Loop
+	}
+}
diff --git a/wadsrc/static/actors/hexen/fog.txt b/wadsrc/static/actors/hexen/fog.txt
index 91fdfc3ee..9b76bdc7a 100644
--- a/wadsrc/static/actors/hexen/fog.txt
+++ b/wadsrc/static/actors/hexen/fog.txt
@@ -1,7 +1,7 @@
 
 // Fog Spawner --------------------------------------------------------------
 
-ACTOR FogSpawner 10000
+ACTOR FogSpawner
 {
 	Game Hexen
 	+NOSECTOR +NOBLOCKMAP
@@ -21,7 +21,7 @@ ACTOR FogSpawner 10000
 
 // Small Fog Patch ----------------------------------------------------------
 
-ACTOR FogPatchSmall 10001
+ACTOR FogPatchSmall
 {
 	Game Hexen
 	Speed 1
@@ -45,7 +45,7 @@ ACTOR FogPatchSmall 10001
 
 // Medium Fog Patch ---------------------------------------------------------
 
-ACTOR FogPatchMedium : FogPatchSmall 10002
+ACTOR FogPatchMedium : FogPatchSmall
 {
 	Game Hexen
 	States
@@ -61,7 +61,7 @@ ACTOR FogPatchMedium : FogPatchSmall 10002
 
 // Large Fog Patch ----------------------------------------------------------
 
-ACTOR FogPatchLarge : FogPatchMedium 10003
+ACTOR FogPatchLarge : FogPatchMedium
 {
 	Game Hexen
 	States
diff --git a/wadsrc/static/actors/hexen/healingradius.txt b/wadsrc/static/actors/hexen/healingradius.txt
index e0556915b..eefff43ae 100644
--- a/wadsrc/static/actors/hexen/healingradius.txt
+++ b/wadsrc/static/actors/hexen/healingradius.txt
@@ -1,7 +1,7 @@
 
 // Healing Radius Artifact --------------------------------------------------
 
-ACTOR ArtiHealingRadius : Inventory 10120 native
+ACTOR ArtiHealingRadius : Inventory native
 {
 	Game Hexen
 	+COUNTITEM
diff --git a/wadsrc/static/actors/hexen/heresiarch.txt b/wadsrc/static/actors/hexen/heresiarch.txt
index 5a77240fc..f883fae41 100644
--- a/wadsrc/static/actors/hexen/heresiarch.txt
+++ b/wadsrc/static/actors/hexen/heresiarch.txt
@@ -1,7 +1,7 @@
 
 // The Heresiarch him/itself ------------------------------------------------
 
-ACTOR Heresiarch 10080 native
+ACTOR Heresiarch native
 {
 	Game Hexen
 	Health 5000
diff --git a/wadsrc/static/actors/hexen/hexenarmor.txt b/wadsrc/static/actors/hexen/hexenarmor.txt
index 8aa830654..9daffbbbe 100644
--- a/wadsrc/static/actors/hexen/hexenarmor.txt
+++ b/wadsrc/static/actors/hexen/hexenarmor.txt
@@ -1,7 +1,7 @@
 
 // Mesh Armor (1) -----------------------------------------------------------
 
-ACTOR MeshArmor : HexenArmor 8005
+ACTOR MeshArmor : HexenArmor
 {
 	Game Hexen
 	SpawnID 68
@@ -19,7 +19,7 @@ ACTOR MeshArmor : HexenArmor 8005
 	
 // Falcon Shield (2) --------------------------------------------------------
 
-ACTOR FalconShield : HexenArmor 8006
+ACTOR FalconShield : HexenArmor
 {
 	Game Hexen
 	SpawnID 69
@@ -37,7 +37,7 @@ ACTOR FalconShield : HexenArmor 8006
 
 // Platinum Helm (3) --------------------------------------------------------
 
-ACTOR PlatinumHelm : HexenArmor 8007
+ACTOR PlatinumHelm : HexenArmor
 {
 	Game Hexen
 	SpawnID 70
@@ -55,7 +55,7 @@ ACTOR PlatinumHelm : HexenArmor 8007
 
 // Amulet of Warding (4) ----------------------------------------------------
 
-ACTOR AmuletOfWarding : HexenArmor 8008
+ACTOR AmuletOfWarding : HexenArmor
 {
 	Game Hexen
 	SpawnID 71
diff --git a/wadsrc/static/actors/hexen/hexendecorations.txt b/wadsrc/static/actors/hexen/hexendecorations.txt
index 572c29568..3a172b51b 100644
--- a/wadsrc/static/actors/hexen/hexendecorations.txt
+++ b/wadsrc/static/actors/hexen/hexendecorations.txt
@@ -1,4 +1,4 @@
-ACTOR ZWingedStatue 5
+ACTOR ZWingedStatue
 {
 	Game Hexen
 	Radius 10
@@ -12,7 +12,7 @@ ACTOR ZWingedStatue 5
 	}
 }
 	
-ACTOR ZRock1 6
+ACTOR ZRock1
 {
 	Game Hexen
 	Radius 20
@@ -25,7 +25,7 @@ ACTOR ZRock1 6
 	}
 }
 
-ACTOR ZRock2 7
+ACTOR ZRock2
 {
 	Game Hexen
 	Radius 20
@@ -38,7 +38,7 @@ ACTOR ZRock2 7
 	}
 }
 
-ACTOR ZRock3 9
+ACTOR ZRock3
 {
 	Game Hexen
 	Radius 20
@@ -51,7 +51,7 @@ ACTOR ZRock3 9
 	}
 }
 
-ACTOR ZRock4 15
+ACTOR ZRock4
 {
 	Game Hexen
 	Radius 20
@@ -64,7 +64,7 @@ ACTOR ZRock4 15
 	}
 }
 
-ACTOR ZChandelier 17
+ACTOR ZChandelier
 {
 	Game Hexen
 	Radius 20
@@ -79,7 +79,7 @@ ACTOR ZChandelier 17
 	}
 }
 
-ACTOR ZChandelierUnlit 8063
+ACTOR ZChandelierUnlit
 {
 	Game Hexen
 	Radius 20
@@ -94,7 +94,7 @@ ACTOR ZChandelierUnlit 8063
 	}
 }
 
-ACTOR ZTreeDead 24
+ACTOR ZTreeDead
 {
 	Game Hexen
 	Radius 10
@@ -108,7 +108,7 @@ ACTOR ZTreeDead 24
 	}
 }
 
-ACTOR ZTree 25
+ACTOR ZTree
 {
 	Game Hexen
 	Radius 15
@@ -122,7 +122,7 @@ ACTOR ZTree 25
 	}
 }
 
-ACTOR ZTreeSwamp150 26
+ACTOR ZTreeSwamp150
 {
 	Game Hexen
 	Radius 10
@@ -136,7 +136,7 @@ ACTOR ZTreeSwamp150 26
 	}
 }
 
-ACTOR ZTreeSwamp120 27
+ACTOR ZTreeSwamp120
 {
 	Game Hexen
 	Radius 10
@@ -150,7 +150,7 @@ ACTOR ZTreeSwamp120 27
 	}
 }
 
-ACTOR ZStumpBurned 28
+ACTOR ZStumpBurned
 {
 	Game Hexen
 	Radius 12
@@ -164,7 +164,7 @@ ACTOR ZStumpBurned 28
 	}
 }
 
-ACTOR ZStumpBare 29
+ACTOR ZStumpBare
 {
 	Game Hexen
 	Radius 12
@@ -178,7 +178,7 @@ ACTOR ZStumpBare 29
 	}
 }
 
-ACTOR ZStumpSwamp1 37
+ACTOR ZStumpSwamp1
 {
 	Game Hexen
 	Radius 20
@@ -191,7 +191,7 @@ ACTOR ZStumpSwamp1 37
 	}
 }
 
-ACTOR ZStumpSwamp2 38
+ACTOR ZStumpSwamp2
 {
 	Game Hexen
 	Radius 20
@@ -204,7 +204,7 @@ ACTOR ZStumpSwamp2 38
 	}
 }
 
-ACTOR ZShroomLarge1 39
+ACTOR ZShroomLarge1
 {
 	Game Hexen
 	Radius 20
@@ -217,7 +217,7 @@ ACTOR ZShroomLarge1 39
 	}
 }
 
-ACTOR ZShroomLarge2 40
+ACTOR ZShroomLarge2
 {
 	Game Hexen
 	Radius 20
@@ -230,7 +230,7 @@ ACTOR ZShroomLarge2 40
 	}
 }
 
-ACTOR ZShroomLarge3 41
+ACTOR ZShroomLarge3
 {
 	Game Hexen
 	Radius 20
@@ -243,7 +243,7 @@ ACTOR ZShroomLarge3 41
 	}
 }
 
-ACTOR ZShroomSmall1 42
+ACTOR ZShroomSmall1
 {
 	Game Hexen
 	Radius 20
@@ -256,7 +256,7 @@ ACTOR ZShroomSmall1 42
 	}
 }
 
-ACTOR ZShroomSmall2 44
+ACTOR ZShroomSmall2
 {
 	Game Hexen
 	Radius 20
@@ -269,7 +269,7 @@ ACTOR ZShroomSmall2 44
 	}
 }
 
-ACTOR ZShroomSmall3 45
+ACTOR ZShroomSmall3
 {
 	Game Hexen
 	Radius 20
@@ -282,7 +282,7 @@ ACTOR ZShroomSmall3 45
 	}
 }
 
-ACTOR ZShroomSmall4 46
+ACTOR ZShroomSmall4
 {
 	Game Hexen
 	Radius 20
@@ -295,7 +295,7 @@ ACTOR ZShroomSmall4 46
 	}
 }
 
-ACTOR ZShroomSmall5 47
+ACTOR ZShroomSmall5
 {
 	Game Hexen
 	Radius 20
@@ -308,7 +308,7 @@ ACTOR ZShroomSmall5 47
 	}
 }
 
-ACTOR ZStalagmitePillar 48
+ACTOR ZStalagmitePillar
 {
 	Game Hexen
 	Radius 8
@@ -322,7 +322,7 @@ ACTOR ZStalagmitePillar 48
 	}
 }
 
-ACTOR ZStalagmiteLarge 49
+ACTOR ZStalagmiteLarge
 {
 	Game Hexen
 	Radius 8
@@ -336,7 +336,7 @@ ACTOR ZStalagmiteLarge 49
 	}
 }
 
-ACTOR ZStalagmiteMedium 50
+ACTOR ZStalagmiteMedium
 {
 	Game Hexen
 	Radius 6
@@ -350,7 +350,7 @@ ACTOR ZStalagmiteMedium 50
 	}
 }
 
-ACTOR ZStalagmiteSmall 51
+ACTOR ZStalagmiteSmall
 {
 	Game Hexen
 	Radius 8
@@ -364,7 +364,7 @@ ACTOR ZStalagmiteSmall 51
 	}
 }
 
-ACTOR ZStalactiteLarge 52
+ACTOR ZStalactiteLarge
 {
 	Game Hexen
 	Radius 8
@@ -380,7 +380,7 @@ ACTOR ZStalactiteLarge 52
 	}
 }
 
-ACTOR ZStalactiteMedium 56
+ACTOR ZStalactiteMedium
 {
 	Game Hexen
 	Radius 6
@@ -396,7 +396,7 @@ ACTOR ZStalactiteMedium 56
 	}
 }
 
-ACTOR ZStalactiteSmall 57
+ACTOR ZStalactiteSmall
 {
 	Game Hexen
 	Radius 8
@@ -412,7 +412,7 @@ ACTOR ZStalactiteSmall 57
 	}
 }
 
-ACTOR ZMossCeiling1 58
+ACTOR ZMossCeiling1
 {
 	Game Hexen
 	Radius 20
@@ -427,7 +427,7 @@ ACTOR ZMossCeiling1 58
 	}
 }
 
-ACTOR ZMossCeiling2 59
+ACTOR ZMossCeiling2
 {
 	Game Hexen
 	Radius 20
@@ -442,7 +442,7 @@ ACTOR ZMossCeiling2 59
 	}
 }
 
-ACTOR ZSwampVine 60
+ACTOR ZSwampVine
 {
 	Game Hexen
 	Radius 8
@@ -456,7 +456,7 @@ ACTOR ZSwampVine 60
 	}
 }
 
-ACTOR ZCorpseKabob 61
+ACTOR ZCorpseKabob 
 {
 	Game Hexen
 	Radius 10
@@ -470,7 +470,7 @@ ACTOR ZCorpseKabob 61
 	}
 }
 
-ACTOR ZCorpseSleeping 62
+ACTOR ZCorpseSleeping
 {
 	Game Hexen
 	Radius 20
@@ -483,7 +483,7 @@ ACTOR ZCorpseSleeping 62
 	}
 }
 
-ACTOR ZTombstoneRIP 63
+ACTOR ZTombstoneRIP
 {
 	Game Hexen
 	Radius 10
@@ -497,7 +497,7 @@ ACTOR ZTombstoneRIP 63
 	}
 }
 
-ACTOR ZTombstoneShane 64
+ACTOR ZTombstoneShane
 {
 	Game Hexen
 	Radius 10
@@ -511,7 +511,7 @@ ACTOR ZTombstoneShane 64
 	}
 }
 
-ACTOR ZTombstoneBigCross 65
+ACTOR ZTombstoneBigCross
 {
 	Game Hexen
 	Radius 10
@@ -525,7 +525,7 @@ ACTOR ZTombstoneBigCross 65
 	}
 }
 
-ACTOR ZTombstoneBrianR 66
+ACTOR ZTombstoneBrianR
 {
 	Game Hexen
 	Radius 10
@@ -539,7 +539,7 @@ ACTOR ZTombstoneBrianR 66
 	}
 }
 
-ACTOR ZTombstoneCrossCircle 67
+ACTOR ZTombstoneCrossCircle
 {
 	Game Hexen
 	Radius 10
@@ -553,7 +553,7 @@ ACTOR ZTombstoneCrossCircle 67
 	}
 }
 
-ACTOR ZTombstoneSmallCross 68
+ACTOR ZTombstoneSmallCross
 {
 	Game Hexen
 	Radius 8
@@ -567,7 +567,7 @@ ACTOR ZTombstoneSmallCross 68
 	}
 }
 
-ACTOR ZTombstoneBrianP 69
+ACTOR ZTombstoneBrianP
 {
 	Game Hexen
 	Radius 8
@@ -581,7 +581,7 @@ ACTOR ZTombstoneBrianP 69
 	}
 }
 
-ACTOR ZCorpseHanging 71
+ACTOR ZCorpseHanging
 {
 	Game Hexen
 	Radius 6
@@ -597,7 +597,7 @@ ACTOR ZCorpseHanging 71
 	}
 }
 
-ACTOR ZStatueGargoyleGreenTall 72
+ACTOR ZStatueGargoyleGreenTall
 {
 	Game Hexen
 	Radius 14
@@ -611,7 +611,7 @@ ACTOR ZStatueGargoyleGreenTall 72
 	}
 }
 
-ACTOR ZStatueGargoyleBlueTall 73
+ACTOR ZStatueGargoyleBlueTall
 {
 	Game Hexen
 	Radius 14
@@ -625,7 +625,7 @@ ACTOR ZStatueGargoyleBlueTall 73
 	}
 }
 
-ACTOR ZStatueGargoyleGreenShort 74
+ACTOR ZStatueGargoyleGreenShort
 {
 	Game Hexen
 	Radius 14
@@ -639,7 +639,7 @@ ACTOR ZStatueGargoyleGreenShort 74
 	}
 }
 
-ACTOR ZStatueGargoyleBlueShort 76
+ACTOR ZStatueGargoyleBlueShort
 {
 	Game Hexen
 	Radius 14
@@ -653,7 +653,7 @@ ACTOR ZStatueGargoyleBlueShort 76
 	}
 }
 
-ACTOR ZStatueGargoyleStripeTall 8044
+ACTOR ZStatueGargoyleStripeTall
 {
 	Game Hexen
 	Radius 14
@@ -667,7 +667,7 @@ ACTOR ZStatueGargoyleStripeTall 8044
 	}
 }
 
-ACTOR ZStatueGargoyleDarkRedTall 8045
+ACTOR ZStatueGargoyleDarkRedTall
 {
 	Game Hexen
 	Radius 14
@@ -681,7 +681,7 @@ ACTOR ZStatueGargoyleDarkRedTall 8045
 	}
 }
 
-ACTOR ZStatueGargoyleRedTall 8046
+ACTOR ZStatueGargoyleRedTall
 {
 	Game Hexen
 	Radius 14
@@ -695,7 +695,7 @@ ACTOR ZStatueGargoyleRedTall 8046
 	}
 }
 
-ACTOR ZStatueGargoyleTanTall 8047
+ACTOR ZStatueGargoyleTanTall
 {
 	Game Hexen
 	Radius 14
@@ -709,7 +709,7 @@ ACTOR ZStatueGargoyleTanTall 8047
 	}
 }
 
-ACTOR ZStatueGargoyleRustTall 8048
+ACTOR ZStatueGargoyleRustTall
 {
 	Game Hexen
 	Radius 14
@@ -723,7 +723,7 @@ ACTOR ZStatueGargoyleRustTall 8048
 	}
 }
 
-ACTOR ZStatueGargoyleDarkRedShort 8049
+ACTOR ZStatueGargoyleDarkRedShort
 {
 	Game Hexen
 	Radius 14
@@ -737,7 +737,7 @@ ACTOR ZStatueGargoyleDarkRedShort 8049
 	}
 }
 
-ACTOR ZStatueGargoyleRedShort 8050
+ACTOR ZStatueGargoyleRedShort
 {
 	Game Hexen
 	Radius 14
@@ -751,7 +751,7 @@ ACTOR ZStatueGargoyleRedShort 8050
 	}
 }
 
-ACTOR ZStatueGargoyleTanShort 8051
+ACTOR ZStatueGargoyleTanShort
 {
 	Game Hexen
 	Radius 14
@@ -765,7 +765,7 @@ ACTOR ZStatueGargoyleTanShort 8051
 	}
 }
 
-ACTOR ZStatueGargoyleRustShort 8052
+ACTOR ZStatueGargoyleRustShort
 {
 	Game Hexen
 	Radius 14
@@ -779,7 +779,7 @@ ACTOR ZStatueGargoyleRustShort 8052
 	}
 }
 
-ACTOR ZBannerTattered 77
+ACTOR ZBannerTattered
 {
 	Game Hexen
 	Radius 8
@@ -793,7 +793,7 @@ ACTOR ZBannerTattered 77
 	}
 }
 
-ACTOR ZTreeLarge1 78
+ACTOR ZTreeLarge1
 {
 	Game Hexen
 	Radius 15
@@ -807,7 +807,7 @@ ACTOR ZTreeLarge1 78
 	}
 }
 
-ACTOR ZTreeLarge2 79
+ACTOR ZTreeLarge2
 {
 	Game Hexen
 	Radius 15
@@ -821,7 +821,7 @@ ACTOR ZTreeLarge2 79
 	}
 }
 
-ACTOR ZTreeGnarled1 80
+ACTOR ZTreeGnarled1
 {
 	Game Hexen
 	Radius 22
@@ -835,7 +835,7 @@ ACTOR ZTreeGnarled1 80
 	}
 }
 
-ACTOR ZTreeGnarled2 87
+ACTOR ZTreeGnarled2
 {
 	Game Hexen
 	Radius 22
@@ -849,7 +849,7 @@ ACTOR ZTreeGnarled2 87
 	}
 }
 
-ACTOR ZLog 88
+ACTOR ZLog
 {
 	Game Hexen
 	Radius 20
@@ -863,7 +863,7 @@ ACTOR ZLog 88
 	}
 }
 
-ACTOR ZStalactiteIceLarge 89
+ACTOR ZStalactiteIceLarge
 {
 	Game Hexen
 	Radius 8
@@ -879,7 +879,7 @@ ACTOR ZStalactiteIceLarge 89
 	}
 }
 
-ACTOR ZStalactiteIceMedium 90
+ACTOR ZStalactiteIceMedium
 {
 	Game Hexen
 	Radius 5
@@ -895,7 +895,7 @@ ACTOR ZStalactiteIceMedium 90
 	}
 }
 
-ACTOR ZStalactiteIceSmall 91
+ACTOR ZStalactiteIceSmall
 {
 	Game Hexen
 	Radius 4
@@ -911,7 +911,7 @@ ACTOR ZStalactiteIceSmall 91
 	}
 }
 
-ACTOR ZStalactiteIceTiny 92
+ACTOR ZStalactiteIceTiny
 {
 	Game Hexen
 	Radius 4
@@ -927,7 +927,7 @@ ACTOR ZStalactiteIceTiny 92
 	}
 }
 
-ACTOR ZStalagmiteIceLarge 93
+ACTOR ZStalagmiteIceLarge
 {
 	Game Hexen
 	Radius 8
@@ -941,7 +941,7 @@ ACTOR ZStalagmiteIceLarge 93
 	}
 }
 
-ACTOR ZStalagmiteIceMedium 94
+ACTOR ZStalagmiteIceMedium
 {
 	Game Hexen
 	Radius 5
@@ -955,7 +955,7 @@ ACTOR ZStalagmiteIceMedium 94
 	}
 }
 
-ACTOR ZStalagmiteIceSmall 95
+ACTOR ZStalagmiteIceSmall
 {
 	Game Hexen
 	Radius 4
@@ -969,7 +969,7 @@ ACTOR ZStalagmiteIceSmall 95
 	}
 }
 
-ACTOR ZStalagmiteIceTiny 96
+ACTOR ZStalagmiteIceTiny
 {
 	Game Hexen
 	Radius 4
@@ -983,7 +983,7 @@ ACTOR ZStalagmiteIceTiny 96
 	}
 }
 
-ACTOR ZRockBrown1 97
+ACTOR ZRockBrown1
 {
 	Game Hexen
 	Radius 17
@@ -997,7 +997,7 @@ ACTOR ZRockBrown1 97
 	}
 }
 
-ACTOR ZRockBrown2 98
+ACTOR ZRockBrown2
 {
 	Game Hexen
 	Radius 15
@@ -1011,7 +1011,7 @@ ACTOR ZRockBrown2 98
 	}
 }
 
-ACTOR ZRockBlack 99
+ACTOR ZRockBlack
 {
 	Game Hexen
 	Radius 20
@@ -1025,7 +1025,7 @@ ACTOR ZRockBlack 99
 	}
 }
 
-ACTOR ZRubble1 100
+ACTOR ZRubble1
 {
 	Game Hexen
 	Radius 20
@@ -1038,7 +1038,7 @@ ACTOR ZRubble1 100
 	}
 }
 
-ACTOR ZRubble2 101
+ACTOR ZRubble2
 {
 	Game Hexen
 	Radius 20
@@ -1051,7 +1051,7 @@ ACTOR ZRubble2 101
 	}
 }
 
-ACTOR ZRubble3 102
+ACTOR ZRubble3
 {
 	Game Hexen
 	Radius 20
@@ -1064,7 +1064,7 @@ ACTOR ZRubble3 102
 	}
 }
 
-ACTOR ZVasePillar 103
+ACTOR ZVasePillar
 {
 	Game Hexen
 	Radius 12
@@ -1078,7 +1078,7 @@ ACTOR ZVasePillar 103
 	}
 }
 
-ACTOR ZCorpseLynched 108
+ACTOR ZCorpseLynched
 {
 	Game Hexen
 	Radius 11
@@ -1094,7 +1094,7 @@ ACTOR ZCorpseLynched 108
 	}
 }
 
-ACTOR ZCandle 119
+ACTOR ZCandle
 {
 	Game Hexen
 	Radius 20
@@ -1109,7 +1109,7 @@ ACTOR ZCandle 119
 	}
 }
 
-ACTOR ZBarrel 8100
+ACTOR ZBarrel
 {
 	Game Hexen
 	Radius 15
@@ -1123,7 +1123,7 @@ ACTOR ZBarrel 8100
 	}
 }
 
-ACTOR ZBucket 8103
+ACTOR ZBucket
 {
 	Game Hexen
 	Radius 8
@@ -1139,7 +1139,7 @@ ACTOR ZBucket 8103
 	}
 }
 
-ACTOR FireThing 8060
+ACTOR FireThing
 {
 	Game Hexen
 	Radius 5
@@ -1161,7 +1161,7 @@ ACTOR FireThing 8060
 	}
 }
 
-ACTOR BrassTorch 8061
+ACTOR BrassTorch
 {
 	Game Hexen
 	Radius 6
@@ -1175,7 +1175,7 @@ ACTOR BrassTorch 8061
 	}
 }
 
-ACTOR ZBlueCandle 8066
+ACTOR ZBlueCandle
 {
 	Game Hexen
 	Radius 20
@@ -1189,7 +1189,7 @@ ACTOR ZBlueCandle 8066
 	}
 }
 
-ACTOR ZIronMaiden 8067
+ACTOR ZIronMaiden
 {
 	Game Hexen
 	Radius 12
@@ -1203,7 +1203,7 @@ ACTOR ZIronMaiden 8067
 	}
 }
 
-ACTOR ZChainBit32 8071
+ACTOR ZChainBit32
 {
 	Game Hexen
 	Radius 4
@@ -1219,7 +1219,7 @@ ACTOR ZChainBit32 8071
 	}
 }
 
-ACTOR ZChainBit64 8072
+ACTOR ZChainBit64
 {
 	Game Hexen
 	Radius 4
@@ -1235,7 +1235,7 @@ ACTOR ZChainBit64 8072
 	}
 }
 
-ACTOR ZChainEndHeart 8073
+ACTOR ZChainEndHeart
 {
 	Game Hexen
 	Radius 4
@@ -1251,7 +1251,7 @@ ACTOR ZChainEndHeart 8073
 	}
 }
 
-ACTOR ZChainEndHook1 8074
+ACTOR ZChainEndHook1
 {
 	Game Hexen
 	Radius 4
@@ -1267,7 +1267,7 @@ ACTOR ZChainEndHook1 8074
 	}
 }
 
-ACTOR ZChainEndHook2 8075
+ACTOR ZChainEndHook2
 {
 	Game Hexen
 	Radius 4
@@ -1283,7 +1283,7 @@ ACTOR ZChainEndHook2 8075
 	}
 }
 
-ACTOR ZChainEndSpike 8076
+ACTOR ZChainEndSpike
 {
 	Game Hexen
 	Radius 4
@@ -1299,7 +1299,7 @@ ACTOR ZChainEndSpike 8076
 	}
 }
 
-ACTOR ZChainEndSkull 8077
+ACTOR ZChainEndSkull
 {
 	Game Hexen
 	Radius 4
@@ -1315,7 +1315,7 @@ ACTOR ZChainEndSkull 8077
 	}
 }
 
-ACTOR TableShit1 8500
+ACTOR TableShit1
 {
 	Game Hexen
 	Radius 20
@@ -1329,7 +1329,7 @@ ACTOR TableShit1 8500
 	}
 }
 
-ACTOR TableShit2 8501
+ACTOR TableShit2
 {
 	Game Hexen
 	Radius 20
@@ -1343,7 +1343,7 @@ ACTOR TableShit2 8501
 	}
 }
 
-ACTOR TableShit3 8502
+ACTOR TableShit3
 {
 	Game Hexen
 	Radius 20
@@ -1357,7 +1357,7 @@ ACTOR TableShit3 8502
 	}
 }
 
-ACTOR TableShit4 8503
+ACTOR TableShit4
 {
 	Game Hexen
 	Radius 20
@@ -1371,7 +1371,7 @@ ACTOR TableShit4 8503
 	}
 }
 
-ACTOR TableShit5 8504
+ACTOR TableShit5
 {
 	Game Hexen
 	Radius 20
@@ -1385,7 +1385,7 @@ ACTOR TableShit5 8504
 	}
 }
 
-ACTOR TableShit6 8505
+ACTOR TableShit6
 {
 	Game Hexen
 	Radius 20
@@ -1399,7 +1399,7 @@ ACTOR TableShit6 8505
 	}
 }
 
-ACTOR TableShit7 8506
+ACTOR TableShit7
 {
 	Game Hexen
 	Radius 20
@@ -1413,7 +1413,7 @@ ACTOR TableShit7 8506
 	}
 }
 
-ACTOR TableShit8 8507
+ACTOR TableShit8
 {
 	Game Hexen
 	Radius 20
@@ -1427,7 +1427,7 @@ ACTOR TableShit8 8507
 	}
 }
 
-ACTOR TableShit9 8508
+ACTOR TableShit9
 {
 	Game Hexen
 	Radius 20
@@ -1441,7 +1441,7 @@ ACTOR TableShit9 8508
 	}
 }
 
-ACTOR TableShit10 8509
+ACTOR TableShit10
 {
 	Game Hexen
 	Radius 20
@@ -1455,7 +1455,7 @@ ACTOR TableShit10 8509
 	}
 }
 
-ACTOR TeleSmoke 140
+ACTOR TeleSmoke
 {
 	Game Hexen
 	Radius 20
diff --git a/wadsrc/static/actors/hexen/hexenkeys.txt b/wadsrc/static/actors/hexen/hexenkeys.txt
index e58693e69..f52b416ec 100644
--- a/wadsrc/static/actors/hexen/hexenkeys.txt
+++ b/wadsrc/static/actors/hexen/hexenkeys.txt
@@ -5,7 +5,7 @@ ACTOR HexenKey : Key
 	Height 20
 }
 
-ACTOR KeySteel : HexenKey 8030
+ACTOR KeySteel : HexenKey
 {
 	Game Hexen
 	SpawnID 85
@@ -19,7 +19,7 @@ ACTOR KeySteel : HexenKey 8030
 	}
 }
 
-ACTOR KeyCave : HexenKey 8031
+ACTOR KeyCave : HexenKey
 {
 	Game Hexen
 	SpawnID 86
@@ -33,7 +33,7 @@ ACTOR KeyCave : HexenKey 8031
 	}
 }
 
-ACTOR KeyAxe : HexenKey 8032
+ACTOR KeyAxe : HexenKey
 {
 	Game Hexen
 	SpawnID 87
@@ -47,7 +47,7 @@ ACTOR KeyAxe : HexenKey 8032
 	}
 }
 
-ACTOR KeyFire : HexenKey 8033
+ACTOR KeyFire : HexenKey
 {
 	Game Hexen
 	SpawnID 88
@@ -61,7 +61,7 @@ ACTOR KeyFire : HexenKey 8033
 	}
 }
 
-ACTOR KeyEmerald : HexenKey 8034
+ACTOR KeyEmerald : HexenKey
 {
 	Game Hexen
 	SpawnID 89
@@ -75,7 +75,7 @@ ACTOR KeyEmerald : HexenKey 8034
 	}
 }
 
-ACTOR KeyDungeon : HexenKey 8035
+ACTOR KeyDungeon : HexenKey
 {
 	Game Hexen
 	SpawnID 90
@@ -89,7 +89,7 @@ ACTOR KeyDungeon : HexenKey 8035
 	}
 }
 
-ACTOR KeySilver : HexenKey 8036
+ACTOR KeySilver : HexenKey
 {
 	Game Hexen
 	SpawnID 91
@@ -103,7 +103,7 @@ ACTOR KeySilver : HexenKey 8036
 	}
 }
 
-ACTOR KeyRusted : HexenKey 8037
+ACTOR KeyRusted : HexenKey
 {
 	Game Hexen
 	SpawnID 92
@@ -117,7 +117,7 @@ ACTOR KeyRusted : HexenKey 8037
 	}
 }
 
-ACTOR KeyHorn : HexenKey 8038
+ACTOR KeyHorn : HexenKey
 {
 	Game Hexen
 	SpawnID 93
@@ -131,7 +131,7 @@ ACTOR KeyHorn : HexenKey 8038
 	}
 }
 
-ACTOR KeySwamp : HexenKey 8039
+ACTOR KeySwamp : HexenKey
 {
 	Game Hexen
 	SpawnID 94
@@ -145,7 +145,7 @@ ACTOR KeySwamp : HexenKey 8039
 	}
 }
 
-ACTOR KeyCastle : HexenKey 8200
+ACTOR KeyCastle : HexenKey
 {
 	Game Hexen
 	Inventory.Icon KEYSLOTB
diff --git a/wadsrc/static/actors/hexen/hexenspecialdecs.txt b/wadsrc/static/actors/hexen/hexenspecialdecs.txt
index e36451e7f..61dc0cb19 100644
--- a/wadsrc/static/actors/hexen/hexenspecialdecs.txt
+++ b/wadsrc/static/actors/hexen/hexenspecialdecs.txt
@@ -1,7 +1,7 @@
 
 // Winged Statue (no skull) -------------------------------------------------
 
-ACTOR ZWingedStatueNoSkull : SwitchingDecoration 9011
+ACTOR ZWingedStatueNoSkull : SwitchingDecoration
 {
 	Game Hexen
 	Radius 10
@@ -21,7 +21,7 @@ ACTOR ZWingedStatueNoSkull : SwitchingDecoration 9011
 
 // Gem pedestal -------------------------------------------------------------
 
-ACTOR ZGemPedestal : SwitchingDecoration 9012
+ACTOR ZGemPedestal : SwitchingDecoration
 {
 	Game Hexen
 	Radius 10
@@ -41,7 +41,7 @@ ACTOR ZGemPedestal : SwitchingDecoration 9012
 
 // Tree (destructible) ------------------------------------------------------
 
-ACTOR TreeDestructible 8062
+ACTOR TreeDestructible
 {
 	Game Hexen
 	Health 70
@@ -77,7 +77,7 @@ ACTOR TreeDestructible 8062
 
 // Pottery1 ------------------------------------------------------------------
 
-ACTOR Pottery1 104 native
+ACTOR Pottery1 native
 {
 	Game Hexen
 	Health 15
@@ -102,7 +102,7 @@ ACTOR Pottery1 104 native
 
 // Pottery2 -----------------------------------------------------------------
 
-ACTOR Pottery2 : Pottery1 105
+ACTOR Pottery2 : Pottery1
 {
 	Game Hexen
 	Height 25
@@ -116,7 +116,7 @@ ACTOR Pottery2 : Pottery1 105
 
 // Pottery3 -----------------------------------------------------------------
 
-ACTOR Pottery3 : Pottery1 106
+ACTOR Pottery3 : Pottery1
 {
 	Game Hexen
 	Height 25
@@ -175,7 +175,7 @@ ACTOR PotteryBit
 
 // Blood pool ---------------------------------------------------------------
 
-ACTOR BloodPool 111
+ACTOR BloodPool
 {
 	Game Hexen
 	States
@@ -189,7 +189,7 @@ ACTOR BloodPool 111
 
 // Lynched corpse (no heart) ------------------------------------------------
 
-ACTOR ZCorpseLynchedNoHeart 109 native
+ACTOR ZCorpseLynchedNoHeart native
 {
 	Game Hexen
 	Radius 10
@@ -255,7 +255,7 @@ ACTOR CorpseBit
 
 // Corpse (sitting, splatterable) -------------------------------------------
 
-ACTOR ZCorpseSitting 110
+ACTOR ZCorpseSitting
 {
 	Game Hexen
 	Health 30
@@ -281,7 +281,7 @@ ACTOR ZCorpseSitting 110
 
 // Leaf Spawner -------------------------------------------------------------
 
-ACTOR LeafSpawner 113
+ACTOR LeafSpawner
 {
 	Game Hexen
 	+NOBLOCKMAP +NOSECTOR
@@ -357,7 +357,7 @@ ACTOR Leaf2 : Leaf1
 
 // Twined torch -------------------------------------------------------------
 
-ACTOR ZTwinedTorch : SwitchableDecoration 116
+ACTOR ZTwinedTorch : SwitchableDecoration
 {
 	Game Hexen
 	Radius 10
@@ -376,7 +376,7 @@ ACTOR ZTwinedTorch : SwitchableDecoration 116
 	}
 }
 
-ACTOR ZTwinedTorchUnlit : ZTwinedTorch 117
+ACTOR ZTwinedTorchUnlit : ZTwinedTorch
 {
 	Game Hexen
 	States
@@ -389,7 +389,7 @@ ACTOR ZTwinedTorchUnlit : ZTwinedTorch 117
 
 // Wall torch ---------------------------------------------------------------
 
-ACTOR ZWallTorch : SwitchableDecoration 54
+ACTOR ZWallTorch : SwitchableDecoration
 {
 	Game Hexen
 	+NOBLOCKMAP
@@ -409,7 +409,7 @@ ACTOR ZWallTorch : SwitchableDecoration 54
 	}
 }
 
-ACTOR ZWallTorchUnlit : ZWallTorch 55
+ACTOR ZWallTorchUnlit : ZWallTorch
 {
 	Game Hexen
 	States
@@ -422,7 +422,7 @@ ACTOR ZWallTorchUnlit : ZWallTorch 55
 
 // Shrub1 -------------------------------------------------------------------
 
-ACTOR ZShrub1 8101
+ACTOR ZShrub1
 {
 	Game Hexen
 	Radius 8
@@ -447,7 +447,7 @@ ACTOR ZShrub1 8101
 
 // Shrub2 -------------------------------------------------------------------
 
-ACTOR ZShrub2 8102
+ACTOR ZShrub2
 {
 	Game Hexen
 	Radius 16
@@ -473,7 +473,7 @@ ACTOR ZShrub2 8102
 
 // Fire Bull ----------------------------------------------------------------
 
-ACTOR ZFireBull : SwitchableDecoration 8042
+ACTOR ZFireBull : SwitchableDecoration
 {
 	Game Hexen
 	Radius 20
@@ -494,7 +494,7 @@ ACTOR ZFireBull : SwitchableDecoration 8042
 	}
 }
 
-ACTOR ZFireBullUnlit : ZFireBull 8043
+ACTOR ZFireBullUnlit : ZFireBull
 {
 	Game Hexen
 	States
@@ -507,7 +507,7 @@ ACTOR ZFireBullUnlit : ZFireBull 8043
 
 // Suit of armor ------------------------------------------------------------
 
-ACTOR ZSuitOfArmor 8064
+ACTOR ZSuitOfArmor
 {
 	Game Hexen
 	Health 60
@@ -567,7 +567,7 @@ ACTOR ZArmorChunk
 
 // Bell ---------------------------------------------------------------------
 
-ACTOR ZBell 8065 native
+ACTOR ZBell native
 {
 	Game Hexen
 	Health 5
@@ -627,7 +627,7 @@ ACTOR ZBell 8065 native
 
 // "Christmas" Tree ---------------------------------------------------------
 
-ACTOR ZXmasTree 8068
+ACTOR ZXmasTree
 {
 	Game Hexen
 	Radius 11
@@ -658,7 +658,7 @@ ACTOR ZXmasTree 8068
 
 // Cauldron -----------------------------------------------------------------
 
-ACTOR ZCauldron : SwitchableDecoration 8069
+ACTOR ZCauldron : SwitchableDecoration
 {
 	Game Hexen
 	Radius 12
@@ -677,7 +677,7 @@ ACTOR ZCauldron : SwitchableDecoration 8069
 	}
 }
 
-ACTOR ZCauldronUnlit : ZCauldron 8070
+ACTOR ZCauldronUnlit : ZCauldron
 {
 	Game Hexen
 	States
diff --git a/wadsrc/static/actors/hexen/iceguy.txt b/wadsrc/static/actors/hexen/iceguy.txt
index 0a5fdce3f..aaf16d4c6 100644
--- a/wadsrc/static/actors/hexen/iceguy.txt
+++ b/wadsrc/static/actors/hexen/iceguy.txt
@@ -1,7 +1,7 @@
 
 // Ice Guy ------------------------------------------------------------------
 
-ACTOR IceGuy 8020
+ACTOR IceGuy
 {
 	Game Hexen
 	SpawnID 20
diff --git a/wadsrc/static/actors/hexen/korax.txt b/wadsrc/static/actors/hexen/korax.txt
index 3c857df95..da48b580d 100644
--- a/wadsrc/static/actors/hexen/korax.txt
+++ b/wadsrc/static/actors/hexen/korax.txt
@@ -1,4 +1,4 @@
-ACTOR Korax 10200
+ACTOR Korax
 {
 	Game Hexen
 	Health 5000
diff --git a/wadsrc/static/actors/hexen/mageboss.txt b/wadsrc/static/actors/hexen/mageboss.txt
index 7e11d2cd1..f8c5dc9e3 100644
--- a/wadsrc/static/actors/hexen/mageboss.txt
+++ b/wadsrc/static/actors/hexen/mageboss.txt
@@ -1,7 +1,7 @@
 
 // Mage Boss (Menelkir) -----------------------------------------------------
 
-ACTOR MageBoss 10102
+ACTOR MageBoss
 {
 	Game Hexen
 	Health 800
diff --git a/wadsrc/static/actors/hexen/magecone.txt b/wadsrc/static/actors/hexen/magecone.txt
index b5dfdb546..a39dbcb86 100644
--- a/wadsrc/static/actors/hexen/magecone.txt
+++ b/wadsrc/static/actors/hexen/magecone.txt
@@ -1,7 +1,7 @@
 
 // The Mage's Frost Cone ----------------------------------------------------
 
-ACTOR MWeapFrost : MageWeapon 53
+ACTOR MWeapFrost : MageWeapon
 {
 	Game Hexen
 	SpawnID 36
diff --git a/wadsrc/static/actors/hexen/magelightning.txt b/wadsrc/static/actors/hexen/magelightning.txt
index 85402f223..0e507db58 100644
--- a/wadsrc/static/actors/hexen/magelightning.txt
+++ b/wadsrc/static/actors/hexen/magelightning.txt
@@ -1,7 +1,7 @@
 
 // The Mage's Lightning Arc of Death ----------------------------------------
 
-ACTOR MWeapLightning : MageWeapon 8040
+ACTOR MWeapLightning : MageWeapon
 {
 	Game Hexen
 	+NOGRAVITY
diff --git a/wadsrc/static/actors/hexen/magestaff.txt b/wadsrc/static/actors/hexen/magestaff.txt
index aa75ed446..91864ff6f 100644
--- a/wadsrc/static/actors/hexen/magestaff.txt
+++ b/wadsrc/static/actors/hexen/magestaff.txt
@@ -12,7 +12,7 @@ ACTOR MageWeaponPiece : WeaponPiece
 
 // Mage Weapon Piece 1 ------------------------------------------------------
 
-ACTOR MWeaponPiece1 : MageWeaponPiece 21
+ACTOR MWeaponPiece1 : MageWeaponPiece
 {
 	Game Hexen
 	SpawnID 37
@@ -27,7 +27,7 @@ ACTOR MWeaponPiece1 : MageWeaponPiece 21
 
 // Mage Weapon Piece 2 ------------------------------------------------------
 
-ACTOR MWeaponPiece2 : MageWeaponPiece 22
+ACTOR MWeaponPiece2 : MageWeaponPiece
 {
 	Game Hexen
 	SpawnID 38
@@ -42,7 +42,7 @@ ACTOR MWeaponPiece2 : MageWeaponPiece 22
 
 // Mage Weapon Piece 3 ------------------------------------------------------
 
-ACTOR MWeaponPiece3 : MageWeaponPiece 23
+ACTOR MWeaponPiece3 : MageWeaponPiece
 {
 	Game Hexen
 	SpawnID 39
diff --git a/wadsrc/static/actors/hexen/mana.txt b/wadsrc/static/actors/hexen/mana.txt
index ee7ddd37c..c38bbcb8a 100644
--- a/wadsrc/static/actors/hexen/mana.txt
+++ b/wadsrc/static/actors/hexen/mana.txt
@@ -1,6 +1,6 @@
 // Blue mana ----------------------------------------------------------------
 
-ACTOR Mana1 : Ammo 122
+ACTOR Mana1 : Ammo
 {
 	Game Hexen
 	SpawnID 11
@@ -23,7 +23,7 @@ ACTOR Mana1 : Ammo 122
 
 // Green mana ---------------------------------------------------------------
 
-ACTOR Mana2 : Ammo 124
+ACTOR Mana2 : Ammo
 {
 	Game Hexen
 	SpawnID 12
@@ -46,7 +46,7 @@ ACTOR Mana2 : Ammo 124
 
 // Combined mana ------------------------------------------------------------
 
-ACTOR Mana3 : CustomInventory 8004
+ACTOR Mana3 : CustomInventory
 {
 	Game Hexen
 	SpawnID 75
@@ -68,7 +68,7 @@ ACTOR Mana3 : CustomInventory 8004
 
 // Boost Mana Artifact Krater of Might ------------------------------------
 
-ACTOR ArtiBoostMana : CustomInventory 8003
+ACTOR ArtiBoostMana : CustomInventory
 {
 	Game Hexen
 	SpawnID 26
diff --git a/wadsrc/static/actors/hexen/puzzleitems.txt b/wadsrc/static/actors/hexen/puzzleitems.txt
index dd15fc8fd..af571a336 100644
--- a/wadsrc/static/actors/hexen/puzzleitems.txt
+++ b/wadsrc/static/actors/hexen/puzzleitems.txt
@@ -1,7 +1,7 @@
 
 // Yorick's Skull -----------------------------------------------------------
 
-ACTOR PuzzSkull : PuzzleItem 9002
+ACTOR PuzzSkull : PuzzleItem
 {
 	Game Hexen
 	SpawnID 76
@@ -20,7 +20,7 @@ ACTOR PuzzSkull : PuzzleItem 9002
 
 // Heart of D'Sparil --------------------------------------------------------
 
-ACTOR PuzzGemBig : PuzzleItem 9003
+ACTOR PuzzGemBig : PuzzleItem
 {
 	Game Hexen
 	SpawnID 77
@@ -38,7 +38,7 @@ ACTOR PuzzGemBig : PuzzleItem 9003
 
 // Red Gem (Ruby Planet) ----------------------------------------------------
 
-ACTOR PuzzGemRed : PuzzleItem 9004
+ACTOR PuzzGemRed : PuzzleItem
 {
 	Game Hexen
 	SpawnID 78
@@ -57,7 +57,7 @@ ACTOR PuzzGemRed : PuzzleItem 9004
 
 // Green Gem 1 (Emerald Planet) ---------------------------------------------
 
-ACTOR PuzzGemGreen1 : PuzzleItem 9005
+ACTOR PuzzGemGreen1 : PuzzleItem
 {
 	Game Hexen
 	SpawnID 79
@@ -76,7 +76,7 @@ ACTOR PuzzGemGreen1 : PuzzleItem 9005
 
 // Green Gem 2 (Emerald Planet) ---------------------------------------------
 
-ACTOR PuzzGemGreen2 : PuzzleItem 9009
+ACTOR PuzzGemGreen2 : PuzzleItem
 {
 	Game Hexen
 	SpawnID 80
@@ -95,7 +95,7 @@ ACTOR PuzzGemGreen2 : PuzzleItem 9009
 
 // Blue Gem 1 (Sapphire Planet) ---------------------------------------------
 
-ACTOR PuzzGemBlue1 : PuzzleItem 9006
+ACTOR PuzzGemBlue1 : PuzzleItem
 {
 	Game Hexen
 	SpawnID 81
@@ -114,7 +114,7 @@ ACTOR PuzzGemBlue1 : PuzzleItem 9006
 
 // Blue Gem 2 (Sapphire Planet) ---------------------------------------------
 
-ACTOR PuzzGemBlue2 : PuzzleItem 9010
+ACTOR PuzzGemBlue2 : PuzzleItem
 {
 	Game Hexen
 	SpawnID 82
@@ -133,7 +133,7 @@ ACTOR PuzzGemBlue2 : PuzzleItem 9010
 
 // Book 1 (Daemon Codex) ----------------------------------------------------
 
-ACTOR PuzzBook1 : PuzzleItem 9007
+ACTOR PuzzBook1 : PuzzleItem
 {
 	Game Hexen
 	SpawnID 83
@@ -152,7 +152,7 @@ ACTOR PuzzBook1 : PuzzleItem 9007
 
 // Book 2 (Liber Oscura) ----------------------------------------------------
 
-ACTOR PuzzBook2 : PuzzleItem 9008
+ACTOR PuzzBook2 : PuzzleItem
 {
 	Game Hexen
 	SpawnID 84
@@ -172,7 +172,7 @@ ACTOR PuzzBook2 : PuzzleItem 9008
 // Flame Mask ---------------------------------------------------------------
 
 
-ACTOR PuzzFlameMask : PuzzleItem 9014
+ACTOR PuzzFlameMask : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 9
@@ -189,7 +189,7 @@ ACTOR PuzzFlameMask : PuzzleItem 9014
 
 // Fighter Weapon (Glaive Seal) ---------------------------------------------
 
-ACTOR PuzzFWeapon : PuzzleItem 9015
+ACTOR PuzzFWeapon : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 10
@@ -207,7 +207,7 @@ ACTOR PuzzFWeapon : PuzzleItem 9015
 
 // Cleric Weapon (Holy Relic) -----------------------------------------------
 
-ACTOR PuzzCWeapon : PuzzleItem 9016
+ACTOR PuzzCWeapon : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 11
@@ -225,7 +225,7 @@ ACTOR PuzzCWeapon : PuzzleItem 9016
 
 // Mage Weapon (Sigil of the Magus) -----------------------------------------
 
-ACTOR PuzzMWeapon : PuzzleItem 9017
+ACTOR PuzzMWeapon : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 12
@@ -242,7 +242,7 @@ ACTOR PuzzMWeapon : PuzzleItem 9017
 
 // Clock Gear 1 -------------------------------------------------------------
 
-ACTOR PuzzGear1 : PuzzleItem 9018
+ACTOR PuzzGear1 : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 13
@@ -260,7 +260,7 @@ ACTOR PuzzGear1 : PuzzleItem 9018
 
 // Clock Gear 2 -------------------------------------------------------------
 
-ACTOR PuzzGear2 : PuzzleItem 9019
+ACTOR PuzzGear2 : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 14
@@ -278,7 +278,7 @@ ACTOR PuzzGear2 : PuzzleItem 9019
 
 // Clock Gear 3 -------------------------------------------------------------
 
-ACTOR PuzzGear3 : PuzzleItem 9020
+ACTOR PuzzGear3 : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 15
@@ -296,7 +296,7 @@ ACTOR PuzzGear3 : PuzzleItem 9020
 
 // Clock Gear 4 -------------------------------------------------------------
 
-ACTOR PuzzGear4 : PuzzleItem 9021
+ACTOR PuzzGear4 : PuzzleItem
 {
 	Game Hexen
 	PuzzleItem.Number 16
diff --git a/wadsrc/static/actors/hexen/serpent.txt b/wadsrc/static/actors/hexen/serpent.txt
index 41d69fe1b..ab666174a 100644
--- a/wadsrc/static/actors/hexen/serpent.txt
+++ b/wadsrc/static/actors/hexen/serpent.txt
@@ -1,7 +1,7 @@
 
 // Serpent ------------------------------------------------------------------
 
-ACTOR Serpent 121
+ACTOR Serpent
 {
 	Game Hexen
 	SpawnID 6
@@ -102,7 +102,7 @@ ACTOR Serpent 121
 
 // Serpent Leader -----------------------------------------------------------
 
-ACTOR SerpentLeader : Serpent 120
+ACTOR SerpentLeader : Serpent
 {
 	Game Hexen
 	SpawnID 7
diff --git a/wadsrc/static/actors/hexen/speedboots.txt b/wadsrc/static/actors/hexen/speedboots.txt
index 5fd6703b8..3644a659b 100644
--- a/wadsrc/static/actors/hexen/speedboots.txt
+++ b/wadsrc/static/actors/hexen/speedboots.txt
@@ -1,6 +1,6 @@
 
 
-ACTOR ArtiSpeedBoots : PowerupGiver 8002
+ACTOR ArtiSpeedBoots : PowerupGiver
 {
 	Game Hexen
 	SpawnID 13
diff --git a/wadsrc/static/actors/hexen/spike.txt b/wadsrc/static/actors/hexen/spike.txt
index 13b1a9c9b..77691e915 100644
--- a/wadsrc/static/actors/hexen/spike.txt
+++ b/wadsrc/static/actors/hexen/spike.txt
@@ -79,7 +79,7 @@ ACTOR ThrustFloor native
 
 // Spike up -----------------------------------------------------------------
 
-ACTOR ThrustFloorUp : ThrustFloor 10091
+ACTOR ThrustFloorUp : ThrustFloor
 {
 	Game Hexen
 	SpawnID 104
@@ -94,7 +94,7 @@ ACTOR ThrustFloorUp : ThrustFloor 10091
 
 // Spike down ---------------------------------------------------------------
 
-ACTOR ThrustFloorDown : ThrustFloor 10090
+ACTOR ThrustFloorDown : ThrustFloor
 {
 	Game Hexen
 	+NOTELEPORT +FLOORCLIP
diff --git a/wadsrc/static/actors/hexen/summon.txt b/wadsrc/static/actors/hexen/summon.txt
index a4b3b8584..1fb482d6c 100644
--- a/wadsrc/static/actors/hexen/summon.txt
+++ b/wadsrc/static/actors/hexen/summon.txt
@@ -1,7 +1,7 @@
 
 // Dark Servant Artifact ----------------------------------------------------
 
-ACTOR ArtiDarkServant : Inventory 86 native
+ACTOR ArtiDarkServant : Inventory native
 {
 	Game Hexen
 	SpawnID 16
diff --git a/wadsrc/static/actors/hexen/teleportother.txt b/wadsrc/static/actors/hexen/teleportother.txt
index 77a05f6af..48f8ba733 100644
--- a/wadsrc/static/actors/hexen/teleportother.txt
+++ b/wadsrc/static/actors/hexen/teleportother.txt
@@ -1,7 +1,7 @@
 
 // Teleport Other Artifact --------------------------------------------------
 
-ACTOR ArtiTeleportOther : Inventory 10040 native
+ACTOR ArtiTeleportOther : Inventory native
 {
 	Game Hexen
 	SpawnID 17
diff --git a/wadsrc/static/actors/hexen/wraith.txt b/wadsrc/static/actors/hexen/wraith.txt
index 0472427fc..b1522681d 100644
--- a/wadsrc/static/actors/hexen/wraith.txt
+++ b/wadsrc/static/actors/hexen/wraith.txt
@@ -1,7 +1,7 @@
 
 // Wraith -------------------------------------------------------------------
 
-ACTOR Wraith 34
+ACTOR Wraith
 {
 	Game Hexen
 	SpawnID 8
@@ -81,7 +81,7 @@ ACTOR Wraith 34
 
 // Buried wraith ------------------------------------------------------------
 
-ACTOR WraithBuried : Wraith 10011
+ACTOR WraithBuried : Wraith
 {
 	Game Hexen
 	SpawnID 9
diff --git a/wadsrc/static/actors/raven/artiegg.txt b/wadsrc/static/actors/raven/artiegg.txt
index d94f00151..0c168c4d2 100644
--- a/wadsrc/static/actors/raven/artiegg.txt
+++ b/wadsrc/static/actors/raven/artiegg.txt
@@ -25,7 +25,7 @@ ACTOR EggFX : MorphProjectile
 
 // Morph Ovum ----------------------------------------------------------------
 
-ACTOR ArtiEgg : CustomInventory 30
+ACTOR ArtiEgg : CustomInventory
 {
 	Game Heretic
 	SpawnID 14
@@ -79,7 +79,7 @@ ACTOR PorkFX : MorphProjectile
 
 // Porkalator ---------------------------------------------------------------
 
-ACTOR ArtiPork : CustomInventory 30
+ACTOR ArtiPork : CustomInventory
 {
 	Game Hexen
 	SpawnID 14
diff --git a/wadsrc/static/actors/raven/artitele.txt b/wadsrc/static/actors/raven/artitele.txt
index 79811fd53..6dad46781 100644
--- a/wadsrc/static/actors/raven/artitele.txt
+++ b/wadsrc/static/actors/raven/artitele.txt
@@ -1,7 +1,7 @@
 
 // Teleport (self) ----------------------------------------------------------
 
-ACTOR ArtiTeleport : Inventory 36 native
+ACTOR ArtiTeleport : Inventory native
 {
 	Game Raven
 	SpawnID 18
diff --git a/wadsrc/static/actors/raven/minotaur.txt b/wadsrc/static/actors/raven/minotaur.txt
index 81d20efeb..ba844fa93 100644
--- a/wadsrc/static/actors/raven/minotaur.txt
+++ b/wadsrc/static/actors/raven/minotaur.txt
@@ -1,4 +1,4 @@
-ACTOR Minotaur 9 native
+ACTOR Minotaur native
 {
 	Game Heretic
 	Health 3000
diff --git a/wadsrc/static/actors/raven/ravenambient.txt b/wadsrc/static/actors/raven/ravenambient.txt
index 8489803e5..6b259e09a 100644
--- a/wadsrc/static/actors/raven/ravenambient.txt
+++ b/wadsrc/static/actors/raven/ravenambient.txt
@@ -2,7 +2,7 @@
 
 // Wind ---------------------------------------------------------------------
 
-ACTOR SoundWind 42
+ACTOR SoundWind
 {
 	Game Heretic
 	SpawnID 110
@@ -17,7 +17,7 @@ ACTOR SoundWind 42
 	}
 }
 
-ACTOR SoundWindHexen : SoundWind 1410
+ACTOR SoundWindHexen : SoundWind
 {
 	Game Hexen
 	SpawnID 110
@@ -26,7 +26,7 @@ ACTOR SoundWindHexen : SoundWind 1410
 
 // Waterfall ----------------------------------------------------------------
 
-ACTOR SoundWaterfall 41
+ACTOR SoundWaterfall
 {
 	Game Heretic
 	SpawnID 111
diff --git a/wadsrc/static/actors/raven/ravenartifacts.txt b/wadsrc/static/actors/raven/ravenartifacts.txt
index c02c19c3b..c80800502 100644
--- a/wadsrc/static/actors/raven/ravenartifacts.txt
+++ b/wadsrc/static/actors/raven/ravenartifacts.txt
@@ -1,7 +1,7 @@
 
 // Health -------------------------------------------------------------------
 
-ACTOR ArtiHealth : HealthPickup 82
+ACTOR ArtiHealth : HealthPickup
 {
 	Game Raven
 	SpawnID 24
@@ -25,7 +25,7 @@ ACTOR ArtiHealth : HealthPickup 82
 
 // Super health -------------------------------------------------------------
 
-ACTOR ArtiSuperHealth : HealthPickup 32
+ACTOR ArtiSuperHealth : HealthPickup
 {
 	Game Raven
 	SpawnID 25
@@ -49,7 +49,7 @@ ACTOR ArtiSuperHealth : HealthPickup 32
 
 // Flight -------------------------------------------------------------------
 
-ACTOR ArtiFly : PowerupGiver 83
+ACTOR ArtiFly : PowerupGiver
 {
 	Game Raven
 	SpawnID 15
@@ -72,7 +72,7 @@ ACTOR ArtiFly : PowerupGiver 83
 
 // Invulnerability Heretic (Ring of invincibility) --------------------------
 
-ACTOR ArtiInvulnerability : PowerupGiver 84
+ACTOR ArtiInvulnerability : PowerupGiver
 {
 	Game Heretic
 	SpawnID 133
@@ -95,7 +95,7 @@ ACTOR ArtiInvulnerability : PowerupGiver 84
 	
 // Invulnerability Hexen (Icon of the defender) -----------------------------
 
-ACTOR ArtiInvulnerability2 : PowerupGiver 84
+ACTOR ArtiInvulnerability2 : PowerupGiver
 {
 	Game Hexen
 	SpawnID 133
@@ -117,7 +117,7 @@ ACTOR ArtiInvulnerability2 : PowerupGiver 84
 	
 // Torch --------------------------------------------------------------------
 
-ACTOR ArtiTorch : PowerupGiver 33
+ACTOR ArtiTorch : PowerupGiver
 {
 	Game Raven
 	SpawnID 73
diff --git a/wadsrc/static/actors/raven/ravenhealth.txt b/wadsrc/static/actors/raven/ravenhealth.txt
index af951be1b..526666532 100644
--- a/wadsrc/static/actors/raven/ravenhealth.txt
+++ b/wadsrc/static/actors/raven/ravenhealth.txt
@@ -1,4 +1,4 @@
-ACTOR CrystalVial : Health 81
+ACTOR CrystalVial : Health
 {
 	Game Raven
 	SpawnID 23
diff --git a/wadsrc/static/actors/shared/bridge.txt b/wadsrc/static/actors/shared/bridge.txt
index f4d979738..9a0224a93 100644
--- a/wadsrc/static/actors/shared/bridge.txt
+++ b/wadsrc/static/actors/shared/bridge.txt
@@ -20,7 +20,7 @@ ACTOR BridgeBall
 
 // The bridge itself -------------------------------------------------------
 
-ACTOR CustomBridge 9991 native
+ACTOR CustomBridge native
 {
 	+SOLID
 	+NOGRAVITY
@@ -51,7 +51,7 @@ ACTOR CustomBridge 9991 native
 
 // The Hexen bridge -------------------------------------------------------
 
-ACTOR Bridge : CustomBridge 118
+ACTOR Bridge : CustomBridge
 {
 	Game Raven
 	SpawnID 21
@@ -61,7 +61,7 @@ ACTOR Bridge : CustomBridge 118
 
 // The ZDoom bridge -------------------------------------------------------
 
-ACTOR ZBridge : CustomBridge 118
+ACTOR ZBridge : CustomBridge
 {
 	Game Doom
 	SpawnID 21
@@ -71,7 +71,7 @@ ACTOR ZBridge : CustomBridge 118
 
 // Invisible bridge --------------------------------------------------------
 
-ACTOR InvisibleBridge 9990 native
+ACTOR InvisibleBridge native
 {
 	RenderStyle None
 	Radius 32
@@ -90,19 +90,19 @@ ACTOR InvisibleBridge 9990 native
 
 // And some invisible bridges from Skull Tag -------------------------------
 
-ACTOR InvisibleBridge32 : InvisibleBridge 5061
+ACTOR InvisibleBridge32 : InvisibleBridge
 {
 	Radius 32
 	Height 8
 }
 
-ACTOR InvisibleBridge16 : InvisibleBridge 5064
+ACTOR InvisibleBridge16 : InvisibleBridge
 {
 	Radius 16
 	Height 8
 }
 
-ACTOR InvisibleBridge8 : InvisibleBridge 5065
+ACTOR InvisibleBridge8 : InvisibleBridge
 {
 	Radius 8
 	Height 8
diff --git a/wadsrc/static/actors/shared/camera.txt b/wadsrc/static/actors/shared/camera.txt
index f2b0220b5..2868c7ec9 100644
--- a/wadsrc/static/actors/shared/camera.txt
+++ b/wadsrc/static/actors/shared/camera.txt
@@ -1,4 +1,4 @@
-ACTOR DoomBuilderCamera 32000
+ACTOR DoomBuilderCamera
 {
 	States
 	{
@@ -9,7 +9,7 @@ ACTOR DoomBuilderCamera 32000
 }
 
 
-ACTOR SecurityCamera 9025 native 
+ACTOR SecurityCamera native 
 {
 	+NOBLOCKMAP 
 	+NOGRAVITY
@@ -17,6 +17,6 @@ ACTOR SecurityCamera 9025 native
 	RenderStyle None
 }
 
-ACTOR AimingCamera : SecurityCamera 9073 native 
+ACTOR AimingCamera : SecurityCamera native 
 {
 }
diff --git a/wadsrc/static/actors/shared/decal.txt b/wadsrc/static/actors/shared/decal.txt
index 132d226f9..ed887ca2f 100644
--- a/wadsrc/static/actors/shared/decal.txt
+++ b/wadsrc/static/actors/shared/decal.txt
@@ -1,3 +1,3 @@
-ACTOR Decal 9200 native
+ACTOR Decal native
 {
 }
diff --git a/wadsrc/static/actors/shared/dog.txt b/wadsrc/static/actors/shared/dog.txt
index 439060d41..5aa88d721 100644
--- a/wadsrc/static/actors/shared/dog.txt
+++ b/wadsrc/static/actors/shared/dog.txt
@@ -1,4 +1,4 @@
-ACTOR MBFHelperDog 888
+ACTOR MBFHelperDog
 {
 	Health 500
 	Speed 10
diff --git a/wadsrc/static/actors/shared/fountain.txt b/wadsrc/static/actors/shared/fountain.txt
index 35062d888..e7a66ed0b 100644
--- a/wadsrc/static/actors/shared/fountain.txt
+++ b/wadsrc/static/actors/shared/fountain.txt
@@ -6,37 +6,37 @@ ACTOR ParticleFountain native
 	+INVISIBLE
 }
 
-ACTOR RedParticleFountain : ParticleFountain 9027
+ACTOR RedParticleFountain : ParticleFountain
 {
 	Health 1
 }
 
-ACTOR GreenParticleFountain : ParticleFountain 9028
+ACTOR GreenParticleFountain : ParticleFountain
 {
 	Health 2
 }
 
-ACTOR BlueParticleFountain : ParticleFountain 9029
+ACTOR BlueParticleFountain : ParticleFountain
 {
 	Health 3
 }
 
-ACTOR YellowParticleFountain : ParticleFountain 9030
+ACTOR YellowParticleFountain : ParticleFountain
 {
 	Health 4
 }
 
-ACTOR PurpleParticleFountain : ParticleFountain 9031
+ACTOR PurpleParticleFountain : ParticleFountain
 {
 	Health 5
 }
 
-ACTOR BlackParticleFountain : ParticleFountain 9032
+ACTOR BlackParticleFountain : ParticleFountain
 {
 	Health 6
 }
 
-ACTOR WhiteParticleFountain : ParticleFountain 9033
+ACTOR WhiteParticleFountain : ParticleFountain
 {
 	Health 7
 }
diff --git a/wadsrc/static/actors/shared/hatetarget.txt b/wadsrc/static/actors/shared/hatetarget.txt
index 293656d40..fccf21444 100644
--- a/wadsrc/static/actors/shared/hatetarget.txt
+++ b/wadsrc/static/actors/shared/hatetarget.txt
@@ -2,7 +2,7 @@
 
 // Hate Target --------------------------------------------------------------
 
-ACTOR HateTarget 9076 native
+ACTOR HateTarget native
 {
 	Radius 20
 	Height 56
diff --git a/wadsrc/static/actors/shared/mapmarker.txt b/wadsrc/static/actors/shared/mapmarker.txt
index 8333a550a..24cf11e8f 100644
--- a/wadsrc/static/actors/shared/mapmarker.txt
+++ b/wadsrc/static/actors/shared/mapmarker.txt
@@ -1,5 +1,5 @@
 
-ACTOR MapMarker 9040 native
+ACTOR MapMarker native
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
diff --git a/wadsrc/static/actors/shared/movingcamera.txt b/wadsrc/static/actors/shared/movingcamera.txt
index 435368b3a..22473512f 100644
--- a/wadsrc/static/actors/shared/movingcamera.txt
+++ b/wadsrc/static/actors/shared/movingcamera.txt
@@ -1,4 +1,4 @@
-ACTOR InterpolationPoint 9070 native
+ACTOR InterpolationPoint native
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
@@ -6,7 +6,7 @@ ACTOR InterpolationPoint 9070 native
 	RenderStyle None
 }
 
-ACTOR InterpolationSpecial 9075 native
+ACTOR InterpolationSpecial native
 {
 	+NOBLOCKMAP
 	+NOSECTOR
@@ -14,7 +14,7 @@ ACTOR InterpolationSpecial 9075 native
 	+DONTSPLASH
 }
 
-ACTOR PathFollower 9071 native
+ACTOR PathFollower native
 {
 	+NOBLOCKMAP
 	+NOSECTOR
@@ -22,11 +22,11 @@ ACTOR PathFollower 9071 native
 	+DONTSPLASH
 }
 
-ACTOR ActorMover : PathFollower 9074 native
+ACTOR ActorMover : PathFollower native
 {
 }
 
-ACTOR MovingCamera : PathFollower 9072 native
+ACTOR MovingCamera : PathFollower native
 {
 }
 
diff --git a/wadsrc/static/actors/shared/secrettrigger.txt b/wadsrc/static/actors/shared/secrettrigger.txt
index b131ac588..498138046 100644
--- a/wadsrc/static/actors/shared/secrettrigger.txt
+++ b/wadsrc/static/actors/shared/secrettrigger.txt
@@ -1,5 +1,5 @@
 
-ACTOR SecretTrigger 9046 native
+ACTOR SecretTrigger native
 {
 	+NOBLOCKMAP
 	+NOSECTOR
diff --git a/wadsrc/static/actors/shared/sectoraction.txt b/wadsrc/static/actors/shared/sectoraction.txt
index 2d7fe2a80..233364331 100644
--- a/wadsrc/static/actors/shared/sectoraction.txt
+++ b/wadsrc/static/actors/shared/sectoraction.txt
@@ -9,73 +9,73 @@ ACTOR SectorAction native
 
 // Triggered when entering sector -------------------------------------------
 
-ACTOR SecActEnter : SectorAction 9998 native
+ACTOR SecActEnter : SectorAction native
 {
 }
 
 // Triggered when leaving sector --------------------------------------------
 
-ACTOR SecActExit : SectorAction 9997 native
+ACTOR SecActExit : SectorAction native
 {
 }
 
 // Triggered when hitting sector's floor ------------------------------------
 
-ACTOR SecActHitFloor : SectorAction 9999 native
+ACTOR SecActHitFloor : SectorAction native
 {
 }
 
 // Triggered when hitting sector's ceiling ----------------------------------
 
-ACTOR SecActHitCeil : SectorAction 9996 native
+ACTOR SecActHitCeil : SectorAction native
 {
 }
 
 // Triggered when using inside sector ---------------------------------------
 
-ACTOR SecActUse : SectorAction 9995 native
+ACTOR SecActUse : SectorAction native
 {
 }
 
 // Triggered when using a sector's wall -------------------------------------
 
-ACTOR SecActUseWall : SectorAction 9994 native
+ACTOR SecActUseWall : SectorAction native
 {
 }
 
 // Triggered when eyes go below fake floor ----------------------------------
 
-ACTOR SecActEyesDive : SectorAction 9993 native
+ACTOR SecActEyesDive : SectorAction native
 {
 }
 
 // Triggered when eyes go above fake floor ----------------------------------
 
-ACTOR SecActEyesSurface : SectorAction 9992 native
+ACTOR SecActEyesSurface : SectorAction native
 {
 }
 
 // Triggered when eyes go below fake floor ----------------------------------
 
-ACTOR SecActEyesBelowC : SectorAction 9983 native
+ACTOR SecActEyesBelowC : SectorAction native
 {
 }
 
 // Triggered when eyes go above fake floor ----------------------------------
 
-ACTOR SecActEyesAboveC : SectorAction 9982 native
+ACTOR SecActEyesAboveC : SectorAction native
 {
 }
 
 // Triggered when eyes go below fake floor ----------------------------------
 
-ACTOR SecActHitFakeFloor : SectorAction 9989 native
+ACTOR SecActHitFakeFloor : SectorAction native
 {
 }
 
 // Music changer ----------------------------------
 
-ACTOR MusicChanger : SectorAction 14165 native
+ACTOR MusicChanger : SectorAction native
 {
 }
 
diff --git a/wadsrc/static/actors/shared/setcolor.txt b/wadsrc/static/actors/shared/setcolor.txt
index a41a62926..5b5fcd911 100644
--- a/wadsrc/static/actors/shared/setcolor.txt
+++ b/wadsrc/static/actors/shared/setcolor.txt
@@ -1,4 +1,4 @@
-ACTOR ColorSetter 9038 native
+ACTOR ColorSetter native
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
@@ -7,7 +7,7 @@ ACTOR ColorSetter 9038 native
 }
 
 
-ACTOR FadeSetter 9039 native
+ACTOR FadeSetter native
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
diff --git a/wadsrc/static/actors/shared/sharedmisc.txt b/wadsrc/static/actors/shared/sharedmisc.txt
index a9ede0245..adeb42e26 100644
--- a/wadsrc/static/actors/shared/sharedmisc.txt
+++ b/wadsrc/static/actors/shared/sharedmisc.txt
@@ -18,7 +18,7 @@ ACTOR Unknown
 
 // Route node for monster patrols -------------------------------------------
 
-ACTOR PatrolPoint 9024
+ACTOR PatrolPoint
 {
 	Radius 8
 	Height 8
@@ -31,7 +31,7 @@ ACTOR PatrolPoint 9024
 
 // A special to execute when a monster reaches a matching patrol point ------
 
-ACTOR PatrolSpecial 9047
+ACTOR PatrolSpecial
 {
 	Radius 8
 	Height 8
@@ -44,7 +44,7 @@ ACTOR PatrolSpecial 9047
 
 // Map spot ----------------------------------------------------------------
 
-ACTOR MapSpot 9001
+ACTOR MapSpot
 {
 	+NOBLOCKMAP
 	+NOSECTOR
@@ -55,13 +55,13 @@ ACTOR MapSpot 9001
 
 // same with different editor number for Legacy maps -----------------------
 
-ACTOR FS_Mapspot : Mapspot 5004
+ACTOR FS_Mapspot : Mapspot 
 {
 }
 
 // Map spot with gravity ---------------------------------------------------
 
-ACTOR MapSpotGravity : MapSpot 9013
+ACTOR MapSpotGravity : MapSpot
 {
 	-NOBLOCKMAP
 	-NOSECTOR
@@ -70,13 +70,13 @@ ACTOR MapSpotGravity : MapSpot 9013
 
 // Point Pushers -----------------------------------------------------------
 
-ACTOR PointPusher 5001
+ACTOR PointPusher
 {
 	+NOBLOCKMAP
 	+INVISIBLE
 }
 
-ACTOR PointPuller 5002
+ACTOR PointPuller
 {
 	+NOBLOCKMAP
 	+INVISIBLE
@@ -103,7 +103,7 @@ ACTOR RealGibs
 // a deh patch to change the gibs, since ZDoom actually creates a gib actor
 // for actors that get crushed instead of changing their state as Doom did.
 
-ACTOR Gibs : RealGibs 24
+ACTOR Gibs : RealGibs
 {
 	Game Doom
 	SpawnID 146
@@ -112,7 +112,7 @@ ACTOR Gibs : RealGibs 24
 
 // Needed for loading Build maps -------------------------------------------
 
-ACTOR CustomSprite 9988 native
+ACTOR CustomSprite native
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
@@ -155,7 +155,7 @@ ACTOR FastProjectile native
 
 // Sector flag setter ------------------------------------------------------
 
-ACTOR SectorFlagSetter 9041 native
+ACTOR SectorFlagSetter native
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
diff --git a/wadsrc/static/actors/shared/skies.txt b/wadsrc/static/actors/shared/skies.txt
index 3b531d527..b21b02f3d 100644
--- a/wadsrc/static/actors/shared/skies.txt
+++ b/wadsrc/static/actors/shared/skies.txt
@@ -1,4 +1,4 @@
-ACTOR SkyViewpoint 9080 native 
+ACTOR SkyViewpoint native 
 {
 	+NOSECTOR
 	+NOBLOCKMAP
@@ -6,7 +6,7 @@ ACTOR SkyViewpoint 9080 native
 	+DONTSPLASH
 }
 
-ACTOR SkyPicker 9081 native 
+ACTOR SkyPicker native 
 {
 	+NOSECTOR
 	+NOBLOCKMAP
@@ -14,7 +14,7 @@ ACTOR SkyPicker 9081 native
 	+DONTSPLASH
 }
 
-Actor SkyCamCompat : SkyViewpoint 9083 native
+Actor SkyCamCompat : SkyViewpoint native
 {
 }
 
@@ -22,16 +22,16 @@ ACTOR StackPoint : SkyViewpoint native
 {
 }
 
-ACTOR UpperStackLookOnly : StackPoint 9077
+ACTOR UpperStackLookOnly : StackPoint
 {
 }
 
-ACTOR LowerStackLookOnly : StackPoint 9078
+ACTOR LowerStackLookOnly : StackPoint
 {
 }
 
 
-ACTOR SectorSilencer 9082 native 
+ACTOR SectorSilencer native 
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
diff --git a/wadsrc/static/actors/shared/soundenvironment.txt b/wadsrc/static/actors/shared/soundenvironment.txt
index 9e6dad381..8d325909e 100644
--- a/wadsrc/static/actors/shared/soundenvironment.txt
+++ b/wadsrc/static/actors/shared/soundenvironment.txt
@@ -1,5 +1,5 @@
 
-ACTOR SoundEnvironment 9048 native
+ACTOR SoundEnvironment native
 {
 	+NOSECTOR
 	+NOBLOCKMAP
diff --git a/wadsrc/static/actors/shared/soundsequence.txt b/wadsrc/static/actors/shared/soundsequence.txt
index ff240ba9c..868251a04 100644
--- a/wadsrc/static/actors/shared/soundsequence.txt
+++ b/wadsrc/static/actors/shared/soundsequence.txt
@@ -1,12 +1,12 @@
 
-ACTOR AmbientSound 14065 native
+ACTOR AmbientSound native
 {
 	+NOBLOCKMAP
 	+NOSECTOR
 	+DONTSPLASH
 }
 
-ACTOR AmbientSoundNoGravity : AmbientSound 14067
+ACTOR AmbientSoundNoGravity : AmbientSound
 {
 	+NOGRAVITY
 }
@@ -18,7 +18,7 @@ ACTOR SoundSequenceSlot native
 	+DONTSPLASH
 }
 
-ACTOR SoundSequence 14066 native
+ACTOR SoundSequence native
 {
 	+NOSECTOR
 	+NOBLOCKMAP
@@ -27,61 +27,61 @@ ACTOR SoundSequence 14066 native
 
 // Heretic Sound sequences -----------------------------------------------------------
 
-ACTOR HereticSoundSequence1 : SoundSequence 1200
+ACTOR HereticSoundSequence1 : SoundSequence
 {
 	Game Heretic
 	Args 0
 }
 
-ACTOR HereticSoundSequence2 : SoundSequence 1201
+ACTOR HereticSoundSequence2 : SoundSequence
 {
 	Game Heretic
 	Args 1
 }
 
-ACTOR HereticSoundSequence3 : SoundSequence 1202
+ACTOR HereticSoundSequence3 : SoundSequence
 {
 	Game Heretic
 	Args 2
 }
 
-ACTOR HereticSoundSequence4 : SoundSequence 1203
+ACTOR HereticSoundSequence4 : SoundSequence
 {
 	Game Heretic
 	Args 3
 }
 
-ACTOR HereticSoundSequence5 : SoundSequence 1204
+ACTOR HereticSoundSequence5 : SoundSequence
 {
 	Game Heretic
 	Args 4
 }
 
-ACTOR HereticSoundSequence6 : SoundSequence 1205
+ACTOR HereticSoundSequence6 : SoundSequence
 {
 	Game Heretic
 	Args 5
 }
 
-ACTOR HereticSoundSequence7 : SoundSequence 1206
+ACTOR HereticSoundSequence7 : SoundSequence
 {
 	Game Heretic
 	Args 6
 }
 
-ACTOR HereticSoundSequence8 : SoundSequence 1207
+ACTOR HereticSoundSequence8 : SoundSequence
 {
 	Game Heretic
 	Args 7
 }
 
-ACTOR HereticSoundSequence9 : SoundSequence 1208
+ACTOR HereticSoundSequence9 : SoundSequence
 {
 	Game Heretic
 	Args 8
 }
 
-ACTOR HereticSoundSequence10 : SoundSequence 1209
+ACTOR HereticSoundSequence10 : SoundSequence
 {
 	Game Heretic
 	Args 9
diff --git a/wadsrc/static/actors/shared/spark.txt b/wadsrc/static/actors/shared/spark.txt
index 4637ccaa9..008a27d40 100644
--- a/wadsrc/static/actors/shared/spark.txt
+++ b/wadsrc/static/actors/shared/spark.txt
@@ -1,5 +1,5 @@
 
-ACTOR Spark 9026 native
+ACTOR Spark native
 {
 	+NOSECTOR
 	+NOBLOCKMAP
diff --git a/wadsrc/static/actors/shared/teleport.txt b/wadsrc/static/actors/shared/teleport.txt
index a91eaf9d4..d45dbbd7b 100644
--- a/wadsrc/static/actors/shared/teleport.txt
+++ b/wadsrc/static/actors/shared/teleport.txt
@@ -23,19 +23,19 @@ ACTOR TeleportFog native
 
 
 
-ACTOR TeleportDest 14
+ACTOR TeleportDest
 {
 	+NOBLOCKMAP
 	+NOSECTOR
 	+DONTSPLASH
 }
 
-ACTOR TeleportDest2 : TeleportDest 9044
+ACTOR TeleportDest2 : TeleportDest
 {
 	+NOGRAVITY
 }
 
-ACTOR TeleportDest3 : TeleportDest2 9043
+ACTOR TeleportDest3 : TeleportDest2
 {
 	-NOGRAVITY
 }
diff --git a/wadsrc/static/actors/shared/waterzone.txt b/wadsrc/static/actors/shared/waterzone.txt
index 6bd5dbbb7..ddb223e2d 100644
--- a/wadsrc/static/actors/shared/waterzone.txt
+++ b/wadsrc/static/actors/shared/waterzone.txt
@@ -1,4 +1,4 @@
-ACTOR WaterZone 9045 native
+ACTOR WaterZone native
 {
 	+NOSECTOR
 	+NOBLOCKMAP
diff --git a/wadsrc/static/actors/strife/acolyte.txt b/wadsrc/static/actors/strife/acolyte.txt
index 3ca1dec62..a111bd4df 100644
--- a/wadsrc/static/actors/strife/acolyte.txt
+++ b/wadsrc/static/actors/strife/acolyte.txt
@@ -78,7 +78,7 @@ ACTOR Acolyte : StrifeHumanoid
 
 // Acolyte 1 ----------------------------------------------------------------
 
-ACTOR AcolyteTan : Acolyte 3002
+ACTOR AcolyteTan : Acolyte
 {
 	Game Strife
 	ConversationID 53, 52, 53
@@ -88,7 +88,7 @@ ACTOR AcolyteTan : Acolyte 3002
 
 // Acolyte 2 ----------------------------------------------------------------
 
-ACTOR AcolyteRed : Acolyte 142
+ACTOR AcolyteRed : Acolyte
 {
 	Game Strife
 	ConversationID 54, 53, 54
@@ -98,7 +98,7 @@ ACTOR AcolyteRed : Acolyte 142
 
 // Acolyte 3 ----------------------------------------------------------------
 
-ACTOR AcolyteRust : Acolyte 143
+ACTOR AcolyteRust : Acolyte
 {
 	Game Strife
 	ConversationID 55, 54, 55
@@ -108,7 +108,7 @@ ACTOR AcolyteRust : Acolyte 143
 
 // Acolyte 4 ----------------------------------------------------------------
 
-ACTOR AcolyteGray : Acolyte 146
+ACTOR AcolyteGray : Acolyte
 {
 	Game Strife
 	ConversationID 56, 55, 56
@@ -118,7 +118,7 @@ ACTOR AcolyteGray : Acolyte 146
 
 // Acolyte 5 ----------------------------------------------------------------
 
-ACTOR AcolyteDGreen : Acolyte 147
+ACTOR AcolyteDGreen : Acolyte
 {
 	Game Strife
 	ConversationID 57, 56, 57
@@ -128,7 +128,7 @@ ACTOR AcolyteDGreen : Acolyte 147
 
 // Acolyte 6 ----------------------------------------------------------------
 
-ACTOR AcolyteGold : Acolyte 148
+ACTOR AcolyteGold : Acolyte
 {
 	Game Strife
 	ConversationID 58, 57, 58
@@ -138,7 +138,7 @@ ACTOR AcolyteGold : Acolyte 148
 
 // Acolyte 7 ----------------------------------------------------------------
 
-ACTOR AcolyteLGreen : Acolyte 232
+ACTOR AcolyteLGreen : Acolyte
 {
 	Game Strife
 	Health 60
@@ -148,7 +148,7 @@ ACTOR AcolyteLGreen : Acolyte 232
 
 // Acolyte 8 ----------------------------------------------------------------
 
-ACTOR AcolyteBlue : Acolyte 231
+ACTOR AcolyteBlue : Acolyte
 {
 	Game Strife
 	Health 60
@@ -158,7 +158,7 @@ ACTOR AcolyteBlue : Acolyte 231
 
 // Shadow Acolyte -----------------------------------------------------------
 
-ACTOR AcolyteShadow : Acolyte 58
+ACTOR AcolyteShadow : Acolyte
 {
 	Game Strife
 	ConversationID 61, 58, 59
@@ -178,7 +178,7 @@ ACTOR AcolyteShadow : Acolyte 58
 
 // Some guy turning into an acolyte -----------------------------------------
 
-ACTOR AcolyteToBe : Acolyte 201
+ACTOR AcolyteToBe : Acolyte
 {
 	Game Strife
 	ConversationID 29, -1, -1
diff --git a/wadsrc/static/actors/strife/alienspectres.txt b/wadsrc/static/actors/strife/alienspectres.txt
index 6e56f680d..6391ebf22 100644
--- a/wadsrc/static/actors/strife/alienspectres.txt
+++ b/wadsrc/static/actors/strife/alienspectres.txt
@@ -1,7 +1,7 @@
 
 // Alien Spectre 1 -----------------------------------------------------------
 
-ACTOR AlienSpectre1 : SpectralMonster 129
+ACTOR AlienSpectre1 : SpectralMonster
 {
 	Game Strife
 	ConversationID 67,-1,-1
@@ -80,7 +80,7 @@ ACTOR AlienSpectre1 : SpectralMonster 129
 
 // Alien Spectre 2 -----------------------------------------------------------
 
-ACTOR AlienSpectre2 : AlienSpectre1 75
+ACTOR AlienSpectre2 : AlienSpectre1
 {
 	Game Strife
 	ConversationID 70
@@ -101,7 +101,7 @@ ACTOR AlienSpectre2 : AlienSpectre1 75
 // Alien Spectre 3 ----------------------------------------------------------
 // This is the Oracle's personal spectre, so it's a little different.
 
-ACTOR AlienSpectre3 : AlienSpectre1 76
+ACTOR AlienSpectre3 : AlienSpectre1
 {
 	Game Strife
 	ConversationID 71,-1,-1
@@ -143,7 +143,7 @@ ACTOR AlienSpectre3 : AlienSpectre1 76
 
 // Alien Spectre 4 -----------------------------------------------------------
 
-ACTOR AlienSpectre4 : AlienSpectre1 167
+ACTOR AlienSpectre4 : AlienSpectre1
 {
 	Game Strife
 	ConversationID 72,-1,-1
@@ -164,7 +164,7 @@ ACTOR AlienSpectre4 : AlienSpectre1 167
 
 // Alien Spectre 5 -----------------------------------------------------------
 
-ACTOR AlienSpectre5 : AlienSpectre1 168
+ACTOR AlienSpectre5 : AlienSpectre1
 {
 	Game Strife
 	ConversationID 73,-1,-1
diff --git a/wadsrc/static/actors/strife/beggars.txt b/wadsrc/static/actors/strife/beggars.txt
index b24080b1a..9f529c7b3 100644
--- a/wadsrc/static/actors/strife/beggars.txt
+++ b/wadsrc/static/actors/strife/beggars.txt
@@ -62,35 +62,35 @@ ACTOR Beggar : StrifeHumanoid
 
 // Beggars -----------------------------------------------------------------
 
-ACTOR Beggar1 : Beggar 141
+ACTOR Beggar1 : Beggar
 {
 	Game Strife
 	ConversationID 38, 37, 38
 }
 
 
-ACTOR Beggar2 : Beggar 155
+ACTOR Beggar2 : Beggar
 {
 	Game Strife
 	ConversationID 39, 38, 39
 }
 
 
-ACTOR Beggar3 : Beggar 156
+ACTOR Beggar3 : Beggar
 {
 	Game Strife
 	ConversationID 40, 39, 40
 }
 
 
-ACTOR Beggar4 : Beggar 157
+ACTOR Beggar4 : Beggar
 {
 	Game Strife
 	ConversationID 41, 40, 41
 }
 
 
-ACTOR Beggar5 : Beggar 158
+ACTOR Beggar5 : Beggar
 {
 	Game Strife
 	ConversationID 42, 41, 42
diff --git a/wadsrc/static/actors/strife/coin.txt b/wadsrc/static/actors/strife/coin.txt
index e4e50af77..4fc5825f1 100644
--- a/wadsrc/static/actors/strife/coin.txt
+++ b/wadsrc/static/actors/strife/coin.txt
@@ -1,7 +1,7 @@
 
 // Coin ---------------------------------------------------------------------
 
-ACTOR Coin : Inventory 93 native
+ACTOR Coin : Inventory native
 {
 	Game Strife
 	ConversationID 168, 161, 165
@@ -24,7 +24,7 @@ ACTOR Coin : Inventory 93 native
 
 // 10 Gold ------------------------------------------------------------------
 
-ACTOR Gold10 : Coin 138
+ACTOR Gold10 : Coin
 {
 	Game Strife
 	ConversationID 169, 162, 166
@@ -41,7 +41,7 @@ ACTOR Gold10 : Coin 138
 
 // 25 Gold ------------------------------------------------------------------
 
-ACTOR Gold25 : Coin 139
+ACTOR Gold25 : Coin
 {
 	Game Strife
 	ConversationID 170, 163, 167
@@ -58,7 +58,7 @@ ACTOR Gold25 : Coin 139
 
 // 50 Gold ------------------------------------------------------------------
 
-ACTOR Gold50 : Coin 140
+ACTOR Gold50 : Coin
 {
 	Game Strife
 	ConversationID 171, 164, 168
diff --git a/wadsrc/static/actors/strife/crusader.txt b/wadsrc/static/actors/strife/crusader.txt
index eb1ceec6d..22aaecdb5 100644
--- a/wadsrc/static/actors/strife/crusader.txt
+++ b/wadsrc/static/actors/strife/crusader.txt
@@ -1,7 +1,7 @@
 
 // Crusader -----------------------------------------------------------------
 
-ACTOR Crusader 3005
+ACTOR Crusader
 {
 	Game Strife
 	ConversationID 63,-1,-1
@@ -110,7 +110,7 @@ ACTOR CrusaderMissile
 
 // Dead Crusader ------------------------------------------------------------
 
-ACTOR DeadCrusader 22
+ACTOR DeadCrusader
 {
 	Game Strife 
 	ConversationID 230
diff --git a/wadsrc/static/actors/strife/entityboss.txt b/wadsrc/static/actors/strife/entityboss.txt
index 3980eb04e..90769d4b0 100644
--- a/wadsrc/static/actors/strife/entityboss.txt
+++ b/wadsrc/static/actors/strife/entityboss.txt
@@ -1,7 +1,7 @@
 
 // Entity Nest --------------------------------------------------------------
 
-ACTOR EntityNest 26
+ACTOR EntityNest
 {
 	Game Strife
 	ConversationID 76,-1,-1
@@ -20,7 +20,7 @@ ACTOR EntityNest 26
 
 // Entity Pod ---------------------------------------------------------------
 
-ACTOR EntityPod 198
+ACTOR EntityPod
 {
 	Game Strife
 	ConversationID 77,-1,-1
@@ -50,7 +50,7 @@ ACTOR EntityPod 198
 
 // Entity Boss --------------------------------------------------------------
 
-ACTOR EntityBoss : SpectralMonster 128
+ACTOR EntityBoss : SpectralMonster
 {
 	Game Strife
 	ConversationID 74,-1,-1
diff --git a/wadsrc/static/actors/strife/inquisitor.txt b/wadsrc/static/actors/strife/inquisitor.txt
index e792e5803..211dc0755 100644
--- a/wadsrc/static/actors/strife/inquisitor.txt
+++ b/wadsrc/static/actors/strife/inquisitor.txt
@@ -1,7 +1,7 @@
 
 // Inquisitor ---------------------------------------------------------------
 
-ACTOR Inquisitor 16
+ACTOR Inquisitor
 {
 	Game Strife
 	ConversationID 93,-1,-1
diff --git a/wadsrc/static/actors/strife/loremaster.txt b/wadsrc/static/actors/strife/loremaster.txt
index fee3eb0f0..8c6f5caa9 100644
--- a/wadsrc/static/actors/strife/loremaster.txt
+++ b/wadsrc/static/actors/strife/loremaster.txt
@@ -1,7 +1,7 @@
 
 // Loremaster (aka Priest) --------------------------------------------------
 
-ACTOR Loremaster 12
+ACTOR Loremaster
 {	
 	Game Strife
 	ConversationID 66, 63, 64
diff --git a/wadsrc/static/actors/strife/macil.txt b/wadsrc/static/actors/strife/macil.txt
index ac23e4e66..c479dd4b3 100644
--- a/wadsrc/static/actors/strife/macil.txt
+++ b/wadsrc/static/actors/strife/macil.txt
@@ -1,7 +1,7 @@
 
 // Macil (version 1) ---------------------------------------------------------
 
-ACTOR Macil1 64
+ACTOR Macil1
 {
 	Game Strife
 	ConversationID 49, 48, 49
@@ -58,7 +58,7 @@ ACTOR Macil1 64
 
 // Macil (version 2) ---------------------------------------------------------
 
-ACTOR Macil2 : Macil1 200
+ACTOR Macil2 : Macil1
 {
 	Game Strife
 	ConversationID 50, 49, 50
diff --git a/wadsrc/static/actors/strife/merchants.txt b/wadsrc/static/actors/strife/merchants.txt
index b6a2e09a5..4c8265892 100644
--- a/wadsrc/static/actors/strife/merchants.txt
+++ b/wadsrc/static/actors/strife/merchants.txt
@@ -54,7 +54,7 @@ ACTOR Merchant
 
 // Weapon Smith -------------------------------------------------------------
 
-ACTOR WeaponSmith : Merchant 116
+ACTOR WeaponSmith : Merchant
 {
 	Game Strife
 	ConversationID 2
@@ -65,7 +65,7 @@ ACTOR WeaponSmith : Merchant 116
 
 // Bar Keep -----------------------------------------------------------------
 
-ACTOR BarKeep : Merchant 72
+ACTOR BarKeep : Merchant
 {
 	Game Strife
 	Translation 4
@@ -78,7 +78,7 @@ ACTOR BarKeep : Merchant 72
 
 // Armorer ------------------------------------------------------------------
 
-ACTOR Armorer : Merchant 73
+ACTOR Armorer : Merchant
 {
 	Game Strife
 	Translation 5
@@ -90,7 +90,7 @@ ACTOR Armorer : Merchant 73
 
 // Medic --------------------------------------------------------------------
 
-ACTOR Medic : Merchant 74
+ACTOR Medic : Merchant
 {
 	Game Strife
 	Translation 6
diff --git a/wadsrc/static/actors/strife/oracle.txt b/wadsrc/static/actors/strife/oracle.txt
index 2e0aff948..43e5dcaa4 100644
--- a/wadsrc/static/actors/strife/oracle.txt
+++ b/wadsrc/static/actors/strife/oracle.txt
@@ -1,7 +1,7 @@
 
 // Oracle -------------------------------------------------------------------
 
-ACTOR Oracle 199
+ACTOR Oracle
 {
 	Game Strife
 	ConversationID 65, 62, 63
diff --git a/wadsrc/static/actors/strife/peasants.txt b/wadsrc/static/actors/strife/peasants.txt
index af12b75df..08e5ef09c 100644
--- a/wadsrc/static/actors/strife/peasants.txt
+++ b/wadsrc/static/actors/strife/peasants.txt
@@ -67,28 +67,28 @@ ACTOR Peasant : StrifeHumanoid
 
 // Peasant Variant 1 --------------------------------------------------------
 
-ACTOR Peasant1 : Peasant 3004
+ACTOR Peasant1 : Peasant
 {
 	Game Strife
 	ConversationID 6
 	Speed 4
 }
 
-ACTOR Peasant2 : Peasant 130
+ACTOR Peasant2 : Peasant
 {
 	Game Strife
 	ConversationID 7
 	Speed 5
 }
 
-ACTOR Peasant3 : Peasant 131
+ACTOR Peasant3 : Peasant
 {
 	Game Strife
 	ConversationID 8
 	Speed 5
 }
 
-ACTOR Peasant4 : Peasant 65
+ACTOR Peasant4 : Peasant
 {
 	Game Strife
 	Translation 0
@@ -96,7 +96,7 @@ ACTOR Peasant4 : Peasant 65
 	Speed 7
 }
 
-ACTOR Peasant5 : Peasant 132
+ACTOR Peasant5 : Peasant
 {
 	Game Strife
 	Translation 0
@@ -104,7 +104,7 @@ ACTOR Peasant5 : Peasant 132
 	Speed 7
 }
 
-ACTOR Peasant6 : Peasant 133
+ACTOR Peasant6 : Peasant
 {
 	Game Strife
 	Translation 0
@@ -112,112 +112,112 @@ ACTOR Peasant6 : Peasant 133
 	Speed 7
 }
 
-ACTOR Peasant7 : Peasant 66
+ACTOR Peasant7 : Peasant
 {
 	Game Strife
 	Translation 2
 	ConversationID 12
 }
 
-ACTOR Peasant8 : Peasant 134
+ACTOR Peasant8 : Peasant
 {
 	Game Strife
 	Translation 2
 	ConversationID 13
 }
 
-ACTOR Peasant9 : Peasant 135
+ACTOR Peasant9 : Peasant
 {
 	Game Strife
 	Translation 2
 	ConversationID 14
 }
 
-ACTOR Peasant10 : Peasant 67
+ACTOR Peasant10 : Peasant
 {
 	Game Strife
 	Translation 1
 	ConversationID 15
 }
 
-ACTOR Peasant11 : Peasant 136
+ACTOR Peasant11 : Peasant
 {
 	Game Strife
 	Translation 1
 	ConversationID 16
 }
 
-ACTOR Peasant12 : Peasant 137
+ACTOR Peasant12 : Peasant
 {
 	Game Strife
 	Translation 1
 	ConversationID 17
 }
 
-ACTOR Peasant13 : Peasant 172
+ACTOR Peasant13 : Peasant
 {
 	Game Strife
 	Translation 3
 	ConversationID 18
 }
 
-ACTOR Peasant14 : Peasant 173
+ACTOR Peasant14 : Peasant
 {
 	Game Strife
 	Translation 3
 	ConversationID 19
 }
 
-ACTOR Peasant15 : Peasant 174
+ACTOR Peasant15 : Peasant
 {
 	Game Strife
 	Translation 3
 	ConversationID 20
 }
 
-ACTOR Peasant16 : Peasant 175
+ACTOR Peasant16 : Peasant
 {
 	Game Strife
 	Translation 5
 	ConversationID 21
 }
 
-ACTOR Peasant17 : Peasant 176
+ACTOR Peasant17 : Peasant
 {
 	Game Strife
 	Translation 5
 	ConversationID 22
 }
 
-ACTOR Peasant18 : Peasant 177
+ACTOR Peasant18 : Peasant
 {
 	Game Strife
 	Translation 5
 	ConversationID 23
 }
 
-ACTOR Peasant19 : Peasant 178
+ACTOR Peasant19 : Peasant
 {
 	Game Strife
 	Translation 4
 	ConversationID 24
 }
 
-ACTOR Peasant20 : Peasant 179
+ACTOR Peasant20 : Peasant
 {
 	Game Strife
 	Translation 4
 	ConversationID 25
 }
 
-ACTOR Peasant21 : Peasant 180
+ACTOR Peasant21 : Peasant
 {
 	Game Strife
 	Translation 4
 	ConversationID 26
 }
 
-ACTOR Peasant22 : Peasant 181
+ACTOR Peasant22 : Peasant
 {
 	Game Strife
 	Translation 6
diff --git a/wadsrc/static/actors/strife/programmer.txt b/wadsrc/static/actors/strife/programmer.txt
index 755b453be..4b6fef390 100644
--- a/wadsrc/static/actors/strife/programmer.txt
+++ b/wadsrc/static/actors/strife/programmer.txt
@@ -1,7 +1,7 @@
 
 // Programmer ---------------------------------------------------------------
 
-ACTOR Programmer 71
+ACTOR Programmer
 {
 	Game Strife
 	ConversationID 95, -1, -1
diff --git a/wadsrc/static/actors/strife/ratbuddy.txt b/wadsrc/static/actors/strife/ratbuddy.txt
index eaefda35d..646323c43 100644
--- a/wadsrc/static/actors/strife/ratbuddy.txt
+++ b/wadsrc/static/actors/strife/ratbuddy.txt
@@ -1,5 +1,5 @@
 
-ACTOR RatBuddy 85
+ACTOR RatBuddy
 {
 	Game Strife
 	ConversationID 202, 196, 200
diff --git a/wadsrc/static/actors/strife/reaver.txt b/wadsrc/static/actors/strife/reaver.txt
index a69947373..8df0f9d75 100644
--- a/wadsrc/static/actors/strife/reaver.txt
+++ b/wadsrc/static/actors/strife/reaver.txt
@@ -1,5 +1,5 @@
 
-ACTOR Reaver 3001
+ACTOR Reaver
 {
 	Game Strife
 	Health 150
diff --git a/wadsrc/static/actors/strife/rebels.txt b/wadsrc/static/actors/strife/rebels.txt
index 3c539bca4..2ac3469ad 100644
--- a/wadsrc/static/actors/strife/rebels.txt
+++ b/wadsrc/static/actors/strife/rebels.txt
@@ -64,7 +64,7 @@ ACTOR Rebel : StrifeHumanoid
 
 // Rebel 1 ------------------------------------------------------------------
 
-ACTOR Rebel1 : Rebel 9
+ACTOR Rebel1 : Rebel
 {
 	Game Strife
 	ConversationID 43, 42, 43
@@ -73,7 +73,7 @@ ACTOR Rebel1 : Rebel 9
 
 // Rebel 2 ------------------------------------------------------------------
 
-ACTOR Rebel2 : Rebel 144
+ACTOR Rebel2 : Rebel
 {
 	Game Strife
 	ConversationID 44, 43, 44
@@ -81,7 +81,7 @@ ACTOR Rebel2 : Rebel 144
 
 // Rebel 3 ------------------------------------------------------------------
 
-ACTOR Rebel3 : Rebel 145
+ACTOR Rebel3 : Rebel
 {
 	Game Strife
 	ConversationID 45, 44, 45
@@ -89,7 +89,7 @@ ACTOR Rebel3 : Rebel 145
 
 // Rebel 4 ------------------------------------------------------------------
 
-ACTOR Rebel4 : Rebel 149
+ACTOR Rebel4 : Rebel
 {
 	Game Strife
 	ConversationID 46, 45, 56
@@ -97,7 +97,7 @@ ACTOR Rebel4 : Rebel 149
 
 // Rebel 5 ------------------------------------------------------------------
 
-ACTOR Rebel5 : Rebel 150
+ACTOR Rebel5 : Rebel
 {
 	Game Strife
 	ConversationID 47, 46, 47
@@ -105,7 +105,7 @@ ACTOR Rebel5 : Rebel 150
 
 // Rebel 6 ------------------------------------------------------------------
 
-ACTOR Rebel6 : Rebel 151
+ACTOR Rebel6 : Rebel
 {
 	Game Strife
 	ConversationID 48, 47, 48
@@ -113,7 +113,7 @@ ACTOR Rebel6 : Rebel 151
 
 // Teleporter Beacon --------------------------------------------------------
 
-ACTOR TeleporterBeacon : Inventory 10 native
+ACTOR TeleporterBeacon : Inventory native
 {
 	Game Strife
 	ConversationID 166,-1,-1
diff --git a/wadsrc/static/actors/strife/sentinel.txt b/wadsrc/static/actors/strife/sentinel.txt
index 14bbaf8e1..e7a1866ca 100644
--- a/wadsrc/static/actors/strife/sentinel.txt
+++ b/wadsrc/static/actors/strife/sentinel.txt
@@ -1,7 +1,7 @@
 
 // Sentinel -----------------------------------------------------------------
 
-ACTOR Sentinel 3006
+ACTOR Sentinel
 {
 	Game Strife
 	ConversationID 91,-1,-1
diff --git a/wadsrc/static/actors/strife/sigil.txt b/wadsrc/static/actors/strife/sigil.txt
index a2cc66c7b..3c6899430 100644
--- a/wadsrc/static/actors/strife/sigil.txt
+++ b/wadsrc/static/actors/strife/sigil.txt
@@ -123,7 +123,7 @@ ACTOR Sigil : Weapon native
 
 // Sigil 1 ------------------------------------------------------------------
 
-ACTOR Sigil1 : Sigil 77
+ACTOR Sigil1 : Sigil
 {
 	Game Strife
 	ConversationID 196, 190, 194
@@ -133,7 +133,7 @@ ACTOR Sigil1 : Sigil 77
 
 // Sigil 2 ------------------------------------------------------------------
 
-ACTOR Sigil2 : Sigil 78
+ACTOR Sigil2 : Sigil
 {
 	Game Strife
 	ConversationID 197, 191, 195
@@ -143,7 +143,7 @@ ACTOR Sigil2 : Sigil 78
 
 // Sigil 3 ------------------------------------------------------------------
 
-ACTOR Sigil3 : Sigil 79
+ACTOR Sigil3 : Sigil
 {
 	Game Strife
 	ConversationID 198, 192, 196
@@ -153,7 +153,7 @@ ACTOR Sigil3 : Sigil 79
 
 // Sigil 4 ------------------------------------------------------------------
 
-ACTOR Sigil4 : Sigil 80
+ACTOR Sigil4 : Sigil
 {
 	Game Strife
 	ConversationID 199, 193, 197
@@ -163,7 +163,7 @@ ACTOR Sigil4 : Sigil 80
 
 // Sigil 5 ------------------------------------------------------------------
 
-ACTOR Sigil5 : Sigil 81
+ACTOR Sigil5 : Sigil
 {
 	Game Strife
 	ConversationID 200, 194, 198
diff --git a/wadsrc/static/actors/strife/stalker.txt b/wadsrc/static/actors/strife/stalker.txt
index 0a537c762..f0792743f 100644
--- a/wadsrc/static/actors/strife/stalker.txt
+++ b/wadsrc/static/actors/strife/stalker.txt
@@ -2,7 +2,7 @@
 
 // Stalker ------------------------------------------------------------------
 
-ACTOR Stalker 186
+ACTOR Stalker
 {
 	Game Strife
 	ConversationID 92,-1,-1
diff --git a/wadsrc/static/actors/strife/strifeammo.txt b/wadsrc/static/actors/strife/strifeammo.txt
index 801714434..5d5e35c8d 100644
--- a/wadsrc/static/actors/strife/strifeammo.txt
+++ b/wadsrc/static/actors/strife/strifeammo.txt
@@ -1,6 +1,6 @@
 // HE-Grenade Rounds --------------------------------------------------------
 
-ACTOR HEGrenadeRounds : Ammo 152
+ACTOR HEGrenadeRounds : Ammo
 {
 	Game Strife
 	+FLOORCLIP
@@ -22,7 +22,7 @@ ACTOR HEGrenadeRounds : Ammo 152
 
 // Phosphorus-Grenade Rounds ------------------------------------------------
 
-ACTOR PhosphorusGrenadeRounds : Ammo 153
+ACTOR PhosphorusGrenadeRounds : Ammo
 {
 	Game Strife
 	+FLOORCLIP
@@ -44,7 +44,7 @@ ACTOR PhosphorusGrenadeRounds : Ammo 153
 
 // Clip of Bullets ----------------------------------------------------------
 
-ACTOR ClipOfBullets : Ammo 2007
+ACTOR ClipOfBullets : Ammo
 {
 	Game Strife
 	SpawnID 11
@@ -67,7 +67,7 @@ ACTOR ClipOfBullets : Ammo 2007
 
 // Box of Bullets -----------------------------------------------------------
 
-ACTOR BoxOfBullets : ClipOfBullets 2048
+ACTOR BoxOfBullets : ClipOfBullets
 {
 	Game Strife
 	SpawnID 139
@@ -85,7 +85,7 @@ ACTOR BoxOfBullets : ClipOfBullets 2048
 
 // Mini Missiles ------------------------------------------------------------
 
-ACTOR MiniMissiles : Ammo 2010
+ACTOR MiniMissiles : Ammo
 {
 	Game Strife
 	SpawnID 140
@@ -108,7 +108,7 @@ ACTOR MiniMissiles : Ammo 2010
 
 // Crate of Missiles --------------------------------------------------------
 
-ACTOR CrateOfMissiles : MiniMissiles 2046
+ACTOR CrateOfMissiles : MiniMissiles
 {
 	Game Strife
 	SpawnID 141
@@ -126,7 +126,7 @@ ACTOR CrateOfMissiles : MiniMissiles 2046
 
 // Energy Pod ---------------------------------------------------------------
 
-ACTOR EnergyPod : Ammo 2047
+ACTOR EnergyPod : Ammo
 {
 	Game Strife
 	SpawnID 75
@@ -150,7 +150,7 @@ ACTOR EnergyPod : Ammo 2047
 
 // Energy pack ---------------------------------------------------------------
 
-ACTOR EnergyPack : EnergyPod 17
+ACTOR EnergyPack : EnergyPod
 {
 	Game Strife
 	SpawnID 142
@@ -168,7 +168,7 @@ ACTOR EnergyPack : EnergyPod 17
 
 // Poison Bolt Quiver -------------------------------------------------------
 
-ACTOR PoisonBolts : Ammo 115
+ACTOR PoisonBolts : Ammo
 {
 	Game Strife
 	ConversationID 185, 179, 183
@@ -190,7 +190,7 @@ ACTOR PoisonBolts : Ammo 115
 
 // Electric Bolt Quiver -------------------------------------------------------
 
-ACTOR ElectricBolts : Ammo 114
+ACTOR ElectricBolts : Ammo
 {
 	Game Strife
 	ConversationID 186, 180, 184
@@ -212,7 +212,7 @@ ACTOR ElectricBolts : Ammo 114
 
 // Ammo Satchel -------------------------------------------------------------
 
-ACTOR AmmoSatchel : BackpackItem 183
+ACTOR AmmoSatchel : BackpackItem
 {
 	Game Strife
 	SpawnID 144
diff --git a/wadsrc/static/actors/strife/strifearmor.txt b/wadsrc/static/actors/strife/strifearmor.txt
index 2431e9438..590a46ea9 100644
--- a/wadsrc/static/actors/strife/strifearmor.txt
+++ b/wadsrc/static/actors/strife/strifearmor.txt
@@ -1,5 +1,5 @@
 
-ACTOR MetalArmor : BasicArmorPickup 2019
+ACTOR MetalArmor : BasicArmorPickup
 {
 	Game Strife
 	SpawnID 69
@@ -23,7 +23,7 @@ ACTOR MetalArmor : BasicArmorPickup 2019
 	}
 }
 
-ACTOR LeatherArmor : BasicArmorPickup 2018
+ACTOR LeatherArmor : BasicArmorPickup
 {
 	Game Strife
 	SpawnID 68
diff --git a/wadsrc/static/actors/strife/strifebishop.txt b/wadsrc/static/actors/strife/strifebishop.txt
index 6f38247fb..71ad18c26 100644
--- a/wadsrc/static/actors/strife/strifebishop.txt
+++ b/wadsrc/static/actors/strife/strifebishop.txt
@@ -1,7 +1,7 @@
 
 // Bishop -------------------------------------------------------------------
 
-ACTOR StrifeBishop 187
+ACTOR StrifeBishop
 {
 	Game Strife
 	ConversationID 64,-1,-1
diff --git a/wadsrc/static/actors/strife/strifeitems.txt b/wadsrc/static/actors/strife/strifeitems.txt
index 74b957b83..89e098848 100644
--- a/wadsrc/static/actors/strife/strifeitems.txt
+++ b/wadsrc/static/actors/strife/strifeitems.txt
@@ -1,6 +1,6 @@
 // Med patch -----------------------------------------------------------------
 
-ACTOR MedPatch : HealthPickup 2011
+ACTOR MedPatch : HealthPickup
 {
 	Game Strife
 	ConversationID 125, 121, 124
@@ -23,7 +23,7 @@ ACTOR MedPatch : HealthPickup 2011
 
 // Medical Kit ---------------------------------------------------------------
 
-ACTOR MedicalKit : HealthPickup 2012
+ACTOR MedicalKit : HealthPickup
 {
 	Game Strife
 	ConversationID 126, 122, 125
@@ -46,7 +46,7 @@ ACTOR MedicalKit : HealthPickup 2012
 
 // Surgery Kit --------------------------------------------------------------
 
-ACTOR SurgeryKit : HealthPickup 83
+ACTOR SurgeryKit : HealthPickup
 {
 	Game Strife
 	ConversationID 127, 123, 126
@@ -68,7 +68,7 @@ ACTOR SurgeryKit : HealthPickup 83
 
 // StrifeMap ----------------------------------------------------------------
 
-ACTOR StrifeMap : MapRevealer 2026
+ACTOR StrifeMap : MapRevealer
 {
 	Game Strife
 	SpawnID 137
@@ -109,7 +109,7 @@ ACTOR BeldinsRing : Inventory
 
 // Offering Chalice ---------------------------------------------------------
 
-ACTOR OfferingChalice : Inventory 205
+ACTOR OfferingChalice : Inventory
 {
 	Game Strife
 	+DROPPED
@@ -154,7 +154,7 @@ ACTOR Ear : Inventory
 
 // Broken Power Coupling ----------------------------------------------------
 
-ACTOR BrokenPowerCoupling : Inventory 226
+ACTOR BrokenPowerCoupling : Inventory
 {
 	Game Strife
 	ConversationID 289, -1, -1
@@ -180,7 +180,7 @@ ACTOR BrokenPowerCoupling : Inventory 226
 
 // Shadow Armor -------------------------------------------------------------
 
-ACTOR ShadowArmor : PowerupGiver 2024
+ACTOR ShadowArmor : PowerupGiver
 {
 	Game Strife
 	SpawnID 135
@@ -207,7 +207,7 @@ ACTOR ShadowArmor : PowerupGiver 2024
 
 // Environmental suit -------------------------------------------------------
 
-ACTOR EnvironmentalSuit : PowerupGiver 2025
+ACTOR EnvironmentalSuit : PowerupGiver
 {
 	Game Strife
 	SpawnID 136
@@ -232,7 +232,7 @@ ACTOR EnvironmentalSuit : PowerupGiver 2025
 
 // Guard Uniform ------------------------------------------------------------
 
-ACTOR GuardUniform : Inventory 90
+ACTOR GuardUniform : Inventory
 {
 	Game Strife
 	ConversationID 162, 158, 161
@@ -253,7 +253,7 @@ ACTOR GuardUniform : Inventory 90
 
 // Officer's Uniform --------------------------------------------------------
 
-ACTOR OfficersUniform : Inventory 52
+ACTOR OfficersUniform : Inventory
 {
 	Game Strife
 	ConversationID 163, 159, 162
@@ -333,7 +333,7 @@ ACTOR Info : Inventory
 
 // Targeter -----------------------------------------------------------------
 
-ACTOR Targeter : PowerupGiver 207
+ACTOR Targeter : PowerupGiver
 {
 	Game Strife
 	ConversationID 167, 169, 173
@@ -356,7 +356,7 @@ ACTOR Targeter : PowerupGiver 207
 	
 // Communicator -----------------------------------------------------------------
 
-ACTOR Communicator : Inventory 206
+ACTOR Communicator : Inventory
 {
 	Game Strife
 	ConversationID 176, 168, 172
@@ -375,7 +375,7 @@ ACTOR Communicator : Inventory 206
 
 // Degnin Ore ---------------------------------------------------------------
 
-ACTOR DegninOre : Inventory 59 native
+ACTOR DegninOre : Inventory native
 {	
 	Game Strife
 	ConversationID 128, 124, 127
@@ -452,7 +452,7 @@ ACTOR HealthTraining : Inventory native
 
 // Scanner ------------------------------------------------------------------
 
-ACTOR Scanner : PowerupGiver 2027 native
+ACTOR Scanner : PowerupGiver native
 {
 	Game Strife
 	ConversationID 165,-1,-1
diff --git a/wadsrc/static/actors/strife/strifekeys.txt b/wadsrc/static/actors/strife/strifekeys.txt
index b304f83bc..1a1dc99c2 100644
--- a/wadsrc/static/actors/strife/strifekeys.txt
+++ b/wadsrc/static/actors/strife/strifekeys.txt
@@ -8,7 +8,7 @@ ACTOR StrifeKey : Key
 
 // Base Key -----------------------------------------------------------------
 
-ACTOR BaseKey : StrifeKey 230
+ACTOR BaseKey : StrifeKey
 {
 	Game Strife
 	ConversationID 133, 129, 132
@@ -44,7 +44,7 @@ ACTOR GovsKey : StrifeKey
 
 // Passcard -----------------------------------------------------------------
 
-ACTOR Passcard : StrifeKey 185
+ACTOR Passcard : StrifeKey
 {
 	Game Strife
 	ConversationID 135, 131, 134
@@ -62,7 +62,7 @@ ACTOR Passcard : StrifeKey 185
 
 // ID Badge -----------------------------------------------------------------
 
-ACTOR IDBadge : StrifeKey 184
+ACTOR IDBadge : StrifeKey
 {
 	Game Strife
 	ConversationID 136, 132, 135
@@ -99,7 +99,7 @@ ACTOR PrisonKey : StrifeKey
 
 // Severed Hand -------------------------------------------------------------
 
-ACTOR SeveredHand : StrifeKey 91
+ACTOR SeveredHand : StrifeKey
 {
 	Game Strife
 	ConversationID 138, 134, 137
@@ -172,7 +172,7 @@ ACTOR Power3Key : StrifeKey
 
 // Gold Key -----------------------------------------------------------------
 
-ACTOR GoldKey : StrifeKey 40
+ACTOR GoldKey : StrifeKey
 {
 	Game Strife
 	ConversationID 142, 138, 141
@@ -190,7 +190,7 @@ ACTOR GoldKey : StrifeKey 40
 
 // ID Card ------------------------------------------------------------------
 
-ACTOR IDCard : StrifeKey 13
+ACTOR IDCard : StrifeKey
 {
 	Game Strife
 	ConversationID 143, 139, 142
@@ -208,7 +208,7 @@ ACTOR IDCard : StrifeKey 13
 
 // Silver Key ---------------------------------------------------------------
 
-ACTOR SilverKey : StrifeKey 38
+ACTOR SilverKey : StrifeKey
 {
 	Game Strife
 	ConversationID 144, 140, 143
@@ -226,7 +226,7 @@ ACTOR SilverKey : StrifeKey 38
 
 // Oracle Key ---------------------------------------------------------------
 
-ACTOR OracleKey : StrifeKey 61
+ACTOR OracleKey : StrifeKey
 {
 	Game Strife
 	ConversationID 145, 141, 144
@@ -262,7 +262,7 @@ ACTOR MilitaryID : StrifeKey
 
 // Order Key ----------------------------------------------------------------
 
-ACTOR OrderKey : StrifeKey 86
+ACTOR OrderKey : StrifeKey
 {
 	Game Strife
 	ConversationID 147, 143, 146
@@ -280,7 +280,7 @@ ACTOR OrderKey : StrifeKey 86
 
 // Warehouse Key ------------------------------------------------------------
 
-ACTOR WarehouseKey : StrifeKey 166
+ACTOR WarehouseKey : StrifeKey
 {
 	Game Strife
 	ConversationID 148, 144, 147
@@ -298,7 +298,7 @@ ACTOR WarehouseKey : StrifeKey 166
 
 // Brass Key ----------------------------------------------------------------
 
-ACTOR BrassKey : StrifeKey 39
+ACTOR BrassKey : StrifeKey
 {
 	Game Strife
 	ConversationID 149, 145, 148
@@ -316,7 +316,7 @@ ACTOR BrassKey : StrifeKey 39
 
 // Red Crystal Key ----------------------------------------------------------
 
-ACTOR RedCrystalKey : StrifeKey 192
+ACTOR RedCrystalKey : StrifeKey
 {
 	Game Strife
 	ConversationID 150, 146, 149
@@ -334,7 +334,7 @@ ACTOR RedCrystalKey : StrifeKey 192
 
 // Blue Crystal Key ---------------------------------------------------------
 
-ACTOR BlueCrystalKey : StrifeKey 193
+ACTOR BlueCrystalKey : StrifeKey
 {
 	Game Strife
 	ConversationID 151, 147, 150
@@ -352,7 +352,7 @@ ACTOR BlueCrystalKey : StrifeKey 193
 
 // Chapel Key ---------------------------------------------------------------
 
-ACTOR ChapelKey : StrifeKey 195
+ACTOR ChapelKey : StrifeKey
 {
 	Game Strife
 	ConversationID 152, 148, 151
@@ -407,7 +407,7 @@ ACTOR SecurityKey : StrifeKey
 
 // Core Key -----------------------------------------------------------------
 
-ACTOR CoreKey : StrifeKey 236
+ACTOR CoreKey : StrifeKey
 {
 	Game Strife
 	ConversationID 155, 151, 154
@@ -425,7 +425,7 @@ ACTOR CoreKey : StrifeKey 236
 
 // Mauler Key ---------------------------------------------------------------
 
-ACTOR MaulerKey : StrifeKey 233
+ACTOR MaulerKey : StrifeKey
 {
 	Game Strife
 	ConversationID 156, 152, 155
@@ -443,7 +443,7 @@ ACTOR MaulerKey : StrifeKey 233
 
 // Factory Key --------------------------------------------------------------
 
-ACTOR FactoryKey : StrifeKey 234
+ACTOR FactoryKey : StrifeKey
 {
 	Game Strife
 	ConversationID 157, 153, 156
@@ -461,7 +461,7 @@ ACTOR FactoryKey : StrifeKey 234
 
 // Mine Key -----------------------------------------------------------------
 
-ACTOR MineKey : StrifeKey 235
+ACTOR MineKey : StrifeKey
 {
 	Game Strife
 	ConversationID 158, 154, 157
diff --git a/wadsrc/static/actors/strife/strifestuff.txt b/wadsrc/static/actors/strife/strifestuff.txt
index ef762cbb6..af72541e6 100644
--- a/wadsrc/static/actors/strife/strifestuff.txt
+++ b/wadsrc/static/actors/strife/strifestuff.txt
@@ -1,6 +1,6 @@
 // Tank 1 Huge ------------------------------------------------------------
 
-ACTOR Tank1 209
+ACTOR Tank1
 {
 	Game Strife
 	Radius 16
@@ -19,7 +19,7 @@ ACTOR Tank1 209
 
 // Tank 2 Huge ------------------------------------------------------------
 
-ACTOR Tank2 210
+ACTOR Tank2
 {
 	Game Strife
 	Radius 16
@@ -38,7 +38,7 @@ ACTOR Tank2 210
 
 // Tank 3 Huge ------------------------------------------------------------
 
-ACTOR Tank3 211
+ACTOR Tank3
 {
 	Game Strife
 	Radius 16
@@ -57,7 +57,7 @@ ACTOR Tank3 211
 
 // Tank 4 -------------------------------------------------------------------
 
-ACTOR Tank4 213
+ACTOR Tank4
 {
 	Game Strife
 	Radius 16
@@ -76,7 +76,7 @@ ACTOR Tank4 213
 
 // Tank 5 -------------------------------------------------------------------
 
-ACTOR Tank5 214
+ACTOR Tank5
 {
 	Game Strife
 	Radius 16
@@ -95,7 +95,7 @@ ACTOR Tank5 214
 
 // Tank 6 -------------------------------------------------------------------
 
-ACTOR Tank6 229
+ACTOR Tank6
 {
 	Game Strife
 	Radius 16
@@ -114,7 +114,7 @@ ACTOR Tank6 229
 
 // Water Bottle -------------------------------------------------------------
 
-ACTOR WaterBottle 2014
+ACTOR WaterBottle
 {
 	Game Strife
 	ConversationID 131, -1, -1
@@ -128,7 +128,7 @@ ACTOR WaterBottle 2014
 
 // Mug ----------------------------------------------------------------------
 
-ACTOR Mug 164
+ACTOR Mug
 {
 	Game Strife
 	ConversationID 132, -1, -1
@@ -142,7 +142,7 @@ ACTOR Mug 164
 
 // Wooden Barrel ------------------------------------------------------------
 
-ACTOR WoodenBarrel 82
+ACTOR WoodenBarrel
 {
 	Game Strife
 	Health 10
@@ -169,7 +169,7 @@ ACTOR WoodenBarrel 82
 
 // Strife's explosive barrel ------------------------------------------------
 
-ACTOR ExplosiveBarrel2 94
+ACTOR ExplosiveBarrel2
 {
 	Game Strife
 	Health 30
@@ -198,7 +198,7 @@ ACTOR ExplosiveBarrel2 94
 
 // Light Silver, Fluorescent ----------------------------------------------
 
-ACTOR LightSilverFluorescent 95
+ACTOR LightSilverFluorescent
 {
 	Game Strife
 	Radius 2.5
@@ -216,7 +216,7 @@ ACTOR LightSilverFluorescent 95
 
 // Light Brown, Fluorescent -----------------------------------------------
 
-ACTOR LightBrownFluorescent 96
+ACTOR LightBrownFluorescent
 {
 	Game Strife
 	Radius 2.5
@@ -234,7 +234,7 @@ ACTOR LightBrownFluorescent 96
 
 // Light Gold, Fluorescent ------------------------------------------------
 
-ACTOR LightGoldFluorescent 97
+ACTOR LightGoldFluorescent
 {
 	Game Strife
 	Radius 2.5
@@ -252,7 +252,7 @@ ACTOR LightGoldFluorescent 97
 
 // Light Globe --------------------------------------------------------------
 
-ACTOR LightGlobe 2028
+ACTOR LightGlobe
 {
 	Game Strife
 	Radius 16
@@ -269,7 +269,7 @@ ACTOR LightGlobe 2028
 
 // Techno Pillar ------------------------------------------------------------
 
-ACTOR PillarTechno 48
+ACTOR PillarTechno
 {
 	Game Strife
 	Radius 20
@@ -286,7 +286,7 @@ ACTOR PillarTechno 48
 
 // Aztec Pillar -------------------------------------------------------------
 
-ACTOR PillarAztec 54
+ACTOR PillarAztec
 {
 	Game Strife
 	Radius 16
@@ -303,7 +303,7 @@ ACTOR PillarAztec 54
 
 // Damaged Aztec Pillar -----------------------------------------------------
 
-ACTOR PillarAztecDamaged 55
+ACTOR PillarAztecDamaged
 {
 	Game Strife
 	Radius 16
@@ -320,7 +320,7 @@ ACTOR PillarAztecDamaged 55
 
 // Ruined Aztec Pillar ------------------------------------------------------
 
-ACTOR PillarAztecRuined 56
+ACTOR PillarAztecRuined
 {
 	Game Strife
 	Radius 16
@@ -337,7 +337,7 @@ ACTOR PillarAztecRuined 56
 
 // Huge Tech Pillar ---------------------------------------------------------
 
-ACTOR PillarHugeTech 57
+ACTOR PillarHugeTech
 {
 	Game Strife
 	Radius 24
@@ -354,7 +354,7 @@ ACTOR PillarHugeTech 57
 
 // Alien Power Crystal in a Pillar ------------------------------------------
 
-ACTOR PillarAlienPower 227
+ACTOR PillarAlienPower
 {
 	Game Strife
 	Radius 24
@@ -372,7 +372,7 @@ ACTOR PillarAlienPower 227
 
 // SStalactiteBig -----------------------------------------------------------
 
-ACTOR SStalactiteBig 98
+ACTOR SStalactiteBig
 {
 	Game Strife
 	Radius 16
@@ -389,7 +389,7 @@ ACTOR SStalactiteBig 98
 
 // SStalactiteSmall ---------------------------------------------------------
 
-ACTOR SStalactiteSmall 161
+ACTOR SStalactiteSmall
 {
 	Game Strife
 	Radius 16
@@ -406,7 +406,7 @@ ACTOR SStalactiteSmall 161
 
 // SStalagmiteBig -----------------------------------------------------------
 
-ACTOR SStalagmiteBig 160
+ACTOR SStalagmiteBig
 {
 	Game Strife
 	Radius 16
@@ -423,7 +423,7 @@ ACTOR SStalagmiteBig 160
 
 // Cave Pillar Top ----------------------------------------------------------
 
-ACTOR CavePillarTop 159
+ACTOR CavePillarTop
 {
 	Game Strife
 	Radius 16
@@ -440,7 +440,7 @@ ACTOR CavePillarTop 159
 
 // Cave Pillar Bottom -------------------------------------------------------
 
-ACTOR CavePillarBottom 162
+ACTOR CavePillarBottom
 {
 	Game Strife
 	Radius 16
@@ -457,7 +457,7 @@ ACTOR CavePillarBottom 162
 
 // SStalagmiteSmall ---------------------------------------------------------
 
-ACTOR SStalagmiteSmall 163
+ACTOR SStalagmiteSmall
 {
 	Game Strife
 	Radius 16
@@ -474,7 +474,7 @@ ACTOR SStalagmiteSmall 163
 
 // Candle -------------------------------------------------------------------
 
-ACTOR Candle 34
+ACTOR Candle
 {
 	Game Strife
 	ConversationID 222, -1, -1
@@ -488,7 +488,7 @@ ACTOR Candle 34
 
 // StrifeCandelabra ---------------------------------------------------------
 
-ACTOR StrifeCandelabra 35
+ACTOR StrifeCandelabra
 {
 	Game Strife
 	Radius 16
@@ -505,7 +505,7 @@ ACTOR StrifeCandelabra 35
 
 // Floor Water Drop ---------------------------------------------------------
 
-ACTOR WaterDropOnFloor 103
+ACTOR WaterDropOnFloor
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -526,7 +526,7 @@ ACTOR WaterDropOnFloor 103
 
 // Waterfall Splash ---------------------------------------------------------
 
-ACTOR WaterfallSplash 104
+ACTOR WaterfallSplash
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -543,7 +543,7 @@ ACTOR WaterfallSplash 104
 
 // Ceiling Water Drip -------------------------------------------------------
 
-ACTOR WaterDrip 53
+ACTOR WaterDrip
 {
 	Game Strife
 	Height 1
@@ -560,7 +560,7 @@ ACTOR WaterDrip 53
 
 // WaterFountain ------------------------------------------------------------
 
-ACTOR WaterFountain 112
+ACTOR WaterFountain
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -577,7 +577,7 @@ ACTOR WaterFountain 112
 
 // Hearts in Tank -----------------------------------------------------------
 
-ACTOR HeartsInTank 113
+ACTOR HeartsInTank
 {
 	Game Strife
 	Radius 16
@@ -594,7 +594,7 @@ ACTOR HeartsInTank 113
 
 // Teleport Swirl -----------------------------------------------------------
 
-ACTOR TeleportSwirl 23
+ACTOR TeleportSwirl
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -612,7 +612,7 @@ ACTOR TeleportSwirl 23
 // Dead Player --------------------------------------------------------------
 // Strife's disappeared. This one doesn't.
 
-ACTOR DeadStrifePlayer 15
+ACTOR DeadStrifePlayer
 {
 	Game Strife
 	ConversationID 231, -1, -1
@@ -628,7 +628,7 @@ ACTOR DeadStrifePlayer 15
 // Dead Peasant -------------------------------------------------------------
 // Unlike Strife's, this one does not turn into gibs and disappear.
 
-ACTOR DeadPeasant 18
+ACTOR DeadPeasant
 {
 	Game Strife
 	ConversationID 232, -1, -1
@@ -643,7 +643,7 @@ ACTOR DeadPeasant 18
 // Dead Acolyte -------------------------------------------------------------
 // Unlike Strife's, this one does not turn into gibs and disappear.
 
-ACTOR DeadAcolyte 21
+ACTOR DeadAcolyte
 {
 	Game Strife
 	ConversationID 233, -1, -1
@@ -657,7 +657,7 @@ ACTOR DeadAcolyte 21
 
 // Dead Reaver --------------------------------------------------------------
 
-ACTOR DeadReaver 20
+ACTOR DeadReaver
 {
 	Game Strife
 	ConversationID 234, -1, -1
@@ -671,7 +671,7 @@ ACTOR DeadReaver 20
 
 // Dead Rebel ---------------------------------------------------------------
 
-ACTOR DeadRebel 19
+ACTOR DeadRebel
 {
 	Game Strife
 	ConversationID 235, -1, -1
@@ -685,7 +685,7 @@ ACTOR DeadRebel 19
 
 // Sacrificed Guy -----------------------------------------------------------
 
-ACTOR SacrificedGuy 212
+ACTOR SacrificedGuy
 {
 	Game Strife
 	ConversationID 236, -1, -1
@@ -716,7 +716,7 @@ ACTOR PileOfGuts
 
 // Burning Barrel -----------------------------------------------------------
 
-ACTOR StrifeBurningBarrel 70
+ACTOR StrifeBurningBarrel
 {
 	Game Strife
 	Radius 16
@@ -733,7 +733,7 @@ ACTOR StrifeBurningBarrel 70
 
 // Burning Bowl -----------------------------------------------------------
 
-ACTOR BurningBowl 105
+ACTOR BurningBowl
 {
 	Game Strife
 	Radius 16
@@ -751,7 +751,7 @@ ACTOR BurningBowl 105
 
 // Burning Brazier -----------------------------------------------------------
 
-ACTOR BurningBrazier 106
+ACTOR BurningBrazier
 {
 	Game Strife
 	Radius 10
@@ -769,7 +769,7 @@ ACTOR BurningBrazier 106
 
 // Small Torch Lit --------------------------------------------------------
 
-ACTOR SmallTorchLit 107
+ACTOR SmallTorchLit
 {
 	Game Strife
 	Radius 2.5
@@ -790,7 +790,7 @@ ACTOR SmallTorchLit 107
 
 // Small Torch Unlit --------------------------------------------------------
 
-ACTOR SmallTorchUnlit 108
+ACTOR SmallTorchUnlit
 {
 	Game Strife
 	Radius 2.5
@@ -808,7 +808,7 @@ ACTOR SmallTorchUnlit 108
 
 // Ceiling Chain ------------------------------------------------------------
 
-ACTOR CeilingChain 109
+ACTOR CeilingChain
 {
 	Game Strife
 	Radius 20
@@ -825,7 +825,7 @@ ACTOR CeilingChain 109
 
 // Cage Light ---------------------------------------------------------------
 
-ACTOR CageLight 28
+ACTOR CageLight
 {
 	// No, it's not bright even though it's a light.
 	Game Strife
@@ -842,7 +842,7 @@ ACTOR CageLight 28
 
 // Statue -------------------------------------------------------------------
 
-ACTOR Statue 110
+ACTOR Statue
 {
 	Game Strife
 	Radius 20
@@ -859,7 +859,7 @@ ACTOR Statue 110
 
 // Ruined Statue ------------------------------------------------------------
 
-ACTOR StatueRuined 44
+ACTOR StatueRuined
 {
 	Game Strife
 	Radius 20
@@ -876,7 +876,7 @@ ACTOR StatueRuined 44
 
 // Medium Torch -------------------------------------------------------------
 
-ACTOR MediumTorch 111
+ACTOR MediumTorch
 {
 	Game Strife
 	Radius 4
@@ -893,7 +893,7 @@ ACTOR MediumTorch 111
 
 // Outside Lamp -------------------------------------------------------------
 
-ACTOR OutsideLamp 43
+ACTOR OutsideLamp
 {
 	// No, it's not bright.
 	Game Strife
@@ -911,7 +911,7 @@ ACTOR OutsideLamp 43
 
 // Pole Lantern -------------------------------------------------------------
 
-ACTOR PoleLantern 46
+ACTOR PoleLantern
 {
 	// No, it's not bright.
 	Game Strife
@@ -929,7 +929,7 @@ ACTOR PoleLantern 46
 
 // Rock 1 -------------------------------------------------------------------
 
-ACTOR SRock1 99
+ACTOR SRock1
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -944,7 +944,7 @@ ACTOR SRock1 99
 
 // Rock 2 -------------------------------------------------------------------
 
-ACTOR SRock2 100
+ACTOR SRock2
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -959,7 +959,7 @@ ACTOR SRock2 100
 
 // Rock 3 -------------------------------------------------------------------
 
-ACTOR SRock3 101
+ACTOR SRock3
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -974,7 +974,7 @@ ACTOR SRock3 101
 
 // Rock 4 -------------------------------------------------------------------
 
-ACTOR SRock4 102
+ACTOR SRock4
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -989,7 +989,7 @@ ACTOR SRock4 102
 
 // Stick in Water -----------------------------------------------------------
 
-ACTOR StickInWater 215
+ACTOR StickInWater
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -1006,7 +1006,7 @@ ACTOR StickInWater 215
 
 // Rubble 1 -----------------------------------------------------------------
 
-ACTOR Rubble1 29
+ACTOR Rubble1
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1021,7 +1021,7 @@ ACTOR Rubble1 29
 
 // Rubble 2 -----------------------------------------------------------------
 
-ACTOR Rubble2 30
+ACTOR Rubble2
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1036,7 +1036,7 @@ ACTOR Rubble2 30
 
 // Rubble 3 -----------------------------------------------------------------
 
-ACTOR Rubble3 31
+ACTOR Rubble3
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1051,7 +1051,7 @@ ACTOR Rubble3 31
 
 // Rubble 4 -----------------------------------------------------------------
 
-ACTOR Rubble4 32
+ACTOR Rubble4
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1066,7 +1066,7 @@ ACTOR Rubble4 32
 
 // Rubble 5 -----------------------------------------------------------------
 
-ACTOR Rubble5 36
+ACTOR Rubble5
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1081,7 +1081,7 @@ ACTOR Rubble5 36
 
 // Rubble 6 -----------------------------------------------------------------
 
-ACTOR Rubble6 37
+ACTOR Rubble6
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1096,7 +1096,7 @@ ACTOR Rubble6 37
 
 // Rubble 7 -----------------------------------------------------------------
 
-ACTOR Rubble7 41
+ACTOR Rubble7
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1111,7 +1111,7 @@ ACTOR Rubble7 41
 
 // Rubble 8 -----------------------------------------------------------------
 
-ACTOR Rubble8 42
+ACTOR Rubble8
 {
 	Game Strife
 	+NOBLOCKMAP +NOCLIP
@@ -1126,7 +1126,7 @@ ACTOR Rubble8 42
 
 // Surgery Crab -------------------------------------------------------------
 
-ACTOR SurgeryCrab 117
+ACTOR SurgeryCrab
 {
 	Game Strife
 	+SOLID +SPAWNCEILING +NOGRAVITY
@@ -1143,7 +1143,7 @@ ACTOR SurgeryCrab 117
 
 // Large Torch --------------------------------------------------------------
 
-ACTOR LargeTorch 47
+ACTOR LargeTorch
 {
 	Game Strife
 	Radius 10
@@ -1161,7 +1161,7 @@ ACTOR LargeTorch 47
 
 // Huge Torch --------------------------------------------------------------
 
-ACTOR HugeTorch 50
+ACTOR HugeTorch
 {
 	Game Strife
 	Radius 10
@@ -1179,7 +1179,7 @@ ACTOR HugeTorch 50
 
 // Palm Tree ----------------------------------------------------------------
 
-ACTOR PalmTree 51
+ACTOR PalmTree
 {
 	Game Strife
 	Radius 15
@@ -1196,7 +1196,7 @@ ACTOR PalmTree 51
 
 // Big Tree ----------------------------------------------------------------
 
-ACTOR BigTree2 202
+ACTOR BigTree2
 {
 	Game Strife
 	Radius 15
@@ -1213,7 +1213,7 @@ ACTOR BigTree2 202
 
 // Potted Tree ----------------------------------------------------------------
 
-ACTOR PottedTree 203
+ACTOR PottedTree
 {
 	Game Strife
 	Radius 15
@@ -1230,7 +1230,7 @@ ACTOR PottedTree 203
 
 // Tree Stub ----------------------------------------------------------------
 
-ACTOR TreeStub 33
+ACTOR TreeStub
 {
 	Game Strife
 	Radius 15
@@ -1247,7 +1247,7 @@ ACTOR TreeStub 33
 
 // Short Bush ---------------------------------------------------------------
 
-ACTOR ShortBush 60
+ACTOR ShortBush
 {
 	Game Strife
 	Radius 15
@@ -1264,7 +1264,7 @@ ACTOR ShortBush 60
 
 // Tall Bush ---------------------------------------------------------------
 
-ACTOR TallBush 62
+ACTOR TallBush
 {
 	Game Strife
 	Radius 20
@@ -1281,7 +1281,7 @@ ACTOR TallBush 62
 
 // Chimney Stack ------------------------------------------------------------
 
-ACTOR ChimneyStack 63
+ACTOR ChimneyStack
 {
 	Game Strife
 	Radius 20
@@ -1298,7 +1298,7 @@ ACTOR ChimneyStack 63
 
 // Barricade Column ---------------------------------------------------------
 
-ACTOR BarricadeColumn 69
+ACTOR BarricadeColumn
 {
 	Game Strife
 	Radius 16
@@ -1315,7 +1315,7 @@ ACTOR BarricadeColumn 69
 
 // Pot ----------------------------------------------------------------------
 
-ACTOR Pot 165
+ACTOR Pot
 {
 	Game Strife
 	Radius 12
@@ -1332,7 +1332,7 @@ ACTOR Pot 165
 
 // Pitcher ------------------------------------------------------------------
 
-ACTOR Pitcher 188
+ACTOR Pitcher
 {
 	Game Strife
 	Radius 12
@@ -1349,7 +1349,7 @@ ACTOR Pitcher 188
 
 // Stool --------------------------------------------------------------------
 
-ACTOR Stool 189
+ACTOR Stool
 {
 	Game Strife
 	Radius 6
@@ -1366,7 +1366,7 @@ ACTOR Stool 189
 
 // Metal Pot ----------------------------------------------------------------
 
-ACTOR MetalPot 190
+ACTOR MetalPot
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -1381,7 +1381,7 @@ ACTOR MetalPot 190
 
 // Tub ----------------------------------------------------------------------
 
-ACTOR Tub 191
+ACTOR Tub
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -1396,7 +1396,7 @@ ACTOR Tub 191
 
 // Anvil --------------------------------------------------------------------
 
-ACTOR Anvil 194
+ACTOR Anvil
 {
 	Game Strife
 	Radius 16
@@ -1413,7 +1413,7 @@ ACTOR Anvil 194
 
 // Silver Tech Lamp ----------------------------------------------------------
 
-ACTOR TechLampSilver 196
+ACTOR TechLampSilver
 {
 	Game Strife
 	Radius 11
@@ -1430,7 +1430,7 @@ ACTOR TechLampSilver 196
 
 // Brass Tech Lamp ----------------------------------------------------------
 
-ACTOR TechLampBrass 197
+ACTOR TechLampBrass
 {
 	Game Strife
 	Radius 8
@@ -1447,7 +1447,7 @@ ACTOR TechLampBrass 197
 
 // Tray --------------------------------------------------------------------
 
-ACTOR Tray 68
+ACTOR Tray
 {
 	Game Strife
 	Radius 24
@@ -1464,7 +1464,7 @@ ACTOR Tray 68
 
 // AmmoFiller ---------------------------------------------------------------
 
-ACTOR AmmoFiller 228
+ACTOR AmmoFiller
 {
 	Game Strife
 	Radius 12
@@ -1481,7 +1481,7 @@ ACTOR AmmoFiller 228
 
 // Sigil Banner -------------------------------------------------------------
 
-ACTOR SigilBanner 216
+ACTOR SigilBanner
 {
 	Game Strife
 	Radius 24
@@ -1498,7 +1498,7 @@ ACTOR SigilBanner 216
 
 // RebelBoots ---------------------------------------------------------------
 
-ACTOR RebelBoots 217
+ACTOR RebelBoots
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -1513,7 +1513,7 @@ ACTOR RebelBoots 217
 
 // RebelHelmet --------------------------------------------------------------
 
-ACTOR RebelHelmet 218
+ACTOR RebelHelmet
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -1528,7 +1528,7 @@ ACTOR RebelHelmet 218
 
 // RebelShirt ---------------------------------------------------------------
 
-ACTOR RebelShirt 219
+ACTOR RebelShirt
 {
 	Game Strife
 	+NOBLOCKMAP
@@ -1543,7 +1543,7 @@ ACTOR RebelShirt 219
 
 // Alien Bubble Column ------------------------------------------------------
 
-ACTOR AlienBubbleColumn 221
+ACTOR AlienBubbleColumn
 {
 	Game Strife
 	Radius 16
@@ -1561,7 +1561,7 @@ ACTOR AlienBubbleColumn 221
 
 // Alien Floor Bubble -------------------------------------------------------
 
-ACTOR AlienFloorBubble 222
+ACTOR AlienFloorBubble
 {
 	Game Strife
 	Radius 16
@@ -1579,7 +1579,7 @@ ACTOR AlienFloorBubble 222
 
 // Alien Ceiling Bubble -----------------------------------------------------
 
-ACTOR AlienCeilingBubble 223
+ACTOR AlienCeilingBubble
 {
 	Game Strife
 	Radius 16
@@ -1597,7 +1597,7 @@ ACTOR AlienCeilingBubble 223
 
 // Alien Asp Climber --------------------------------------------------------
 
-ACTOR AlienAspClimber 224
+ACTOR AlienAspClimber
 {
 	Game Strife
 	Radius 16
@@ -1615,7 +1615,7 @@ ACTOR AlienAspClimber 224
 
 // Alien Spider Light -------------------------------------------------------
 
-ACTOR AlienSpiderLight 225
+ACTOR AlienSpiderLight
 {
 	Game Strife
 	Radius 32
@@ -1633,7 +1633,7 @@ ACTOR AlienSpiderLight 225
 
 // Target Practice -----------------------------------------------------------
 
-ACTOR TargetPractice 208
+ACTOR TargetPractice
 {
 	Game Strife
 	Health 99999999
@@ -1659,7 +1659,7 @@ ACTOR TargetPractice 208
 
 // Force Field Guard --------------------------------------------------------
 
-ACTOR ForceFieldGuard 25 native
+ACTOR ForceFieldGuard native
 {
 	Game Strife
 	Health 10
@@ -1683,7 +1683,7 @@ ACTOR ForceFieldGuard 25 native
 
 // Kneeling Guy -------------------------------------------------------------
 
-ACTOR KneelingGuy 204
+ACTOR KneelingGuy
 {
 	Game Strife
 	ConversationID 37,-1,-1
@@ -1732,7 +1732,7 @@ ACTOR KneelingGuy 204
 
 // Klaxon Warning Light -----------------------------------------------------
 
-ACTOR KlaxonWarningLight 24
+ACTOR KlaxonWarningLight
 {
 	Game Strife
 	ConversationID 121,-1,-1
@@ -1757,7 +1757,7 @@ ACTOR KlaxonWarningLight 24
 
 // CeilingTurret ------------------------------------------------------------
 
-ACTOR CeilingTurret 27
+ACTOR CeilingTurret
 {
 	Game Strife
 	ConversationID 122,-1,-1
@@ -1801,7 +1801,7 @@ ACTOR CeilingTurret 27
 
 // Power Coupling -----------------------------------------------------------
 
-ACTOR PowerCoupling 220 native
+ACTOR PowerCoupling native
 {
 	Game Strife
 	ConversationID 288,-1,-1
diff --git a/wadsrc/static/actors/strife/strifeweapons.txt b/wadsrc/static/actors/strife/strifeweapons.txt
index 3b256e226..dc60db3cc 100644
--- a/wadsrc/static/actors/strife/strifeweapons.txt
+++ b/wadsrc/static/actors/strife/strifeweapons.txt
@@ -150,7 +150,7 @@ ACTOR PoisonBolt native
 
 // Strife's Crossbow --------------------------------------------------------
 
-ACTOR StrifeCrossbow : StrifeWeapon 2001
+ACTOR StrifeCrossbow : StrifeWeapon
 {
 	Game Strife
 	+FLOORCLIP
@@ -238,7 +238,7 @@ ACTOR StrifeCrossbow2 : StrifeCrossbow
 
 // Assault Gun --------------------------------------------------------------
 
-actor AssaultGun : StrifeWeapon 2002
+actor AssaultGun : StrifeWeapon
 {
 	Game Strife
 	ConversationID 188, 182, 186
@@ -277,7 +277,7 @@ actor AssaultGun : StrifeWeapon 2002
 
 // Standing variant of the assault gun --------------------------------------
 
-ACTOR AssaultGunStanding : WeaponGiver 2006
+ACTOR AssaultGunStanding : WeaponGiver
 {
 	Game Strife
 	ConversationID 189, 183, 187
@@ -295,7 +295,7 @@ ACTOR AssaultGunStanding : WeaponGiver 2006
 // Mini-Missile Launcher ----------------------------------------------------
 
 
-ACTOR MiniMissileLauncher : StrifeWeapon 2003
+ACTOR MiniMissileLauncher : StrifeWeapon
 {
 	Game Strife
 	ConversationID 192, 186, 190
@@ -401,7 +401,7 @@ ACTOR MiniMissile
 
 // Flame Thrower ------------------------------------------------------------
 
-ACTOR FlameThrower : StrifeWeapon 2005
+ACTOR FlameThrower : StrifeWeapon
 {
 	Game Strife
 	ConversationID 190, 184, 188
@@ -480,7 +480,7 @@ ACTOR FlameMissile
 // Mauler -------------------------------------------------------------------
 // The scatter version
 
-ACTOR Mauler : StrifeWeapon 2004
+ACTOR Mauler : StrifeWeapon
 {
 	Game Strife
 	ConversationID 193, 187, 191
@@ -752,7 +752,7 @@ ACTOR PhosphorousFire native
 
 // High-Explosive Grenade Launcher ------------------------------------------
 
-ACTOR StrifeGrenadeLauncher : StrifeWeapon 154
+ACTOR StrifeGrenadeLauncher : StrifeWeapon
 {
 	Game Strife
 	ConversationID 195, 189, 193
diff --git a/wadsrc/static/actors/strife/templar.txt b/wadsrc/static/actors/strife/templar.txt
index c20aed49b..00316ff43 100644
--- a/wadsrc/static/actors/strife/templar.txt
+++ b/wadsrc/static/actors/strife/templar.txt
@@ -1,5 +1,5 @@
 
-ACTOR Templar 3003
+ACTOR Templar
 {
 	Game Strife
 	ConversationID 62, 61, 62
diff --git a/wadsrc/static/actors/strife/thingstoblowup.txt b/wadsrc/static/actors/strife/thingstoblowup.txt
index 2b8f3d93e..c2b9b1916 100644
--- a/wadsrc/static/actors/strife/thingstoblowup.txt
+++ b/wadsrc/static/actors/strife/thingstoblowup.txt
@@ -21,7 +21,7 @@ ACTOR Bang4Cloud
 
 // Piston -------------------------------------------------------------------
 
-ACTOR Piston 45
+ACTOR Piston
 {
 	Game Strife
 	ConversationID 123,-1,-1
@@ -58,7 +58,7 @@ ACTOR Piston 45
 
 // Computer -----------------------------------------------------------------
 
-ACTOR Computer 182
+ACTOR Computer
 {
 	Game Strife
 	ConversationID 124,-1,-1
@@ -98,7 +98,7 @@ ACTOR Computer 182
 
 // Power Crystal ------------------------------------------------------------
 
-ACTOR PowerCrystal 92
+ACTOR PowerCrystal
 {
 	Game Strife
 	ConversationID 201,-1,-1
diff --git a/wadsrc/static/actors/strife/zombie.txt b/wadsrc/static/actors/strife/zombie.txt
index 9788bc00f..f92cc5a0d 100644
--- a/wadsrc/static/actors/strife/zombie.txt
+++ b/wadsrc/static/actors/strife/zombie.txt
@@ -1,7 +1,7 @@
 
 // Zombie -------------------------------------------------------------------
 
-ACTOR Zombie : StrifeHumanoid 169
+ACTOR Zombie : StrifeHumanoid
 {
 	Game Strife
 	Health 31
@@ -43,7 +43,7 @@ ACTOR Zombie : StrifeHumanoid 169
 
 // Zombie Spawner -----------------------------------------------------------
 
-ACTOR ZombieSpawner 170
+ACTOR ZombieSpawner
 {
 	Game Strife
 	Health 20
diff --git a/wadsrc/static/decorate.txt b/wadsrc/static/decorate.txt
index ae4b6f851..46f1854b9 100644
--- a/wadsrc/static/decorate.txt
+++ b/wadsrc/static/decorate.txt
@@ -93,6 +93,7 @@
 #include "actors/hexen/mageplayer.txt"
 #include "actors/hexen/pig.txt"
 #include "actors/hexen/flame.txt"
+#include "actors/hexen/flies.txt"
 #include "actors/hexen/hexenarmor.txt"
 #include "actors/hexen/hexendecorations.txt"
 #include "actors/hexen/hexenkeys.txt"
diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt
index 1edaf9256..9bd974bc7 100644
--- a/wadsrc/static/mapinfo/chex.txt
+++ b/wadsrc/static/mapinfo/chex.txt
@@ -1,5 +1,6 @@
 // MAPINFO for Chex Quest
 include "mapinfo/common.txt"
+include "mapinfo/doomitems.txt"
 
 gameinfo
 {
@@ -67,6 +68,64 @@ gameinfo
 	statscreen_enteringpatch = "WIENTER"
 }
 
+DoomEdNums
+{
+     5 = ChexBlueCard
+     6 = ChexYellowCard
+     8 = Zorchpack
+     9 = FlemoidusBipedicus
+    13 = ChexRedCard
+    17 = PhasingZorchPack
+    25 = ChexTallFlower2
+    28 = ChexTallFlower
+    30 = ChexCavernStalagmite
+    31 = ChexSubmergedPlant
+    32 = ChexCavernColumn
+    33 = ChexMineCart
+    34 = ChexChemicalFlask
+    35 = ChexGasTank
+    37 = ChexFlagOnPole
+    41 = ChexChemicalBurner
+    43 = ChexOrangeTree
+    44 = ChexSlimeFountain
+    45 = ChexCivilian1
+    47 = ChexAppleTree
+    48 = ChexSpaceship
+    54 = ChexBananaTree
+    55 = ChexLightColumn
+    56 = ChexCivilian2
+    57 = ChexCivilian3
+    82 = SuperLargeZorcher
+  2001 = LargeZorcher
+  2002 = RapidZorcher
+  2003 = ZorchPropulsor
+  2004 = PhasingZorcher
+  2005 = SuperBootspork
+  2006 = LAZDevice
+  2007 = MiniZorchRecharge
+  2008 = LargeZorchRecharge
+  2010 = PropulsorZorch
+  2011 = BowlOfFruit
+  2012 = BowlOfVegetables
+  2013 = SuperchargeBreakfast
+  2014 = GlassOfWater
+  2015 = SlimeRepellent
+  2018 = ChexArmor
+  2019 = SuperChexArmor
+  2025 = SlimeProofSuit
+  2026 = ComputerAreaMap
+  2028 = ChexLandingLight
+  2046 = PropulsorZorchPack
+  2047 = PhasingZorch
+  2048 = MiniZorchPack
+  2049 = LargeZorchPack
+  3001 = ArmoredFlemoidusBipedicus
+  3002 = FlemoidusCycloptisCommonus
+  3003 = Flembrane
+  3004 = FlemoidusCommonus
+  3006 = ChexSoul
+}
+
 skill baby
 {
 	AutoUseHealth
diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index fc6379d01..7202a6265 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -4,6 +4,225 @@ Gameinfo
 	EasyKey = "maparrows/ravenkey.txt"
 }
 
+DoomEdNums
+{
+     0 = Unknown
+     1 = "$Player1Start"
+     2 = "$Player2Start"
+     3 = "$Player3Start"
+     4 = "$Player4Start"
+    11 = "$DeathmatchStart"
+    14 = TeleportDest
+   118 = ZBridge
+   888 = MBFHelperDog
+  1400 = "$SSeqOverride", 0
+  1401 = "$SSeqOverride", 1
+  1402 = "$SSeqOverride", 2
+  1403 = "$SSeqOverride", 3
+  1404 = "$SSeqOverride", 4
+  1405 = "$SSeqOverride", 5
+  1406 = "$SSeqOverride", 6
+  1407 = "$SSeqOverride", 7
+  1408 = "$SSeqOverride", 8
+  1409 = "$SSeqOverride", 9
+  1411 = "$SSeqOverride"
+  5001 = PointPusher
+  5002 = PointPuller
+  5004 = FS_Mapspot
+  5061 = InvisibleBridge32
+  5064 = InvisibleBridge16
+  5065 = InvisibleBridge8
+  9001 = MapSpot
+  9013 = MapSpotGravity
+  9024 = PatrolPoint
+  9025 = SecurityCamera
+  9026 = Spark
+  9027 = RedParticleFountain
+  9028 = GreenParticleFountain
+  9029 = BlueParticleFountain
+  9030 = YellowParticleFountain
+  9031 = PurpleParticleFountain
+  9032 = BlackParticleFountain
+  9033 = WhiteParticleFountain
+  9037 = BetaSkull
+  9038 = ColorSetter
+  9039 = FadeSetter
+  9040 = MapMarker
+  9041 = SectorFlagSetter
+  9043 = TeleportDest3
+  9044 = TeleportDest2
+  9045 = Waterzone
+  9046 = SecretTrigger
+  9047 = PatrolSpecial
+  9048 = SoundEnvironment
+  9070 = InterpolationPoint
+  9071 = PathFollower
+  9072 = MovingCamera
+  9073 = AimingCamera
+  9074 = ActorMover
+  9075 = InterpolationSpecial
+  9076 = HateTarget
+  9077 = UpperStackLookOnly
+  9078 = LowerStackLookOnly
+  9080 = SkyViewpoint
+  9081 = SkyPicker
+  9082 = SectorSilencer
+  9083 = SkyCamCompat
+  9200 = Decal
+  9300 = "$PolyAnchor"
+  9301 = "$PolySpawn"
+  9302 = "$PolySpawnCrush"
+  9303 = "$PolySpawnHurt"
+  9982 = SecActEyesAboveC
+  9983 = SecActEyesBelowC
+  9988 = CustomSprite
+  9989 = SecActHitFakeFloor
+  9990 = InvisibleBridge
+  9991 = CustomBridge
+  9992 = SecActEyesSurface
+  9993 = SecActEyesDive
+  9994 = SecActUseWall
+  9995 = SecActUse
+  9996 = SecActHitCeil
+  9997 = SecActExit
+  9998 = SecActEnter
+  9999 = SecActHitFloor
+ 14001 = AmbientSound, 1
+ 14002 = AmbientSound, 2
+ 14003 = AmbientSound, 3
+ 14004 = AmbientSound, 4
+ 14005 = AmbientSound, 5
+ 14006 = AmbientSound, 6
+ 14007 = AmbientSound, 7
+ 14008 = AmbientSound, 8
+ 14009 = AmbientSound, 9
+ 14010 = AmbientSound, 10
+ 14011 = AmbientSound, 11
+ 14012 = AmbientSound, 12
+ 14013 = AmbientSound, 13
+ 14014 = AmbientSound, 14
+ 14015 = AmbientSound, 15
+ 14016 = AmbientSound, 16
+ 14017 = AmbientSound, 17
+ 14018 = AmbientSound, 18
+ 14019 = AmbientSound, 19
+ 14020 = AmbientSound, 20
+ 14021 = AmbientSound, 21
+ 14022 = AmbientSound, 22
+ 14023 = AmbientSound, 23
+ 14024 = AmbientSound, 24
+ 14025 = AmbientSound, 25
+ 14026 = AmbientSound, 26
+ 14027 = AmbientSound, 27
+ 14028 = AmbientSound, 28
+ 14029 = AmbientSound, 29
+ 14030 = AmbientSound, 30
+ 14031 = AmbientSound, 31
+ 14032 = AmbientSound, 32
+ 14033 = AmbientSound, 33
+ 14034 = AmbientSound, 34
+ 14035 = AmbientSound, 35
+ 14036 = AmbientSound, 36
+ 14037 = AmbientSound, 37
+ 14038 = AmbientSound, 38
+ 14039 = AmbientSound, 39
+ 14040 = AmbientSound, 40
+ 14041 = AmbientSound, 41
+ 14042 = AmbientSound, 42
+ 14043 = AmbientSound, 43
+ 14044 = AmbientSound, 44
+ 14045 = AmbientSound, 45
+ 14046 = AmbientSound, 46
+ 14047 = AmbientSound, 47
+ 14048 = AmbientSound, 48
+ 14049 = AmbientSound, 49
+ 14050 = AmbientSound, 50
+ 14051 = AmbientSound, 51
+ 14052 = AmbientSound, 52
+ 14053 = AmbientSound, 53
+ 14054 = AmbientSound, 54
+ 14055 = AmbientSound, 55
+ 14056 = AmbientSound, 56
+ 14057 = AmbientSound, 57
+ 14058 = AmbientSound, 58
+ 14059 = AmbientSound, 59
+ 14060 = AmbientSound, 60
+ 14061 = AmbientSound, 61
+ 14062 = AmbientSound, 62
+ 14063 = AmbientSound, 63
+ 14064 = AmbientSound, 64
+ 14065 = AmbientSound
+ 14066 = SoundSequence
+ 14067 = AmbientSoundNoGravity
+ 14101 = MusicChanger, 1
+ 14102 = MusicChanger, 2
+ 14103 = MusicChanger, 3
+ 14104 = MusicChanger, 4
+ 14105 = MusicChanger, 5
+ 14106 = MusicChanger, 6
+ 14107 = MusicChanger, 7
+ 14108 = MusicChanger, 8
+ 14109 = MusicChanger, 9
+ 14110 = MusicChanger, 10
+ 14111 = MusicChanger, 11
+ 14112 = MusicChanger, 12
+ 14113 = MusicChanger, 13
+ 14114 = MusicChanger, 14
+ 14115 = MusicChanger, 15
+ 14116 = MusicChanger, 16
+ 14117 = MusicChanger, 17
+ 14118 = MusicChanger, 18
+ 14119 = MusicChanger, 19
+ 14120 = MusicChanger, 20
+ 14121 = MusicChanger, 21
+ 14122 = MusicChanger, 22
+ 14123 = MusicChanger, 23
+ 14124 = MusicChanger, 24
+ 14125 = MusicChanger, 25
+ 14126 = MusicChanger, 26
+ 14127 = MusicChanger, 27
+ 14128 = MusicChanger, 28
+ 14129 = MusicChanger, 29
+ 14130 = MusicChanger, 30
+ 14131 = MusicChanger, 31
+ 14132 = MusicChanger, 32
+ 14133 = MusicChanger, 33
+ 14134 = MusicChanger, 34
+ 14135 = MusicChanger, 35
+ 14136 = MusicChanger, 36
+ 14137 = MusicChanger, 37
+ 14138 = MusicChanger, 38
+ 14139 = MusicChanger, 39
+ 14140 = MusicChanger, 40
+ 14141 = MusicChanger, 41
+ 14142 = MusicChanger, 42
+ 14143 = MusicChanger, 43
+ 14144 = MusicChanger, 44
+ 14145 = MusicChanger, 45
+ 14146 = MusicChanger, 46
+ 14147 = MusicChanger, 47
+ 14148 = MusicChanger, 48
+ 14149 = MusicChanger, 49
+ 14150 = MusicChanger, 50
+ 14151 = MusicChanger, 51
+ 14152 = MusicChanger, 52
+ 14153 = MusicChanger, 53
+ 14154 = MusicChanger, 54
+ 14155 = MusicChanger, 55
+ 14156 = MusicChanger, 56
+ 14157 = MusicChanger, 57
+ 14158 = MusicChanger, 58
+ 14159 = MusicChanger, 59
+ 14160 = MusicChanger, 60
+ 14161 = MusicChanger, 61
+ 14162 = MusicChanger, 62
+ 14163 = MusicChanger, 63
+ 14164 = MusicChanger, 64
+ 14165 = MusicChanger
+ 32000 = DoomBuilderCamera
+}
+
+
 Intermission Inter_Titlescreen
 {
 	GotoTitle
diff --git a/wadsrc/static/mapinfo/doomcommon.txt b/wadsrc/static/mapinfo/doomcommon.txt
index 9e3665533..8138c905d 100644
--- a/wadsrc/static/mapinfo/doomcommon.txt
+++ b/wadsrc/static/mapinfo/doomcommon.txt
@@ -1,4 +1,5 @@
 include "mapinfo/common.txt"
+include "mapinfo/doomitems.txt"
 
 gameinfo
 {
@@ -41,7 +42,6 @@ gameinfo
 	defaultrespawntime = 12
 	defaultdropstyle = 1
 	endoom = "ENDOOM"
-	player5start = 4001
 	pickupcolor = "d7 ba 45"
 	quitmessages = "$QUITMSG", "$QUITMSG1", "$QUITMSG2", "$QUITMSG3", "$QUITMSG4", "$QUITMSG5", "$QUITMSG6", "$QUITMSG7",
 				   "$QUITMSG8", "$QUITMSG9", "$QUITMSG10", "$QUITMSG11", "$QUITMSG12", "$QUITMSG13", "$QUITMSG14"
diff --git a/wadsrc/static/mapinfo/doomitems.txt b/wadsrc/static/mapinfo/doomitems.txt
new file mode 100644
index 000000000..95f02cdb1
--- /dev/null
+++ b/wadsrc/static/mapinfo/doomitems.txt
@@ -0,0 +1,152 @@
+DoomEdNums
+{
+     5 = BlueCard
+     6 = YellowCard
+     7 = SpiderMastermind
+     8 = Backpack
+     9 = ShotgunGuy
+    10 = GibbedMarine
+    12 = GibbedMarineExtra
+    13 = RedCard
+    15 = DeadMarine
+    16 = Cyberdemon
+    17 = CellPack
+    18 = DeadZombieMan
+    19 = DeadShotgunGuy
+    20 = DeadDoomImp
+    21 = DeadDemon
+    22 = DeadCacodemon
+    23 = DeadLostSoul
+    24 = Gibs
+    25 = DeadStick
+    26 = LiveStick
+    27 = HeadOnAStick
+    28 = HeadsOnAStick
+    29 = HeadCandles
+    30 = TallGreenColumn
+    31 = ShortGreenColumn
+    32 = TallRedColumn
+    33 = ShortRedColumn
+    34 = Candlestick
+    35 = Candelabra
+    36 = HeartColumn
+    37 = SkullColumn
+    38 = RedSkull
+    39 = YellowSkull
+    40 = BlueSkull
+    41 = EvilEye
+    42 = FloatingSkull
+    43 = TorchTree
+    44 = BlueTorch
+    45 = GreenTorch
+    46 = RedTorch
+    47 = Stalagtite
+    48 = TechPillar
+    49 = BloodyTwitch
+    50 = Meat2
+    51 = Meat3
+    52 = Meat4
+    53 = Meat5
+    54 = BigTree
+    55 = ShortBlueTorch
+    56 = ShortGreenTorch
+    57 = ShortRedTorch
+    58 = Spectre
+    59 = NonsolidMeat2
+    60 = NonsolidMeat4
+    61 = NonsolidMeat3
+    62 = NonsolidMeat5
+    63 = NonsolidTwitch
+    64 = Archvile
+    65 = ChaingunGuy
+    66 = Revenant
+    67 = Fatso
+    68 = Arachnotron
+    69 = HellKnight
+    70 = BurningBarrel
+    71 = PainElemental
+    72 = CommanderKeen
+    73 = HangNoGuts
+    74 = HangBNoBrain
+    75 = HangTLookingDown
+    76 = HangTSkull
+    77 = HangTLookingUp
+    78 = HangTNoBrain
+    79 = ColonGibs
+    80 = SmallBloodPool
+    81 = BrainStem
+    82 = SuperShotgun
+    83 = Megasphere
+    84 = WolfensteinSS
+    85 = TechLamp
+    86 = TechLamp2
+    87 = BossTarget
+    88 = BossBrain
+    89 = BossEye
+  2001 = Shotgun
+  2002 = Chaingun
+  2003 = RocketLauncher
+  2004 = PlasmaRifle
+  2005 = Chainsaw
+  2006 = BFG9000
+  2007 = Clip
+  2008 = Shell
+  2010 = RocketAmmo
+  2011 = Stimpack
+  2012 = Medikit
+  2013 = Soulsphere
+  2014 = HealthBonus
+  2015 = ArmorBonus
+  2016 = EvilSceptre
+  2017 = UnholyBible
+  2018 = GreenArmor
+  2019 = BlueArmor
+  2022 = InvulnerabilitySphere
+  2023 = Berserk
+  2024 = BlurSphere
+  2025 = RadSuit
+  2026 = Allmap
+  2028 = Column
+  2035 = ExplosiveBarrel
+  2045 = Infrared
+  2046 = RocketBox
+  2047 = Cell
+  2048 = ClipBox
+  2049 = ShellBox
+  3001 = DoomImp
+  3002 = Demon
+  3003 = BaronOfHell
+  3004 = Zombieman
+  3005 = Cacodemon
+  3006 = LostSoul
+  4001 = "$Player5Start"
+  4002 = "$Player6Start"
+  4003 = "$Player7Start"
+  4004 = "$Player8Start"
+  5010 = Pistol
+  5050 = Stalagmite
+  9050 = StealthArachnotron
+  9051 = StealthArchvile
+  9052 = StealthBaron
+  9053 = StealthCacodemon
+  9054 = StealthChaingunGuy
+  9055 = StealthDemon
+  9056 = StealthHellKnight
+  9057 = StealthDoomImp
+  9058 = StealthFatso
+  9059 = StealthRevenant
+  9060 = StealthShotgunGuy
+  9061 = StealthZombieMan
+  9100 = ScriptedMarine
+  9101 = MarineFist
+  9102 = MarineBerserk
+  9103 = MarineChainsaw
+  9104 = MarinePistol
+  9105 = MarineShotgun
+  9106 = MarineSSG
+  9107 = MarineChaingun
+  9108 = MarineRocket
+  9109 = MarinePlasma
+  9110 = MarineRailgun
+  9111 = MarineBFG
+}
\ No newline at end of file
diff --git a/wadsrc/static/mapinfo/heretic.txt b/wadsrc/static/mapinfo/heretic.txt
index 196e81c50..a4b8c3ece 100644
--- a/wadsrc/static/mapinfo/heretic.txt
+++ b/wadsrc/static/mapinfo/heretic.txt
@@ -41,7 +41,6 @@ gameinfo
 	defaultrespawntime = 12
 	defaultdropstyle = 1
 	endoom = "ENDTEXT"
-	player5start = 4001
 	pickupcolor = "d7 ba 45"
 	quitmessages = "$*RAVENQUITMSG"
 	menufontcolor_title = "UNTRANSLATED"
@@ -66,6 +65,106 @@ gameinfo
 	statscreen_enteringfont = "SmallFont"
 }
 
+DoomEdNums
+{
+     5 = HereticImpLeader
+     6 = Ironlich
+     7 = Sorcerer1
+     8 = BagOfHolding
+     9 = Minotaur
+    10 = GoldWandAmmo
+    12 = GoldWandHefty
+    13 = MaceAmmo
+    15 = Wizard
+    16 = MaceHefty
+    17 = SkullHang70
+    18 = CrossbowAmmo
+    19 = CrossbowHefty
+    20 = SkullRodAmmo
+    21 = SkullRodHefty
+    22 = PhoenixRodAmmo
+    23 = PhoenixRodHefty
+    24 = SkullHang60
+    25 = SkullHang45
+    26 = SkullHang35
+    27 = SerpentTorch
+    28 = Chandelier
+    29 = SmallPillar
+    30 = ArtiEgg
+    31 = EnchantedShield
+    32 = ArtiSuperHealth
+    33 = ArtiTorch
+    34 = ArtiTimeBomb
+    35 = SuperMap
+    36 = ArtiTeleport
+    37 = StalagmiteSmall
+    38 = StalagmiteLarge
+    39 = StalactiteSmall
+    40 = StalactiteLarge
+    41 = SoundWaterfall
+    42 = SoundWind
+    43 = PodGenerator
+    44 = Barrel
+    45 = MummyLeader
+    46 = MummyLeaderGhost
+    47 = BrownPillar
+    48 = Moss1
+    49 = Moss2
+    50 = WallTorch
+    51 = HangingCorpse
+    52 = TeleGlitterGenerator2
+    53 = Blaster
+    54 = BlasterAmmo
+    55 = BlasterHefty
+    56 = BossSpot
+    64 = Knight
+    65 = KnightGhost
+    66 = HereticImp
+    68 = Mummy
+    69 = MummyGhost
+    70 = Beast
+    73 = KeyGreen
+    74 = TeleGlitterGenerator1
+    75 = ArtiInvisibility
+    76 = FireBrazier
+    79 = KeyBlue
+    80 = KeyYellow
+    81 = CrystalVial
+    82 = ArtiHealth
+    83 = ArtiFly
+    84 = ArtiInvulnerability
+    85 = SilverShield
+    86 = ArtiTomeOfPower
+    87 = Volcano
+    90 = Clink
+    92 = Snake
+    94 = KeyGizmoBlue
+    95 = KeyGizmoGreen
+    96 = KeyGizmoYellow
+   118 = Bridge
+  1200 = HereticSoundSequence1
+  1201 = HereticSoundSequence2
+  1202 = HereticSoundSequence3
+  1203 = HereticSoundSequence4
+  1204 = HereticSoundSequence5
+  1205 = HereticSoundSequence6
+  1206 = HereticSoundSequence7
+  1207 = HereticSoundSequence8
+  1208 = HereticSoundSequence9
+  1209 = HereticSoundSequence10
+  2001 = Crossbow
+  2002 = MaceSpawner
+  2003 = PhoenixRod
+  2004 = SkullRod
+  2005 = Gauntlets
+  2035 = Pod
+  4001 = "$Player5Start"
+  4002 = "$Player6Start"
+  4003 = "$Player7Start"
+  4004 = "$Player8Start"
+  9042 = GoldWand
+}
+
 skill baby
 {
 	AutoUseHealth
diff --git a/wadsrc/static/mapinfo/hexen.txt b/wadsrc/static/mapinfo/hexen.txt
index 631c6d1e9..2788947a5 100644
--- a/wadsrc/static/mapinfo/hexen.txt
+++ b/wadsrc/static/mapinfo/hexen.txt
@@ -39,7 +39,6 @@ gameinfo
 	definventorymaxamount = 25
 	defaultrespawntime = 12
 	defaultdropstyle = 1
-	player5start = 9100
 	pickupcolor = "d7 ba 45"
 	quitmessages = "$*RAVENQUITMSG"
 	menufontcolor_title = "UNTRANSLATED"
@@ -64,6 +63,242 @@ gameinfo
 	statscreen_enteringfont = "SmallFont"
 }
 
+DoomEdNums
+{
+     5 = ZWingedStatue
+     6 = ZRock1
+     7 = ZRock2
+     9 = ZRock3
+    10 = CWeapStaff
+    12 = FWeaponPiece1
+    13 = FWeaponPiece2
+    15 = ZRock4
+    16 = FWeaponPiece3
+    17 = ZChandelier
+    18 = CWeaponPiece1
+    19 = CWeaponPiece2
+    20 = CWeaponPiece3
+    21 = MWeaponPiece1
+    22 = MWeaponPiece2
+    23 = MWeaponPiece3
+    24 = ZTreeDead
+    25 = ZTree
+    26 = ZTreeSwamp150
+    27 = ZTreeSwamp120
+    28 = ZStumpBurned
+    29 = ZStumpBare
+    30 = ArtiPork
+    31 = Demon1
+    32 = ArtiSuperHealth
+    33 = ArtiTorch
+    34 = Wraith
+    36 = ArtiTeleport
+    37 = ZStumpSwamp1
+    38 = ZStumpSwamp2
+    39 = ZShroomLarge1
+    40 = ZShroomLarge2
+    41 = ZShroomLarge3
+    42 = ZShroomSmall1
+    44 = ZShroomSmall2
+    45 = ZShroomSmall3
+    46 = ZShroomSmall4
+    47 = ZShroomSmall5
+    48 = ZStalagmitePillar
+    49 = ZStalagmiteLarge
+    50 = ZStalagmiteMedium
+    51 = ZStalagmiteSmall
+    52 = ZStalactiteLarge
+    53 = MWeapFrost
+    54 = ZWallTorch
+    55 = ZWallTorchUnlit
+    56 = ZStalactiteMedium
+    57 = ZStalactiteSmall
+    58 = ZMossCeiling1
+    59 = ZMossCeiling2
+    60 = ZSwampVine
+    61 = ZCorpseKabob
+    62 = ZCorpseSleeping
+    63 = ZTombstoneRIP
+    64 = ZTombstoneShane
+    65 = ZTombstoneBigCross
+    66 = ZTombstoneBrianR
+    67 = ZTombstoneCrossCircle
+    68 = ZTombstoneSmallCross
+    69 = ZTombstoneBrianP
+    71 = ZCorpseHanging
+    72 = ZStatueGargoyleGreenTall
+    73 = ZStatueGargoyleBlueTall
+    74 = ZStatueGargoyleGreenShort
+    76 = ZStatueGargoyleBlueShort
+    77 = ZBannerTattered
+    78 = ZTreeLarge1
+    79 = ZTreeLarge2
+    80 = ZTreeGnarled1
+    81 = CrystalVial
+    82 = ArtiHealth
+    83 = ArtiFly
+    84 = ArtiInvulnerability2
+    86 = ArtiDarkServant
+    87 = ZTreeGnarled2
+    88 = ZLog
+    89 = ZStalactiteIceLarge
+    90 = ZStalactiteIceMedium
+    91 = ZStalactiteIceSmall
+    92 = ZStalactiteIceTiny
+    93 = ZStalagmiteIceLarge
+    94 = ZStalagmiteIceMedium
+    95 = ZStalagmiteIceSmall
+    96 = ZStalagmiteIceTiny
+    97 = ZRockBrown1
+    98 = ZRockBrown2
+    99 = ZRockBlack
+   100 = ZRubble1
+   101 = ZRubble2
+   102 = ZRubble3
+   103 = ZVasePillar
+   104 = Pottery1
+   105 = Pottery2
+   106 = Pottery3
+   107 = Centaur
+   108 = ZCorpseLynched
+   109 = ZCorpseLynchedNoHeart
+   110 = ZCorpseSitting
+   111 = BloodPool
+   112 = LittleFly
+   113 = LeafSpawner
+   114 = Bishop
+   115 = CentaurLeader
+   116 = ZTwinedTorch
+   117 = ZTwinedTorchUnlit
+   118 = Bridge
+   119 = ZCandle
+   120 = SerpentLeader
+   121 = Serpent
+   122 = Mana1
+   123 = FWeapHammer
+   124 = Mana2
+   140 = TeleSmoke
+   254 = Dragon
+  1410 = SoundWindHexen
+  3000 = "$PolyAnchor"
+  3001 = "$PolySpawn"
+  3002 = "$PolySpawnCrush"
+  8000 = ArtiPoisonBag
+  8002 = ArtiSpeedBoots
+  8003 = ArtiBoostMana
+  8004 = Mana3
+  8005 = MeshArmor
+  8006 = FalconShield
+  8007 = PlatinumHelm
+  8008 = AmuletOfWarding
+  8009 = CWeapFlame
+  8010 = FWeapAxe
+  8020 = IceGuy
+  8030 = KeySteel
+  8031 = KeyCave
+  8032 = KeyAxe
+  8033 = KeyFire
+  8034 = KeyEmerald
+  8035 = KeyDungeon
+  8036 = KeySilver
+  8037 = KeyRusted
+  8038 = KeyHorn
+  8039 = KeySwamp
+  8040 = MWeapLightning
+  8041 = ArtiBoostArmor
+  8042 = ZFireBull
+  8043 = ZFireBullUnlit
+  8044 = ZStatueGargoyleStripeTall
+  8045 = ZStatueGargoyleDarkRedTall
+  8046 = ZStatueGargoyleRedTall
+  8047 = ZStatueGargoyleTanTall
+  8048 = ZStatueGargoyleRustTall
+  8049 = ZStatueGargoyleDarkRedShort
+  8050 = ZStatueGargoyleRedShort
+  8051 = ZStatueGargoyleTanShort
+  8052 = ZStatueGargoyleRustShort
+  8060 = FireThing
+  8061 = BrassTorch
+  8062 = TreeDestructible
+  8063 = ZChandelierUnlit
+  8064 = ZSuitOfArmor
+  8065 = ZBell
+  8066 = ZBlueCandle
+  8067 = ZIronMaiden
+  8068 = ZXmasTree
+  8069 = ZCauldron
+  8070 = ZCauldronUnlit
+  8071 = ZChainBit32
+  8072 = ZChainBit64
+  8073 = ZChainEndHeart
+  8074 = ZChainEndHook1
+  8075 = ZChainEndHook2
+  8076 = ZChainEndSpike
+  8077 = ZChainEndSkull
+  8080 = Demon2
+  8100 = ZBarrel
+  8101 = ZShrub1
+  8102 = ZShrub2
+  8103 = ZBucket
+  8104 = ZPoisonShroom
+  8200 = KeyCastle
+  8500 = TableShit1
+  8501 = TableShit2
+  8502 = TableShit3
+  8503 = TableShit4
+  8504 = TableShit5
+  8505 = TableShit6
+  8506 = TableShit7
+  8507 = TableShit8
+  8508 = TableShit9
+  8509 = TableShit10
+  9002 = PuzzSkull
+  9003 = PuzzGemBig
+  9004 = PuzzGemRed
+  9005 = PuzzGemGreen1
+  9006 = PuzzGemBlue1
+  9007 = PuzzBook1
+  9008 = PuzzBook2
+  9009 = PuzzGemGreen2
+  9010 = PuzzGemBlue2
+  9011 = ZWingedStatueNoSkull
+  9012 = ZGemPedestal
+  9014 = PuzzFlameMask
+  9015 = PuzzFWeapon
+  9016 = PuzzCWeapon
+  9017 = PuzzMWeapon
+  9018 = PuzzGear1
+  9019 = PuzzGear2
+  9020 = PuzzGear3
+  9021 = PuzzGear4
+  9100 = "$Player5Start"
+  9101 = "$Player6Start"
+  9102 = "$Player7Start"
+  9103 = "$Player8Start"
+ 10000 = FogSpawner
+ 10001 = FogPatchSmall
+ 10002 = FogPatchMedium
+ 10003 = FogPatchLarge
+ 10011 = WraithBuried
+ 10030 = Ettin
+ 10040 = ArtiTeleportOther
+ 10060 = FireDemon
+ 10080 = Heresiarch
+ 10090 = ThrustFloorDown
+ 10091 = ThrustFloorUp
+ 10100 = FighterBoss
+ 10101 = ClericBoss
+ 10102 = MageBoss
+ 10110 = ArtiBlastRadius
+ 10120 = ArtiHealingRadius
+ 10200 = Korax
+ 10225 = BatSpawner
+ 10500 = FlameSmallTemp
+ 10501 = FlameSmall
+ 10502 = FlameLargeTemp
+ 10503 = FlameLarge
+}
+
 skill baby
 {
 	AutoUseHealth
diff --git a/wadsrc/static/mapinfo/strife.txt b/wadsrc/static/mapinfo/strife.txt
index 5a25f3779..6d00d1214 100644
--- a/wadsrc/static/mapinfo/strife.txt
+++ b/wadsrc/static/mapinfo/strife.txt
@@ -66,6 +66,261 @@ gameinfo
 	statscreen_enteringfont = "BigFont", "white"
 }
 
+DoomEdNums
+{
+     5 = "$Player5Start"
+     6 = "$Player6Start"
+     7 = "$Player7Start"
+     8 = "$Player8Start"
+     9 = Rebel1
+    10 = TeleporterBeacon
+    12 = Loremaster
+    13 = IDCard
+    15 = DeadStrifePlayer
+    16 = Inquisitor
+    17 = EnergyPack
+    18 = DeadPeasant
+    19 = DeadRebel
+    20 = DeadReaver
+    21 = DeadAcolyte
+    22 = DeadCrusader
+    23 = TeleportSwirl
+    24 = KlaxonWarningLight
+    25 = ForceFieldGuard
+    26 = EntityNest
+    27 = CeilingTurret
+    28 = CageLight
+    29 = Rubble1
+    30 = Rubble2
+    31 = Rubble3
+    32 = Rubble4
+    33 = TreeStub
+    34 = Candle
+    35 = StrifeCandelabra
+    36 = Rubble5
+    37 = Rubble6
+    38 = SilverKey
+    39 = BrassKey
+    40 = GoldKey
+    41 = Rubble7
+    42 = Rubble8
+    43 = OutsideLamp
+    44 = StatueRuined
+    45 = Piston
+    46 = PoleLantern
+    47 = LargeTorch
+    48 = PillarTechno
+    50 = HugeTorch
+    51 = PalmTree
+    52 = OfficersUniform
+    53 = WaterDrip
+    54 = PillarAztec
+    55 = PillarAztecDamaged
+    56 = PillarAztecRuined
+    57 = PillarHugeTech
+    58 = AcolyteShadow
+    59 = DegninOre
+    60 = ShortBush
+    61 = OracleKey
+    62 = TallBush
+    63 = ChimneyStack
+    64 = Macil1
+    65 = Peasant4
+    66 = Peasant7
+    67 = Peasant10
+    68 = Tray
+    69 = BarricadeColumn
+    70 = StrifeBurningBarrel
+    71 = Programmer
+    72 = BarKeep
+    73 = Armorer
+    74 = Medic
+    75 = AlienSpectre2
+    76 = AlienSpectre3
+    77 = Sigil1
+    78 = Sigil2
+    79 = Sigil3
+    80 = Sigil4
+    81 = Sigil5
+    82 = WoodenBarrel
+    83 = SurgeryKit
+    85 = RatBuddy
+    86 = OrderKey
+    90 = GuardUniform
+    91 = SeveredHand
+    92 = PowerCrystal
+    93 = Coin
+    94 = ExplosiveBarrel2
+    95 = LightSilverFluorescent
+    96 = LightBrownFluorescent
+    97 = LightGoldFluorescent
+    98 = SStalactiteBig
+    99 = SRock1
+   100 = SRock2
+   101 = SRock3
+   102 = SRock4
+   103 = WaterDropOnFloor
+   104 = WaterfallSplash
+   105 = BurningBowl
+   106 = BurningBrazier
+   107 = SmallTorchLit
+   108 = SmallTorchUnlit
+   109 = CeilingChain
+   110 = Statue
+   111 = MediumTorch
+   112 = WaterFountain
+   113 = HeartsInTank
+   114 = ElectricBolts
+   115 = PoisonBolts
+   116 = WeaponSmith
+   117 = SurgeryCrab
+   118 = "$Player1Start", 1
+   119 = "$Player1Start", 2
+   120 = "$Player1Start", 3
+   121 = "$Player1Start", 4
+   122 = "$Player1Start", 5
+   123 = "$Player1Start", 6
+   124 = "$Player1Start", 7
+   125 = "$Player1Start", 8
+   126 = "$Player1Start", 9
+   127 = "$Player1Start", 10
+   128 = EntityBoss
+   129 = AlienSpectre1
+   130 = Peasant2
+   131 = Peasant3
+   132 = Peasant5
+   133 = Peasant6
+   134 = Peasant8
+   135 = Peasant9
+   136 = Peasant11
+   137 = Peasant12
+   138 = Gold10
+   139 = Gold25
+   140 = Gold50
+   141 = Beggar1
+   142 = AcolyteRed
+   143 = AcolyteRust
+   144 = Rebel2
+   145 = Rebel3
+   146 = AcolyteGray
+   147 = AcolyteDGreen
+   148 = AcolyteGold
+   149 = Rebel4
+   150 = Rebel5
+   151 = Rebel6
+   152 = HEGrenadeRounds
+   153 = PhosphorusGrenadeRounds
+   154 = StrifeGrenadeLauncher
+   155 = Beggar2
+   156 = Beggar3
+   157 = Beggar4
+   158 = Beggar5
+   159 = CavePillarTop
+   160 = SStalagmiteBig
+   161 = SStalactiteSmall
+   162 = CavePillarBottom
+   163 = SStalagmiteSmall
+   164 = Mug
+   165 = Pot
+   166 = WarehouseKey
+   167 = AlienSpectre4
+   168 = AlienSpectre5
+   169 = Zombie
+   170 = ZombieSpawner
+   172 = Peasant13
+   173 = Peasant14
+   174 = Peasant15
+   175 = Peasant16
+   176 = Peasant17
+   177 = Peasant18
+   178 = Peasant19
+   179 = Peasant20
+   180 = Peasant21
+   181 = Peasant22
+   182 = Computer
+   183 = AmmoSatchel
+   184 = IDBadge
+   185 = Passcard
+   186 = Stalker
+   187 = StrifeBishop
+   188 = Pitcher
+   189 = Stool
+   190 = MetalPot
+   191 = Tub
+   192 = RedCrystalKey
+   193 = BlueCrystalKey
+   194 = Anvil
+   195 = ChapelKey
+   196 = TechLampSilver
+   197 = TechLampBrass
+   198 = EntityPod
+   199 = Oracle
+   200 = Macil2
+   201 = AcolyteToBe
+   202 = BigTree2
+   203 = PottedTree
+   204 = KneelingGuy
+   205 = OfferingChalice
+   206 = Communicator
+   207 = Targeter
+   208 = TargetPractice
+   209 = Tank1
+   210 = Tank2
+   211 = Tank3
+   212 = SacrificedGuy
+   213 = Tank4
+   214 = Tank5
+   215 = StickInWater
+   216 = SigilBanner
+   217 = RebelBoots
+   218 = RebelHelmet
+   219 = RebelShirt
+   220 = PowerCoupling
+   221 = AlienBubbleColumn
+   222 = AlienFloorBubble
+   223 = AlienCeilingBubble
+   224 = AlienAspClimber
+   225 = AlienSpiderLight
+   226 = BrokenPowerCoupling
+   227 = PillarAlienPower
+   228 = AmmoFiller
+   229 = Tank6
+   230 = BaseKey
+   231 = AcolyteBlue
+   232 = AcolyteLGreen
+   233 = MaulerKey
+   234 = FactoryKey
+   235 = MineKey
+   236 = CoreKey
+  2001 = StrifeCrossbow
+  2002 = AssaultGun
+  2003 = MiniMissileLauncher
+  2004 = Mauler
+  2005 = FlameThrower
+  2006 = AssaultGunStanding
+  2007 = ClipOfBullets
+  2010 = MiniMissiles
+  2011 = MedPatch
+  2012 = MedicalKit
+  2014 = WaterBottle
+  2018 = LeatherArmor
+  2019 = MetalArmor
+  2024 = ShadowArmor
+  2025 = EnvironmentalSuit
+  2026 = StrifeMap
+  2027 = Scanner
+  2028 = LightGlobe
+  2046 = CrateOfMissiles
+  2047 = EnergyPod
+  2048 = BoxOfBullets
+  3001 = Reaver
+  3002 = AcolyteTan
+  3003 = Templar
+  3004 = Peasant1
+  3005 = Crusader
+  3006 = Sentinel
+}
+
 Intermission Inter_Strife_Good
 {
 	Image
diff --git a/wadsrc/static/sprites/AFLYA0.png b/wadsrc/static/sprites/AFLYA0.png
new file mode 100644
index 000000000..d12ca16c6
Binary files /dev/null and b/wadsrc/static/sprites/AFLYA0.png differ
diff --git a/wadsrc/static/sprites/AFLYB0.png b/wadsrc/static/sprites/AFLYB0.png
new file mode 100644
index 000000000..6f39e47d4
Binary files /dev/null and b/wadsrc/static/sprites/AFLYB0.png differ
diff --git a/wadsrc/static/sprites/AFLYC0.png b/wadsrc/static/sprites/AFLYC0.png
new file mode 100644
index 000000000..bc2a9a371
Binary files /dev/null and b/wadsrc/static/sprites/AFLYC0.png differ
diff --git a/wadsrc/static/sprites/AFLYD0.png b/wadsrc/static/sprites/AFLYD0.png
new file mode 100644
index 000000000..8509a127d
Binary files /dev/null and b/wadsrc/static/sprites/AFLYD0.png differ
diff --git a/zdoom.vcproj b/zdoom.vcproj
index 98de2862e..f134c57f1 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -5376,6 +5376,42 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\src\g_hexen\a_flies.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\src\g_hexen\a_fog.cpp"
 					>