diff --git a/wadsrc/static/actors/hexen/hexenarmor.txt b/wadsrc/static/actors/hexen/hexenarmor.txt
deleted file mode 100644
index 53be60fe0..000000000
--- a/wadsrc/static/actors/hexen/hexenarmor.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// Mesh Armor (1) -----------------------------------------------------------
-
-ACTOR MeshArmor : HexenArmor
-{
-	+NOGRAVITY
-	Health 0	// Armor class
-	Inventory.Amount 0
-	Inventory.PickupMessage "$TXT_ARMOR1"
-	States
-	{
-	Spawn:
-		AR_1 A -1
-		Stop
-	}
-}
-	
-// Falcon Shield (2) --------------------------------------------------------
-
-ACTOR FalconShield : HexenArmor
-{
-	+NOGRAVITY
-	Health 1	// Armor class
-	Inventory.Amount 0
-	Inventory.PickupMessage "$TXT_ARMOR2"
-	States
-	{
-	Spawn:
-		AR_2 A -1
-		Stop
-	}
-}
-
-// Platinum Helm (3) --------------------------------------------------------
-
-ACTOR PlatinumHelm : HexenArmor
-{
-	+NOGRAVITY
-	Health 2	// Armor class
-	Inventory.Amount 0
-	Inventory.PickupMessage "$TXT_ARMOR3"
-	States
-	{
-	Spawn:
-		AR_3 A -1
-		Stop
-	}
-}
-
-// Amulet of Warding (4) ----------------------------------------------------
-
-ACTOR AmuletOfWarding : HexenArmor
-{
-	+NOGRAVITY
-	Health 3	// Armor class
-	Inventory.Amount 0
-	Inventory.PickupMessage "$TXT_ARMOR4"
-	States
-	{
-	Spawn:
-		AR_4 A -1
-		Stop
-	}
-}
-
diff --git a/wadsrc/static/actors/hexen/hexendecorations.txt b/wadsrc/static/actors/hexen/hexendecorations.txt
deleted file mode 100644
index 87af4eff5..000000000
--- a/wadsrc/static/actors/hexen/hexendecorations.txt
+++ /dev/null
@@ -1,1396 +0,0 @@
-ACTOR ZWingedStatue
-{
-	Radius 10
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		STTW A -1
-		Stop
-	}
-}
-	
-ACTOR ZRock1
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RCK1 A -1
-		Stop
-	}
-}
-
-ACTOR ZRock2
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RCK2 A -1
-		Stop
-	}
-}
-
-ACTOR ZRock3
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RCK3 A -1
-		Stop
-	}
-}
-
-ACTOR ZRock4
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RCK4 A -1
-		Stop
-	}
-}
-
-ACTOR ZChandelier
-{
-	Radius 20
-	Height 60
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		CDLR ABC 4
-		Loop
-	}
-}
-
-ACTOR ZChandelierUnlit
-{
-	Radius 20
-	Height 60
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		CDLR D -1
-		Stop
-	}
-}
-
-ACTOR ZTreeDead
-{
-	Radius 10
-	Height 96
-	+SOLID
-	States
-	{
-	Spawn:
-		ZTRE A -1
-		Stop
-	}
-}
-
-ACTOR ZTree
-{
-	Radius 15
-	Height 128
-	+SOLID
-	States
-	{
-	Spawn:
-		ZTRE A -1
-		Stop
-	}
-}
-
-ACTOR ZTreeSwamp150
-{
-	Radius 10
-	Height 150
-	+SOLID
-	States
-	{
-	Spawn:
-		TRES A -1
-		Stop
-	}
-}
-
-ACTOR ZTreeSwamp120
-{
-	Radius 10
-	Height 120
-	+SOLID
-	States
-	{
-	Spawn:
-		TRE3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStumpBurned
-{
-	Radius 12
-	Height 20
-	+SOLID
-	States
-	{
-	Spawn:
-		STM1 A -1
-		Stop
-	}
-}
-
-ACTOR ZStumpBare
-{
-	Radius 12
-	Height 20
-	+SOLID
-	States
-	{
-	Spawn:
-		STM2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStumpSwamp1
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		STM3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStumpSwamp2
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		STM4 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomLarge1
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH1 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomLarge2
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH2 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomLarge3
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH3 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomSmall1
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH4 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomSmall2
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH5 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomSmall3
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH6 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomSmall4
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH7 A -1
-		Stop
-	}
-}
-
-ACTOR ZShroomSmall5
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		MSH8 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmitePillar
-{
-	Radius 8
-	Height 138
-	+SOLID
-	States
-	{
-	Spawn:
-		SGMP A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteLarge
-{
-	Radius 8
-	Height 48
-	+SOLID
-	States
-	{
-	Spawn:
-		SGM1 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteMedium
-{
-	Radius 6
-	Height 40
-	+SOLID
-	States
-	{
-	Spawn:
-		SGM2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteSmall
-{
-	Radius 8
-	Height 36
-	+SOLID
-	States
-	{
-	Spawn:
-		SGM3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteLarge
-{
-	Radius 8
-	Height 66
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		SLC1 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteMedium
-{
-	Radius 6
-	Height 50
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		SLC2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteSmall
-{
-	Radius 8
-	Height 40
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		SLC3 A -1
-		Stop
-	}
-}
-
-ACTOR ZMossCeiling1
-{
-	Radius 20
-	Height 20
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		MSS1 A -1
-		Stop
-	}
-}
-
-ACTOR ZMossCeiling2
-{
-	Radius 20
-	Height 24
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		MSS2 A -1
-		Stop
-	}
-}
-
-ACTOR ZSwampVine
-{
-	Radius 8
-	Height 52
-	+SOLID
-	States
-	{
-	Spawn:
-		SWMV A -1
-		Stop
-	}
-}
-
-ACTOR ZCorpseKabob 
-{
-	Radius 10
-	Height 92
-	+SOLID
-	States
-	{
-	Spawn:
-		CPS1 A -1
-		Stop
-	}
-}
-
-ACTOR ZCorpseSleeping
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		CPS2 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneRIP
-{
-	Radius 10
-	Height 46
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS1 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneShane
-{
-	Radius 10
-	Height 46
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS2 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneBigCross
-{
-	Radius 10
-	Height 46
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS3 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneBrianR
-{
-	Radius 10
-	Height 52
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS4 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneCrossCircle
-{
-	Radius 10
-	Height 52
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS5 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneSmallCross
-{
-	Radius 8
-	Height 46
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS6 A -1
-		Stop
-	}
-}
-
-ACTOR ZTombstoneBrianP
-{
-	Radius 8
-	Height 46
-	+SOLID
-	States
-	{
-	Spawn:
-		TMS7 A -1
-		Stop
-	}
-}
-
-ACTOR ZCorpseHanging
-{
-	Radius 6
-	Height 75
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		CPS3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleGreenTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		STT2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleBlueTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		STT3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleGreenShort
-{
-	Radius 14
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		STT4 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleBlueShort
-{
-	Radius 14
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		STT5 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleStripeTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR1 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleDarkRedTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleRedTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleTanTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR4 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleRustTall
-{
-	Radius 14
-	Height 108
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR5 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleDarkRedShort
-{
-	Radius 14
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR6 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleRedShort
-{
-	Radius 14
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR7 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleTanShort
-{
-	Radius 14
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR8 A -1
-		Stop
-	}
-}
-
-ACTOR ZStatueGargoyleRustShort
-{
-	Radius 14
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		GAR9 A -1
-		Stop
-	}
-}
-
-ACTOR ZBannerTattered
-{
-	Radius 8
-	Height 120
-	+SOLID
-	States
-	{
-	Spawn:
-		BNR1 A -1
-		Stop
-	}
-}
-
-ACTOR ZTreeLarge1
-{
-	Radius 15
-	Height 180
-	+SOLID
-	States
-	{
-	Spawn:
-		TRE4 A -1
-		Stop
-	}
-}
-
-ACTOR ZTreeLarge2
-{
-	Radius 15
-	Height 180
-	+SOLID
-	States
-	{
-	Spawn:
-		TRE5 A -1
-		Stop
-	}
-}
-
-ACTOR ZTreeGnarled1
-{
-	Radius 22
-	Height 100
-	+SOLID
-	States
-	{
-	Spawn:
-		TRE6 A -1
-		Stop
-	}
-}
-
-ACTOR ZTreeGnarled2
-{
-	Radius 22
-	Height 100
-	+SOLID
-	States
-	{
-	Spawn:
-		TRE7 A -1
-		Stop
-	}
-}
-
-ACTOR ZLog
-{
-	Radius 20
-	Height 25
-	+SOLID
-	States
-	{
-	Spawn:
-		LOGG A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteIceLarge
-{
-	Radius 8
-	Height 66
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		ICT1 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteIceMedium
-{
-	Radius 5
-	Height 50
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		ICT2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteIceSmall
-{
-	Radius 4
-	Height 32
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		ICT3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalactiteIceTiny
-{
-	Radius 4
-	Height 8
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		ICT4 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteIceLarge
-{
-	Radius 8
-	Height 66
-	+SOLID
-	States
-	{
-	Spawn:
-		ICM1 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteIceMedium
-{
-	Radius 5
-	Height 50
-	+SOLID
-	States
-	{
-	Spawn:
-		ICM2 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteIceSmall
-{
-	Radius 4
-	Height 32
-	+SOLID
-	States
-	{
-	Spawn:
-		ICM3 A -1
-		Stop
-	}
-}
-
-ACTOR ZStalagmiteIceTiny
-{
-	Radius 4
-	Height 8
-	+SOLID
-	States
-	{
-	Spawn:
-		ICM4 A -1
-		Stop
-	}
-}
-
-ACTOR ZRockBrown1
-{
-	Radius 17
-	Height 72
-	+SOLID
-	States
-	{
-	Spawn:
-		RKBL A -1
-		Stop
-	}
-}
-
-ACTOR ZRockBrown2
-{
-	Radius 15
-	Height 50
-	+SOLID
-	States
-	{
-	Spawn:
-		RKBS A -1
-		Stop
-	}
-}
-
-ACTOR ZRockBlack
-{
-	Radius 20
-	Height 40
-	+SOLID
-	States
-	{
-	Spawn:
-		RKBK A -1
-		Stop
-	}
-}
-
-ACTOR ZRubble1
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RBL1 A -1
-		Stop
-	}
-}
-
-ACTOR ZRubble2
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RBL2 A -1
-		Stop
-	}
-}
-
-ACTOR ZRubble3
-{
-	Radius 20
-	Height 16
-	States
-	{
-	Spawn:
-		RBL3 A -1
-		Stop
-	}
-}
-
-ACTOR ZVasePillar
-{
-	Radius 12
-	Height 54
-	+SOLID
-	States
-	{
-	Spawn:
-		VASE A -1
-		Stop
-	}
-}
-
-ACTOR ZCorpseLynched
-{
-	Radius 11
-	Height 95
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		CPS4 A -1
-		Stop
-	}
-}
-
-ACTOR ZCandle
-{
-	Radius 20
-	Height 16
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CNDL ABC 4 Bright
-		Loop
-	}
-}
-
-ACTOR ZBarrel
-{
-	Radius 15
-	Height 32
-	+SOLID
-	States
-	{
-	Spawn:
-		ZBAR A -1
-		Stop
-	}
-}
-
-ACTOR ZBucket
-{
-	Radius 8
-	Height 72
-	+SOLID
-	+SPAWNCEILING
-	+NOGRAVITY
-	States
-	{
-	Spawn:
-		BCKT A -1
-		Stop
-	}
-}
-
-ACTOR FireThing
-{
-	Radius 5
-	Height 10
-	+SOLID
-	States
-	{
-	Spawn:
-		FSKL A 4 Bright
-		FSKL B 3 Bright
-		FSKL C 4 Bright
-		FSKL D 3 Bright
-		FSKL E 4 Bright
-		FSKL F 3 Bright
-		FSKL G 4 Bright
-		FSKL H 3 Bright
-		FSKL I 4 Bright
-		Loop
-	}
-}
-
-ACTOR BrassTorch
-{
-	Radius 6
-	Height 35
-	+SOLID
-	States
-	{
-	Spawn:
-		BRTR ABCDEFGHIJKLM 4 Bright
-		Loop
-	}
-}
-
-ACTOR ZBlueCandle
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		BCAN ABCDE 5 Bright
-		Loop
-	}
-}
-
-ACTOR ZIronMaiden
-{
-	Radius 12
-	Height 60
-	+SOLID
-	States
-	{
-	Spawn:
-		IRON A -1
-		Stop
-	}
-}
-
-ACTOR ZChainBit32
-{
-	Radius 4
-	Height 32
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS A -1
-		Stop
-	}
-}
-
-ACTOR ZChainBit64
-{
-	Radius 4
-	Height 64
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS B -1
-		Stop
-	}
-}
-
-ACTOR ZChainEndHeart
-{
-	Radius 4
-	Height 32
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS C -1
-		Stop
-	}
-}
-
-ACTOR ZChainEndHook1
-{
-	Radius 4
-	Height 32
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS D -1
-		Stop
-	}
-}
-
-ACTOR ZChainEndHook2
-{
-	Radius 4
-	Height 32
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS E -1
-		Stop
-	}
-}
-
-ACTOR ZChainEndSpike
-{
-	Radius 4
-	Height 32
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS F -1
-		Stop
-	}
-}
-
-ACTOR ZChainEndSkull
-{
-	Radius 4
-	Height 32
-	+SPAWNCEILING
-	+NOGRAVITY
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		CHNS G -1
-		Stop
-	}
-}
-
-ACTOR TableShit1
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST1 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit2
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST2 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit3
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST3 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit4
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST4 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit5
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST5 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit6
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST6 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit7
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST7 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit8
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST8 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit9
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST9 A -1
-		Stop
-	}
-}
-
-ACTOR TableShit10
-{
-	Radius 20
-	Height 16
-	+NOBLOCKMAP
-	States
-	{
-	Spawn:
-		TST0 A -1
-		Stop
-	}
-}
-
-ACTOR TeleSmoke
-{
-	Radius 20
-	Height 16
-	+NOGRAVITY
-	+NOBLOCKMAP
-	RenderStyle Translucent
-	Alpha 0.6
-	States
-	{
-	Spawn:
-		TSMK A 4
-		TSMK B 3
-		TSMK C 4
-		TSMK D 3
-		TSMK E 4
-		TSMK F 3
-		TSMK G 4
-		TSMK H 3
-		TSMK I 4
-		TSMK J 3
-		TSMK K 4
-		TSMK L 3
-		TSMK M 4
-		TSMK N 3
-		TSMK O 4
-		TSMK P 3
-		TSMK Q 4
-		TSMK R 3
-		TSMK S 4
-		TSMK T 3
-		TSMK U 4
-		TSMK V 3
-		TSMK W 4
-		TSMK X 3
-		TSMK Y 4
-		TSMK Z 3
-		Loop
-	}
-}
-
diff --git a/wadsrc/static/actors/hexen/hexenkeys.txt b/wadsrc/static/actors/hexen/hexenkeys.txt
deleted file mode 100644
index b65d59e16..000000000
--- a/wadsrc/static/actors/hexen/hexenkeys.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-
-ACTOR HexenKey : Key
-{
-	Radius 8
-	Height 20
-}
-
-ACTOR KeySteel : HexenKey
-{
-	Inventory.Icon KEYSLOT1
-	Inventory.PickupMessage "$TXT_KEY_STEEL"
-	States
-	{
-	Spawn:
-		KEY1 A -1
-		Stop
-	}
-}
-
-ACTOR KeyCave : HexenKey
-{
-	Inventory.Icon KEYSLOT2
-	Inventory.PickupMessage "$TXT_KEY_CAVE"
-	States
-	{
-	Spawn:
-		KEY2 A -1
-		Stop
-	}
-}
-
-ACTOR KeyAxe : HexenKey
-{
-	Inventory.Icon KEYSLOT3
-	Inventory.PickupMessage "$TXT_KEY_AXE"
-	States
-	{
-	Spawn:
-		KEY3 A -1
-		Stop
-	}
-}
-
-ACTOR KeyFire : HexenKey
-{
-	Inventory.Icon KEYSLOT4
-	Inventory.PickupMessage "$TXT_KEY_FIRE"
-	States
-	{
-	Spawn:
-		KEY4 A -1
-		Stop
-	}
-}
-
-ACTOR KeyEmerald : HexenKey
-{
-	Inventory.Icon KEYSLOT5
-	Inventory.PickupMessage "$TXT_KEY_EMERALD"
-	States
-	{
-	Spawn:
-		KEY5 A -1
-		Stop
-	}
-}
-
-ACTOR KeyDungeon : HexenKey
-{
-	Inventory.Icon KEYSLOT6
-	Inventory.PickupMessage "$TXT_KEY_DUNGEON"
-	States
-	{
-	Spawn:
-		KEY6 A -1
-		Stop
-	}
-}
-
-ACTOR KeySilver : HexenKey
-{
-	Inventory.Icon KEYSLOT7
-	Inventory.PickupMessage "$TXT_KEY_SILVER"
-	States
-	{
-	Spawn:
-		KEY7 A -1
-		Stop
-	}
-}
-
-ACTOR KeyRusted : HexenKey
-{
-	Inventory.Icon KEYSLOT8
-	Inventory.PickupMessage "$TXT_KEY_RUSTED"
-	States
-	{
-	Spawn:
-		KEY8 A -1
-		Stop
-	}
-}
-
-ACTOR KeyHorn : HexenKey
-{
-	Inventory.Icon KEYSLOT9
-	Inventory.PickupMessage "$TXT_KEY_HORN"
-	States
-	{
-	Spawn:
-		KEY9 A -1
-		Stop
-	}
-}
-
-ACTOR KeySwamp : HexenKey
-{
-	Inventory.Icon KEYSLOTA
-	Inventory.PickupMessage "$TXT_KEY_SWAMP"
-	States
-	{
-	Spawn:
-		KEYA A -1
-		Stop
-	}
-}
-
-ACTOR KeyCastle : HexenKey
-{
-	Inventory.Icon KEYSLOTB
-	Inventory.PickupMessage "$TXT_KEY_CASTLE"
-	States
-	{
-	Spawn:
-		KEYB A -1
-		Stop
-	}
-}
-
diff --git a/wadsrc/static/actors/hexen/hexenspecialdecs.txt b/wadsrc/static/actors/hexen/hexenspecialdecs.txt
deleted file mode 100644
index cd5063385..000000000
--- a/wadsrc/static/actors/hexen/hexenspecialdecs.txt
+++ /dev/null
@@ -1,684 +0,0 @@
-
-// Winged Statue (no skull) -------------------------------------------------
-
-ACTOR ZWingedStatueNoSkull : SwitchingDecoration
-{
-	Radius 10
-	Height 62
-	+SOLID
-	States
-	{
-	Spawn:
-		STWN A -1
-		Stop
-	Active:
-		STWN B -1
-		Stop
-	}
-}
-
-
-// Gem pedestal -------------------------------------------------------------
-
-ACTOR ZGemPedestal : SwitchingDecoration
-{
-	Radius 10
-	Height 40
-	+SOLID
-	States
-	{
-	Spawn:
-		GMPD A -1
-		Stop
-	Active:
-		GMPD B -1
-		Stop
-	}
-}
-
-
-// Tree (destructible) ------------------------------------------------------
-
-ACTOR TreeDestructible
-{
-	Health 70
-	Radius 15
-	Height 180
-	DeathHeight 24
-	Mass 0x7fffffff
-	PainSound "TreeExplode"
-	DeathSound "TreeBreak"
-	+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
-	States
-	{
-	Spawn:
-		TRDT A -1
-		Stop
-	Death:
-		TRDT B 5
-		TRDT C 5 A_Scream
-		TRDT DEF 5
-		TRDT G -1
-		Stop
-	Burn:
-		TRDT H 5 Bright A_Pain
-		TRDT IJKL 5 Bright
-		TRDT M 5 Bright A_Explode(10, 128)
-		TRDT N 5 Bright
-		TRDT OP 5
-		TRDT Q -1
-		Stop
-	} 
-}
-
-
-// Pottery1 ------------------------------------------------------------------
-
-ACTOR Pottery1 native
-{
-	Health 15
-	Speed 10
-	Height 32
-	+SOLID +SHOOTABLE +NOBLOOD +DROPOFF
-	+SLIDESONWALLS +PUSHABLE +TELESTOMP +CANPASS
-	+NOICEDEATH
-
-	action native A_PotteryExplode();
-
-	States
-	{
-	Spawn:
-		POT1 A -1
-		Loop
-	Death:
-		POT1 A 0 A_PotteryExplode
-		Stop
-	}
-}
-
-// Pottery2 -----------------------------------------------------------------
-
-ACTOR Pottery2 : Pottery1
-{
-	Height 25
-	States
-	{
-	Spawn:
-		POT2 A -1
-		Stop
-	}
-}
-
-// Pottery3 -----------------------------------------------------------------
-
-ACTOR Pottery3 : Pottery1
-{
-	Height 25
-	States
-	{
-	Spawn:
-		POT3 A -1
-		Stop
-	}
-}
-
-// Pottery Bit --------------------------------------------------------------
-
-ACTOR PotteryBit
-{
-	Radius 5
-	Height 5
-	+MISSILE
-	+NOTELEPORT
-	+NOICEDEATH
-
-	action native A_PotteryChooseBit();
-	action native A_PotteryCheck();
-
-	States
-	{
-	Spawn:
-		PBIT ABCDE -1
-		Stop
-	Death:
-		PBIT F 0 A_PotteryChooseBit
-		Stop
-	Pottery1:
-		PBIT F 140
-		PBIT F 1 A_PotteryCheck
-		Stop
-	Pottery2:
-		PBIT G 140
-		PBIT G 1 A_PotteryCheck
-		Stop
-	Pottery3:
-		PBIT H 140
-		PBIT H 1 A_PotteryCheck
-		Stop
-	Pottery4:
-		PBIT I 140
-		PBIT I 1 A_PotteryCheck
-		Stop
-	Pottery5:
-		PBIT J 140
-		PBIT J 1 A_PotteryCheck
-		Stop
-	}
-}
-
-
-// Blood pool ---------------------------------------------------------------
-
-ACTOR BloodPool
-{
-	States
-	{
-	Spawn:
-		BDPL A -1
-		Stop
-	}
-}
-
-
-// Lynched corpse (no heart) ------------------------------------------------
-
-ACTOR ZCorpseLynchedNoHeart native
-{
-	Radius 10
-	Height 100
-	+SOLID +SPAWNCEILING +NOGRAVITY
-
-	action native A_CorpseBloodDrip();
-
-	States
-	{
-	Spawn:
-		CPS5 A 140 A_CorpseBloodDrip
-		Loop
-	}
-}
-
-
-// CorpseBloodDrip ----------------------------------------------------------
-
-ACTOR CorpseBloodDrip
-{
-	Radius 1
-	Height 4
-	Gravity 0.125
-	+MISSILE
-	+NOICEDEATH
-	DeathSound "Drip"
-	States
-	{
-	Spawn:
-		BDRP A -1
-		Stop
-	Death:
-		BDSH AB 3
-		BDSH CD 2
-		Stop
-	}
-}
-
-
-// Corpse bit ---------------------------------------------------------------
-
-ACTOR CorpseBit
-{
-	Radius 5
-	Height 5
-	+NOBLOCKMAP
-	+TELESTOMP
-	States
-	{
-	Spawn:
-		CPB1 A -1
-		Stop
-		CPB2 A -1
-		Stop
-		CPB3 A -1
-		Stop
-		CPB4 A -1
-		Stop
-	}
-}
-
-
-// Corpse (sitting, splatterable) -------------------------------------------
-
-ACTOR ZCorpseSitting
-{
-	Health 30
-	Radius 15
-	Height 35
-	+SOLID +SHOOTABLE +NOBLOOD
-	+NOICEDEATH
-	DeathSound "FireDemonDeath"
-
-	action native A_CorpseExplode();
-
-	States
-	{
-	Spawn:
-		CPS6 A -1
-		Stop
-	Death:
-		CPS6 A 1 A_CorpseExplode
-		Stop
-	}
-}
-
-
-// Leaf Spawner -------------------------------------------------------------
-
-ACTOR LeafSpawner
-{
-	+NOBLOCKMAP +NOSECTOR
-	+INVISIBLE
-
-	action native A_LeafSpawn();
-
-	States
-	{
-	Spawn:
-		TNT1 A 20 A_LeafSpawn
-		Loop
-	}
-}
-
-
-// Leaf 1 -------------------------------------------------------------------
-
-ACTOR Leaf1
-{
-	Radius 2
-	Height 4
-	Gravity 0.125
-	+NOBLOCKMAP +MISSILE
-	+NOTELEPORT +DONTSPLASH
-	+NOICEDEATH
-
-	action native A_LeafThrust();
-	action native A_LeafCheck();
-
-	States
-	{
-	Spawn:
-		LEF1 ABC 4
-		LEF1 D 4 A_LeafThrust
-		LEF1 EFG 4
-		LEF1 H 4 A_LeafThrust
-		LEF1 I 4
-		LEF1 AB 4
-		LEF1 C 4 A_LeafThrust
-		LEF1 DEF 4
-		LEF1 G 4 A_LeafThrust
-		LEF1 HI 4
-		Stop
-	Death:
-		LEF3 D 10 A_LeafCheck
-		Wait
-	}
-}
-
-
-// Leaf 2 -------------------------------------------------------------------
-
-ACTOR Leaf2 : Leaf1
-{
-	States
-	{
-	Spawn:
-		LEF2 ABC 4
-		LEF2 D 4 A_LeafThrust
-		LEF2 EFG 4
-		LEF2 H 4 A_LeafThrust
-		LEF2 I 4
-		LEF2 AB 4
-		LEF2 C 4 A_LeafThrust
-		LEF2 DEF 4
-		LEF2 G 4 A_LeafThrust
-		LEF2 HI 4
-		Stop
-	}
-}
-
-
-// Twined torch -------------------------------------------------------------
-
-ACTOR ZTwinedTorch : SwitchableDecoration
-{
-	Radius 10
-	Height 64
-	+SOLID
-	States
-	{
-	Active:
-		TWTR A 0 Bright A_PlaySound("Ignite")
-	Spawn:
-		TWTR ABCDEFGH 4 Bright
-		Loop
-	Inactive:
-		TWTR I -1
-		Stop
-	}
-}
-
-ACTOR ZTwinedTorchUnlit : ZTwinedTorch
-{
-	States
-	{
-	Spawn:
-		Goto Super::Inactive
-	}
-}
-
-
-// Wall torch ---------------------------------------------------------------
-
-ACTOR ZWallTorch : SwitchableDecoration
-{
-	+NOBLOCKMAP
-	+NOGRAVITY
-	+FIXMAPTHINGPOS
-	Radius 6.5
-	States
-	{
-	Active:
-		WLTR A 0 Bright A_PlaySound("Ignite")
-	Spawn:
-		WLTR ABCDEFGH 5 Bright
-		Loop
-	Inactive:
-		WLTR I -1
-		Stop
-	}
-}
-
-ACTOR ZWallTorchUnlit : ZWallTorch
-{
-	States
-	{
-	Spawn:
-		Goto Super::Inactive
-	}
-}
-
-
-// Shrub1 -------------------------------------------------------------------
-
-ACTOR ZShrub1
-{
-	Radius 8
-	Height 24
-	Health 20
-	Mass 0x7fffffff
-	+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
-	DeathSound "TreeExplode"
-	States
-	{
-	Spawn:
-		SHB1 A -1
-		Stop
-	Burn:
-		SHB1 B 7 Bright
-		SHB1 C 6 Bright A_Scream
-		SHB1 D 5 Bright
-		Stop
-	}
-}
-
-
-// Shrub2 -------------------------------------------------------------------
-
-ACTOR ZShrub2
-{
-	Radius 16
-	Height 40
-	Health 20
-	Mass 0x7fffffff
-	+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
-	DeathSound "TreeExplode"
-	States
-	{
-	Spawn:
-		SHB2 A -1
-		Stop
-	Burn:
-		SHB2 B 7 Bright
-		SHB2 C 6 Bright A_Scream
-		SHB2 D 5 Bright A_Explode(30, 64)
-		SHB2 E 5 Bright
-		Stop
-	}
-}
-
-
-// Fire Bull ----------------------------------------------------------------
-
-ACTOR ZFireBull : SwitchableDecoration
-{
-	Radius 20
-	Height 80
-	+SOLID
-	States
-	{
-	Active:
-		FBUL I 4 Bright A_PlaySound("Ignite")
-		FBUL J 4 Bright
-	Spawn:
-		FBUL ABCDEFG 4 Bright
-		Loop
-	Inactive:
-		FBUL JI 4 Bright
-		FBUL H -1
-		Stop
-	}
-}
-
-ACTOR ZFireBullUnlit : ZFireBull
-{
-	States
-	{
-	Spawn:
-		Goto Super::Inactive+2
-	}
-}
-
-
-// Suit of armor ------------------------------------------------------------
-
-ACTOR ZSuitOfArmor
-{
-	Health 60
-	Radius 16
-	Height 72
-	Mass 0x7fffffff
-	+SOLID +SHOOTABLE +NOBLOOD
-	+NOICEDEATH
-	DeathSound "SuitofArmorBreak"
-
-	action native A_SoAExplode();
-
-	States
-	{
-	Spawn:
-		ZSUI A -1
-		Stop
-	Death:
-		ZSUI A 1 A_SoAExplode
-		Stop
-	}
-}
-
-
-// Armor chunk --------------------------------------------------------------
-
-ACTOR ZArmorChunk
-{
-	Radius 4
-	Height 8
-	States
-	{
-	Spawn:
-		ZSUI B -1
-		Stop
-		ZSUI C -1
-		Stop
-		ZSUI D -1
-		Stop
-		ZSUI E -1
-		Stop
-		ZSUI F -1
-		Stop
-		ZSUI G -1
-		Stop
-		ZSUI H -1
-		Stop
-		ZSUI I -1
-		Stop
-		ZSUI J -1
-		Stop
-		ZSUI K -1
-		Stop
-	}
-}
-
-
-// Bell ---------------------------------------------------------------------
-
-ACTOR ZBell native
-{
-	Health 5
-	Radius 56
-	Height 120
-	Mass 0x7fffffff
-	+SOLID +SHOOTABLE +NOBLOOD +NOGRAVITY +SPAWNCEILING
-	+NOICEDEATH
-	DeathSound "BellRing"
-
-	action native A_BellReset1();
-	action native A_BellReset2();
-
-	States
-	{
-	Spawn:
-		BBLL F -1
-		Stop
-	Death:
-		BBLL A 4 A_BellReset1
-		BBLL BC 4
-		BBLL D 5 A_Scream
-		BBLL CB 4
-		BBLL A 3
-		BBLL E 4
-		BBLL F 5
-		BBLL G 6 A_Scream
-		BBLL F 5
-		BBLL EA 4
-		BBLL BC 5
-		BBLL D 6 A_Scream
-		BBLL CB 5
-		BBLL A 4
-		BBLL EF 5
-		BBLL G 7 A_Scream
-		BBLL FEA 5
-		BBLL B 6
-		BBLL C 6
-		BBLL D 7 A_Scream
-		BBLL CB 6
-		BBLL A 5
-		BBLL EF 6
-		BBLL G 7 A_Scream
-		BBLL FEABC 6
-		BBLL B 7
-		BBLL A 8
-		BBLL E 12
-		BBLL A 10
-		BBLL B 12
-		BBLL A 12
-		BBLL E 14
-		BBLL A 1 A_BellReset2
-		Goto Spawn
-	}
-}
-
-
-// "Christmas" Tree ---------------------------------------------------------
-
-ACTOR ZXmasTree
-{
-	Radius 11
-	Height 130
-	Health 20
-	Mass 0x7fffffff
-	+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
-	DeathSound "TreeExplode"
-	States
-	{
-	Spawn:
-		XMAS A -1
-		Stop
-	Burn:
-		XMAS B 6 Bright
-		XMAS C 6 Bright A_Scream
-		XMAS D 5 Bright
-		XMAS E 5 Bright A_Explode(30, 64)
-		XMAS F 5 Bright
-		XMAS G 4 Bright
-		XMAS H 5
-		XMAS I 4 A_NoBlocking
-		XMAS J 4
-		XMAS K -1
-		Stop
-	}
-}
-
-// Cauldron -----------------------------------------------------------------
-
-ACTOR ZCauldron : SwitchableDecoration
-{
-	Radius 12
-	Height 26
-	+SOLID
-	States
-	{
-	Active:
-		CDRN B 0 Bright A_PlaySound("Ignite")
-	Spawn:
-		CDRN BCDEFGH 4 Bright
-		Loop
-	Inactive:
-		CDRN A -1
-		Stop
-	}
-}
-
-ACTOR ZCauldronUnlit : ZCauldron
-{
-	States
-	{
-	Spawn:
-		Goto Super::Inactive
-	}
-}
-
-
-// Water Drip ---------------------------------------------------------------
-
-ACTOR HWaterDrip
-{
-	+MISSILE
-	+LOWGRAVITY
-	+NOTELEPORT
-	Mass 1
-	DeathSound "Drip"
-	States
-	{
-	Spawn:
-		HWAT A -1
-		Stop
-	}
-}
-
diff --git a/wadsrc/static/decorate.txt b/wadsrc/static/decorate.txt
index 450cc37a7..146600f34 100644
--- a/wadsrc/static/decorate.txt
+++ b/wadsrc/static/decorate.txt
@@ -1,7 +1,3 @@
-#include "actors/hexen/hexenarmor.txt"
-#include "actors/hexen/hexendecorations.txt"
-#include "actors/hexen/hexenkeys.txt"
-#include "actors/hexen/hexenspecialdecs.txt"
 #include "actors/hexen/mana.txt"
 #include "actors/hexen/puzzleitems.txt"
 #include "actors/hexen/scriptprojectiles.txt"
diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt
index 787cb661f..50ecf6212 100644
--- a/wadsrc/static/zscript.txt
+++ b/wadsrc/static/zscript.txt
@@ -93,11 +93,11 @@ zscript/hexen/mageplayer.txt
 zscript/hexen/pig.txt
 zscript/hexen/flame.txt
 zscript/hexen/flies.txt
-/*
 zscript/hexen/hexenarmor.txt
 zscript/hexen/hexendecorations.txt
 zscript/hexen/hexenkeys.txt
 zscript/hexen/hexenspecialdecs.txt
+/*
 zscript/hexen/mana.txt
 zscript/hexen/puzzleitems.txt
 zscript/hexen/scriptprojectiles.txt
diff --git a/wadsrc/static/zscript/hexen/hexenarmor.txt b/wadsrc/static/zscript/hexen/hexenarmor.txt
new file mode 100644
index 000000000..13b674fbf
--- /dev/null
+++ b/wadsrc/static/zscript/hexen/hexenarmor.txt
@@ -0,0 +1,77 @@
+
+// Mesh Armor (1) -----------------------------------------------------------
+
+class MeshArmor : HexenArmor
+{
+	Default
+	{
+		+NOGRAVITY
+		Health 0;	// Armor class
+		Inventory.Amount 0;
+		Inventory.PickupMessage "$TXT_ARMOR1";
+	}
+	States
+	{
+	Spawn:
+		AR_1 A -1;
+		Stop;
+	}
+}
+	
+// Falcon Shield (2) --------------------------------------------------------
+
+class FalconShield : HexenArmor
+{
+	Default
+	{
+		+NOGRAVITY
+		Health 1;	// Armor class
+		Inventory.Amount 0;
+		Inventory.PickupMessage "$TXT_ARMOR2";
+	}
+	States
+	{
+	Spawn:
+		AR_2 A -1;
+		Stop;
+	}
+}
+
+// Platinum Helm (3) --------------------------------------------------------
+
+class PlatinumHelm : HexenArmor
+{
+	Default
+	{
+		+NOGRAVITY
+		Health 2;	// Armor class
+		Inventory.Amount 0;
+		Inventory.PickupMessage "$TXT_ARMOR3";
+	}
+	States
+	{
+	Spawn:
+		AR_3 A -1;
+		Stop;
+	}
+}
+
+// Amulet of Warding (4) ----------------------------------------------------
+
+class AmuletOfWarding : HexenArmor
+{
+	Default
+	{
+		+NOGRAVITY
+		Health 3;	// Armor class
+		Inventory.Amount 0;
+		Inventory.PickupMessage "$TXT_ARMOR4";
+	}
+	States
+	{
+	Spawn:
+		AR_4 A -1;
+		Stop;
+	}
+}
+
diff --git a/wadsrc/static/zscript/hexen/hexendecorations.txt b/wadsrc/static/zscript/hexen/hexendecorations.txt
new file mode 100644
index 000000000..937034bd8
--- /dev/null
+++ b/wadsrc/static/zscript/hexen/hexendecorations.txt
@@ -0,0 +1,1705 @@
+class ZWingedStatue : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STTW A -1;
+		Stop;
+	}
+}
+	
+class ZRock1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RCK1 A -1;
+		Stop;
+	}
+}
+
+class ZRock2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RCK2 A -1;
+		Stop;
+	}
+}
+
+class ZRock3 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RCK3 A -1;
+		Stop;
+	}
+}
+
+class ZRock4 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RCK4 A -1;
+		Stop;
+	}
+}
+
+class ZChandelier : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 60;
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		CDLR ABC 4;
+		Loop;
+	}
+}
+
+class ZChandelierUnlit : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 60;
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		CDLR D -1;
+		Stop;
+	}
+}
+
+class ZTreeDead : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 96;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ZTRE A -1;
+		Stop;
+	}
+}
+
+class ZTree : Actor
+{
+	Default
+	{
+		Radius 15;
+		Height 128;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ZTRE A -1;
+		Stop;
+	}
+}
+
+class ZTreeSwamp150 : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 150;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TRES A -1;
+		Stop;
+	}
+}
+
+class ZTreeSwamp120 : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 120;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TRE3 A -1;
+		Stop;
+	}
+}
+
+class ZStumpBurned : Actor
+{
+	Default
+	{
+		Radius 12;
+		Height 20;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STM1 A -1;
+		Stop;
+	}
+}
+
+class ZStumpBare : Actor
+{
+	Default
+	{
+		Radius 12;
+		Height 20;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STM2 A -1;
+		Stop;
+	}
+}
+
+class ZStumpSwamp1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		STM3 A -1;
+		Stop;
+	}
+}
+
+class ZStumpSwamp2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		STM4 A -1;
+		Stop;
+	}
+}
+
+class ZShroomLarge1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH1 A -1;
+		Stop;
+	}
+}
+
+class ZShroomLarge2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH2 A -1;
+		Stop;
+	}
+}
+
+class ZShroomLarge3 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH3 A -1;
+		Stop;
+	}
+}
+
+class ZShroomSmall1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH4 A -1;
+		Stop;
+	}
+}
+
+class ZShroomSmall2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH5 A -1;
+		Stop;
+	}
+}
+
+class ZShroomSmall3 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH6 A -1;
+		Stop;
+	}
+}
+
+class ZShroomSmall4 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH7 A -1;
+		Stop;
+	}
+}
+
+class ZShroomSmall5 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		MSH8 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmitePillar : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 138;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		SGMP A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteLarge : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 48;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		SGM1 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteMedium : Actor
+{
+	Default
+	{
+		Radius 6;
+		Height 40;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		SGM2 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteSmall : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 36;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		SGM3 A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteLarge : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 66;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		SLC1 A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteMedium : Actor
+{
+	Default
+	{
+		Radius 6;
+		Height 50;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		SLC2 A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteSmall : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 40;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		SLC3 A -1;
+		Stop;
+	}
+}
+
+class ZMossCeiling1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 20;
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		MSS1 A -1;
+		Stop;
+	}
+}
+
+class ZMossCeiling2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 24;
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		MSS2 A -1;
+		Stop;
+	}
+}
+
+class ZSwampVine : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 52;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		SWMV A -1;
+		Stop;
+	}
+}
+
+class ZCorpseKabob : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 92;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		CPS1 A -1;
+		Stop;
+	}
+}
+
+class ZCorpseSleeping : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		CPS2 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneRIP : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 46;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS1 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneShane : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 46;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS2 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneBigCross : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 46;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS3 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneBrianR : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 52;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS4 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneCrossCircle : Actor
+{
+	Default
+	{
+		Radius 10;
+		Height 52;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS5 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneSmallCross : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 46;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS6 A -1;
+		Stop;
+	}
+}
+
+class ZTombstoneBrianP : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 46;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TMS7 A -1;
+		Stop;
+	}
+}
+
+class ZCorpseHanging : Actor
+{
+	Default
+	{
+		Radius 6;
+		Height 75;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		CPS3 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleGreenTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STT2 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleBlueTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STT3 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleGreenShort : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STT4 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleBlueShort : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STT5 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleStripeTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR1 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleDarkRedTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR2 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleRedTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR3 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleTanTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR4 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleRustTall : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 108;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR5 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleDarkRedShort : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR6 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleRedShort : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR7 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleTanShort : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR8 A -1;
+		Stop;
+	}
+}
+
+class ZStatueGargoyleRustShort : Actor
+{
+	Default
+	{
+		Radius 14;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GAR9 A -1;
+		Stop;
+	}
+}
+
+class ZBannerTattered : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 120;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		BNR1 A -1;
+		Stop;
+	}
+}
+
+class ZTreeLarge1 : Actor
+{
+	Default
+	{
+		Radius 15;
+		Height 180;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TRE4 A -1;
+		Stop;
+	}
+}
+
+class ZTreeLarge2 : Actor
+{
+	Default
+	{
+		Radius 15;
+		Height 180;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TRE5 A -1;
+		Stop;
+	}
+}
+
+class ZTreeGnarled1 : Actor
+{
+	Default
+	{
+		Radius 22;
+		Height 100;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TRE6 A -1;
+		Stop;
+	}
+}
+
+class ZTreeGnarled2 : Actor
+{
+	Default
+	{
+		Radius 22;
+		Height 100;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		TRE7 A -1;
+		Stop;
+	}
+}
+
+class ZLog : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 25;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		LOGG A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteIceLarge : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 66;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		ICT1 A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteIceMedium : Actor
+{
+	Default
+	{
+		Radius 5;
+		Height 50;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		ICT2 A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteIceSmall : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		ICT3 A -1;
+		Stop;
+	}
+}
+
+class ZStalactiteIceTiny : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 8;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		ICT4 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteIceLarge : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 66;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ICM1 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteIceMedium : Actor
+{
+	Default
+	{
+		Radius 5;
+		Height 50;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ICM2 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteIceSmall : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ICM3 A -1;
+		Stop;
+	}
+}
+
+class ZStalagmiteIceTiny : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 8;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ICM4 A -1;
+		Stop;
+	}
+}
+
+class ZRockBrown1 : Actor
+{
+	Default
+	{
+		Radius 17;
+		Height 72;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		RKBL A -1;
+		Stop;
+	}
+}
+
+class ZRockBrown2 : Actor
+{
+	Default
+	{
+		Radius 15;
+		Height 50;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		RKBS A -1;
+		Stop;
+	}
+}
+
+class ZRockBlack : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 40;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		RKBK A -1;
+		Stop;
+	}
+}
+
+class ZRubble1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RBL1 A -1;
+		Stop;
+	}
+}
+
+class ZRubble2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RBL2 A -1;
+		Stop;
+	}
+}
+
+class ZRubble3 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+	}
+	States
+	{
+	Spawn:
+		RBL3 A -1;
+		Stop;
+	}
+}
+
+class ZVasePillar : Actor
+{
+	Default
+	{
+		Radius 12;
+		Height 54;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		VASE A -1;
+		Stop;
+	}
+}
+
+class ZCorpseLynched : Actor
+{
+	Default
+	{
+		Radius 11;
+		Height 95;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		CPS4 A -1;
+		Stop;
+	}
+}
+
+class ZCandle : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CNDL ABC 4 Bright;
+		Loop;
+	}
+}
+
+class ZBarrel : Actor
+{
+	Default
+	{
+		Radius 15;
+		Height 32;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		ZBAR A -1;
+		Stop;
+	}
+}
+
+class ZBucket : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 72;
+		+SOLID
+		+SPAWNCEILING
+		+NOGRAVITY
+	}
+	States
+	{
+	Spawn:
+		BCKT A -1;
+		Stop;
+	}
+}
+
+class FireThing : Actor
+{
+	Default
+	{
+		Radius 5;
+		Height 10;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		FSKL A 4 Bright;
+		FSKL B 3 Bright;
+		FSKL C 4 Bright;
+		FSKL D 3 Bright;
+		FSKL E 4 Bright;
+		FSKL F 3 Bright;
+		FSKL G 4 Bright;
+		FSKL H 3 Bright;
+		FSKL I 4 Bright;
+		Loop;
+	}
+}
+
+class BrassTorch : Actor
+{
+	Default
+	{
+		Radius 6;
+		Height 35;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		BRTR ABCDEFGHIJKLM 4 Bright;
+		Loop;
+	}
+}
+
+class ZBlueCandle : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		BCAN ABCDE 5 Bright;
+		Loop;
+	}
+}
+
+class ZIronMaiden : Actor
+{
+	Default
+	{
+		Radius 12;
+		Height 60;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		IRON A -1;
+		Stop;
+	}
+}
+
+class ZChainBit32 : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS A -1;
+		Stop;
+	}
+}
+
+class ZChainBit64 : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 64;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS B -1;
+		Stop;
+	}
+}
+
+class ZChainEndHeart : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS C -1;
+		Stop;
+	}
+}
+
+class ZChainEndHook1 : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS D -1;
+		Stop;
+	}
+}
+
+class ZChainEndHook2 : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS E -1;
+		Stop;
+	}
+}
+
+class ZChainEndSpike : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS F -1;
+		Stop;
+	}
+}
+
+class ZChainEndSkull : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 32;
+		+SPAWNCEILING
+		+NOGRAVITY
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		CHNS G -1;
+		Stop;
+	}
+}
+
+class TableShit1 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST1 A -1;
+		Stop;
+	}
+}
+
+class TableShit2 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST2 A -1;
+		Stop;
+	}
+}
+
+class TableShit3 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST3 A -1;
+		Stop;
+	}
+}
+
+class TableShit4 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST4 A -1;
+		Stop;
+	}
+}
+
+class TableShit5 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST5 A -1;
+		Stop;
+	}
+}
+
+class TableShit6 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST6 A -1;
+		Stop;
+	}
+}
+
+class TableShit7 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST7 A -1;
+		Stop;
+	}
+}
+
+class TableShit8 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST8 A -1;
+		Stop;
+	}
+}
+
+class TableShit9 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST9 A -1;
+		Stop;
+	}
+}
+
+class TableShit10 : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOBLOCKMAP
+	}
+	States
+	{
+	Spawn:
+		TST0 A -1;
+		Stop;
+	}
+}
+
+class TeleSmoke : Actor
+{
+	Default
+	{
+		Radius 20;
+		Height 16;
+		+NOGRAVITY
+		+NOBLOCKMAP
+		RenderStyle "Translucent";
+		Alpha 0.6;
+	}
+	States
+	{
+	Spawn:
+		TSMK A 4;
+		TSMK B 3;
+		TSMK C 4;
+		TSMK D 3;
+		TSMK E 4;
+		TSMK F 3;
+		TSMK G 4;
+		TSMK H 3;
+		TSMK I 4;
+		TSMK J 3;
+		TSMK K 4;
+		TSMK L 3;
+		TSMK M 4;
+		TSMK N 3;
+		TSMK O 4;
+		TSMK P 3;
+		TSMK Q 4;
+		TSMK R 3;
+		TSMK S 4;
+		TSMK T 3;
+		TSMK U 4;
+		TSMK V 3;
+		TSMK W 4;
+		TSMK X 3;
+		TSMK Y 4;
+		TSMK Z 3;
+		Loop;
+	}
+}
+
diff --git a/wadsrc/static/zscript/hexen/hexenkeys.txt b/wadsrc/static/zscript/hexen/hexenkeys.txt
new file mode 100644
index 000000000..9bf9f426c
--- /dev/null
+++ b/wadsrc/static/zscript/hexen/hexenkeys.txt
@@ -0,0 +1,175 @@
+
+class HexenKey : Key
+{
+	Default
+	{
+		Radius 8;
+		Height 20;
+	}
+}
+
+class KeySteel : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT1";
+		Inventory.PickupMessage "$TXT_KEY_STEEL";
+	}
+	States
+	{
+	Spawn:
+		KEY1 A -1;
+		Stop;
+	}
+}
+
+class KeyCave : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT2";
+		Inventory.PickupMessage "$TXT_KEY_CAVE";
+	}
+	States
+	{
+	Spawn:
+		KEY2 A -1;
+		Stop;
+	}
+}
+
+class KeyAxe : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT3";
+		Inventory.PickupMessage "$TXT_KEY_AXE";
+	}
+	States
+	{
+	Spawn:
+		KEY3 A -1;
+		Stop;
+	}
+}
+
+class KeyFire : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT4";
+		Inventory.PickupMessage "$TXT_KEY_FIRE";
+	}
+	States
+	{
+	Spawn:
+		KEY4 A -1;
+		Stop;
+	}
+}
+
+class KeyEmerald : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT5";
+		Inventory.PickupMessage "$TXT_KEY_EMERALD";
+	}
+	States
+	{
+	Spawn:
+		KEY5 A -1;
+		Stop;
+	}
+}
+
+class KeyDungeon : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT6";
+		Inventory.PickupMessage "$TXT_KEY_DUNGEON";
+	}
+	States
+	{
+	Spawn:
+		KEY6 A -1;
+		Stop;
+	}
+}
+
+class KeySilver : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT7";
+		Inventory.PickupMessage "$TXT_KEY_SILVER";
+	}
+	States
+	{
+	Spawn:
+		KEY7 A -1;
+		Stop;
+	}
+}
+
+class KeyRusted : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT8";
+		Inventory.PickupMessage "$TXT_KEY_RUSTED";
+	}
+	States
+	{
+	Spawn:
+		KEY8 A -1;
+		Stop;
+	}
+}
+
+class KeyHorn : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOT9";
+		Inventory.PickupMessage "$TXT_KEY_HORN";
+	}
+	States
+	{
+	Spawn:
+		KEY9 A -1;
+		Stop;
+	}
+}
+
+class KeySwamp : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOTA";
+		Inventory.PickupMessage "$TXT_KEY_SWAMP";
+	}
+	States
+	{
+	Spawn:
+		KEYA A -1;
+		Stop;
+	}
+}
+
+class KeyCastle : HexenKey
+{
+	Default
+	{
+		Inventory.Icon "KEYSLOTB";
+		Inventory.PickupMessage "$TXT_KEY_CASTLE";
+	}
+	States
+	{
+	Spawn:
+		KEYB A -1;
+		Stop;
+	}
+}
+
diff --git a/wadsrc/static/zscript/hexen/hexenspecialdecs.txt b/wadsrc/static/zscript/hexen/hexenspecialdecs.txt
new file mode 100644
index 000000000..97c6ea41e
--- /dev/null
+++ b/wadsrc/static/zscript/hexen/hexenspecialdecs.txt
@@ -0,0 +1,756 @@
+
+// Winged Statue (no skull) -------------------------------------------------
+
+class ZWingedStatueNoSkull : SwitchingDecoration
+{
+	Default
+	{
+		Radius 10;
+		Height 62;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		STWN A -1;
+		Stop;
+	Active:
+		STWN B -1;
+		Stop;
+	}
+}
+
+
+// Gem pedestal -------------------------------------------------------------
+
+class ZGemPedestal : SwitchingDecoration
+{
+	Default
+	{
+		Radius 10;
+		Height 40;
+		+SOLID
+	}
+	States
+	{
+	Spawn:
+		GMPD A -1;
+		Stop;
+	Active:
+		GMPD B -1;
+		Stop;
+	}
+}
+
+
+// Tree (destructible) ------------------------------------------------------
+
+class TreeDestructible : Actor
+{
+	Default
+	{
+		Health 70;
+		Radius 15;
+		Height 180;
+		DeathHeight 24;
+		Mass 0x7fffffff;
+		PainSound "TreeExplode";
+		DeathSound "TreeBreak";
+		+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
+	}
+	States
+	{
+	Spawn:
+		TRDT A -1;
+		Stop;
+	Death:
+		TRDT B 5;
+		TRDT C 5 A_Scream;
+		TRDT DEF 5;
+		TRDT G -1;
+		Stop;
+	Burn:
+		TRDT H 5 Bright A_Pain;
+		TRDT IJKL 5 Bright;
+		TRDT M 5 Bright A_Explode(10, 128);
+		TRDT N 5 Bright;
+		TRDT OP 5;
+		TRDT Q -1;
+		Stop;
+	} 
+}
+
+
+// Pottery1 ------------------------------------------------------------------
+
+class Pottery1 : Actor native
+{
+	Default
+	{
+		Health 15;
+		Speed 10;
+		Height 32;
+		+SOLID +SHOOTABLE +NOBLOOD +DROPOFF
+		+SLIDESONWALLS +PUSHABLE +TELESTOMP +CANPASS
+		+NOICEDEATH
+	}
+
+	action native void A_PotteryExplode();
+
+	States
+	{
+	Spawn:
+		POT1 A -1;
+		Loop;
+	Death:
+		POT1 A 0 A_PotteryExplode;
+		Stop;
+	}
+}
+
+// Pottery2 -----------------------------------------------------------------
+
+class Pottery2 : Pottery1
+{
+	Default
+	{
+		Height 25;
+	}
+	States
+	{
+	Spawn:
+		POT2 A -1;
+		Stop;
+	}
+}
+
+// Pottery3 -----------------------------------------------------------------
+
+class Pottery3 : Pottery1
+{
+	Default
+	{
+		Height 25;
+	}
+	States
+	{
+	Spawn:
+		POT3 A -1;
+		Stop;
+	}
+}
+
+// Pottery Bit --------------------------------------------------------------
+
+class PotteryBit : Actor
+{
+	Default
+	{
+		Radius 5;
+		Height 5;
+		+MISSILE
+		+NOTELEPORT
+		+NOICEDEATH
+	}
+
+	action native void A_PotteryChooseBit();
+	action native void A_PotteryCheck();
+
+	States
+	{
+	Spawn:
+		PBIT ABCDE -1;
+		Stop;
+	Death:
+		PBIT F 0 A_PotteryChooseBit;
+		Stop;
+	Pottery1:
+		PBIT F 140;
+		PBIT F 1 A_PotteryCheck;
+		Stop;
+	Pottery2:
+		PBIT G 140;
+		PBIT G 1 A_PotteryCheck;
+		Stop;
+	Pottery3:
+		PBIT H 140;
+		PBIT H 1 A_PotteryCheck;
+		Stop;
+	Pottery4:
+		PBIT I 140;
+		PBIT I 1 A_PotteryCheck;
+		Stop;
+	Pottery5:
+		PBIT J 140;
+		PBIT J 1 A_PotteryCheck;
+		Stop;
+	}
+}
+
+
+// Blood pool ---------------------------------------------------------------
+
+class BloodPool : Actor
+{
+	States
+	{
+	Spawn:
+		BDPL A -1;
+		Stop;
+	}
+}
+
+
+// Lynched corpse (no heart) ------------------------------------------------
+
+class ZCorpseLynchedNoHeart : Actor native
+{
+	Default
+	{
+		Radius 10;
+		Height 100;
+		+SOLID +SPAWNCEILING +NOGRAVITY
+	}
+
+	action native void A_CorpseBloodDrip();
+
+	States
+	{
+	Spawn:
+		CPS5 A 140 A_CorpseBloodDrip;
+		Loop;
+	}
+}
+
+
+// CorpseBloodDrip ----------------------------------------------------------
+
+class CorpseBloodDrip : Actor
+{
+	Default
+	{
+		Radius 1;
+		Height 4;
+		Gravity 0.125;
+		+MISSILE
+		+NOICEDEATH
+		DeathSound "Drip";
+	}
+	States
+	{
+	Spawn:
+		BDRP A -1;
+		Stop;
+	Death:
+		BDSH AB 3;
+		BDSH CD 2;
+		Stop;
+	}
+}
+
+
+// Corpse bit ---------------------------------------------------------------
+
+class CorpseBit : Actor
+{
+	Default
+	{
+		Radius 5;
+		Height 5;
+		+NOBLOCKMAP
+		+TELESTOMP
+	}
+	States
+	{
+	Spawn:
+		CPB1 A -1;
+		Stop;
+		CPB2 A -1;
+		Stop;
+		CPB3 A -1;
+		Stop;
+		CPB4 A -1;
+		Stop;
+	}
+}
+
+
+// Corpse (sitting, splatterable) -------------------------------------------
+
+class ZCorpseSitting : Actor
+{
+	Default
+	{
+		Health 30;
+		Radius 15;
+		Height 35;
+		+SOLID +SHOOTABLE +NOBLOOD
+		+NOICEDEATH
+		DeathSound "FireDemonDeath";
+	}
+
+	action native void A_CorpseExplode();
+
+	States
+	{
+	Spawn:
+		CPS6 A -1;
+		Stop;
+	Death:
+		CPS6 A 1 A_CorpseExplode;
+		Stop;
+	}
+}
+
+
+// Leaf Spawner -------------------------------------------------------------
+
+class LeafSpawner : Actor
+{
+	Default
+	{
+		+NOBLOCKMAP +NOSECTOR
+		+INVISIBLE
+	}
+
+	action native void A_LeafSpawn();
+
+	States
+	{
+	Spawn:
+		TNT1 A 20 A_LeafSpawn;
+		Loop;
+	}
+}
+
+
+// Leaf 1 -------------------------------------------------------------------
+
+class Leaf1 : Actor
+{
+	Default
+	{
+		Radius 2;
+		Height 4;
+		Gravity 0.125;
+		+NOBLOCKMAP +MISSILE
+		+NOTELEPORT +DONTSPLASH
+		+NOICEDEATH
+	}
+
+	action native void A_LeafThrust();
+	action native void A_LeafCheck();
+
+	States
+	{
+	Spawn:
+		LEF1 ABC 4;
+		LEF1 D 4 A_LeafThrust;
+		LEF1 EFG 4;
+		LEF1 H 4 A_LeafThrust;
+		LEF1 I 4;
+		LEF1 AB 4;
+		LEF1 C 4 A_LeafThrust;
+		LEF1 DEF 4;
+		LEF1 G 4 A_LeafThrust;
+		LEF1 HI 4;
+		Stop;
+	Death:
+		LEF3 D 10 A_LeafCheck;
+		Wait;
+	}
+}
+
+
+// Leaf 2 -------------------------------------------------------------------
+
+class Leaf2 : Leaf1
+{
+	States
+	{
+	Spawn:
+		LEF2 ABC 4;
+		LEF2 D 4 A_LeafThrust;
+		LEF2 EFG 4;
+		LEF2 H 4 A_LeafThrust;
+		LEF2 I 4;
+		LEF2 AB 4;
+		LEF2 C 4 A_LeafThrust;
+		LEF2 DEF 4;
+		LEF2 G 4 A_LeafThrust;
+		LEF2 HI 4;
+		Stop;
+	}
+}
+
+
+// Twined torch -------------------------------------------------------------
+
+class ZTwinedTorch : SwitchableDecoration
+{
+	Default
+	{
+		Radius 10;
+		Height 64;
+		+SOLID
+	}
+	States
+	{
+	Active:
+		TWTR A 0 Bright A_PlaySound("Ignite");
+	Spawn:
+		TWTR ABCDEFGH 4 Bright;
+		Loop;
+	Inactive:
+		TWTR I -1;
+		Stop;
+	}
+}
+
+class ZTwinedTorchUnlit : ZTwinedTorch
+{
+	States
+	{
+	Spawn:
+		Goto Super::Inactive;
+	}
+}
+
+
+// Wall torch ---------------------------------------------------------------
+
+class ZWallTorch : SwitchableDecoration
+{
+	Default
+	{
+		+NOBLOCKMAP
+		+NOGRAVITY
+		+FIXMAPTHINGPOS
+		Radius 6.5;
+	}
+	States
+	{
+	Active:
+		WLTR A 0 Bright A_PlaySound("Ignite");
+	Spawn:
+		WLTR ABCDEFGH 5 Bright;
+		Loop;
+	Inactive:
+		WLTR I -1;
+		Stop;
+	}
+}
+
+class ZWallTorchUnlit : ZWallTorch
+{
+	States
+	{
+	Spawn:
+		Goto Super::Inactive;
+	}
+}
+
+
+// Shrub1 -------------------------------------------------------------------
+
+class ZShrub1 : Actor
+{
+	Default
+	{
+		Radius 8;
+		Height 24;
+		Health 20;
+		Mass 0x7fffffff;
+		+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
+		DeathSound "TreeExplode";
+	}
+	States
+	{
+	Spawn:
+		SHB1 A -1;
+		Stop;
+	Burn:
+		SHB1 B 7 Bright;
+		SHB1 C 6 Bright A_Scream;
+		SHB1 D 5 Bright;
+		Stop;
+	}
+}
+
+
+// Shrub2 -------------------------------------------------------------------
+
+class ZShrub2 : Actor
+{
+	Default
+	{
+		Radius 16;
+		Height 40;
+		Health 20;
+		Mass 0x7fffffff;
+		+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
+		DeathSound "TreeExplode";
+	}
+	States
+	{
+	Spawn:
+		SHB2 A -1;
+		Stop;
+	Burn:
+		SHB2 B 7 Bright;
+		SHB2 C 6 Bright A_Scream;
+		SHB2 D 5 Bright A_Explode(30, 64);
+		SHB2 E 5 Bright;
+		Stop;
+	}
+}
+
+
+// Fire Bull ----------------------------------------------------------------
+
+class ZFireBull : SwitchableDecoration
+{
+	Default
+	{
+		Radius 20;
+		Height 80;
+		+SOLID
+	}
+	States
+	{
+	Active:
+		FBUL I 4 Bright A_PlaySound("Ignite");
+		FBUL J 4 Bright;
+	Spawn:
+		FBUL ABCDEFG 4 Bright;
+		Loop;
+	Inactive:
+		FBUL JI 4 Bright;
+		FBUL H -1;
+		Stop;
+	}
+}
+
+class ZFireBullUnlit : ZFireBull
+{
+	States
+	{
+	Spawn:
+		Goto Super::Inactive+2;
+	}
+}
+
+
+// Suit of armor ------------------------------------------------------------
+
+class ZSuitOfArmor : Actor
+{
+	Default
+	{
+		Health 60;
+		Radius 16;
+		Height 72;
+		Mass 0x7fffffff;
+		+SOLID +SHOOTABLE +NOBLOOD
+		+NOICEDEATH
+		DeathSound "SuitofArmorBreak";
+	}
+
+	action native void A_SoAExplode();
+
+	States
+	{
+	Spawn:
+		ZSUI A -1;
+		Stop;
+	Death:
+		ZSUI A 1 A_SoAExplode;
+		Stop;
+	}
+}
+
+
+// Armor chunk --------------------------------------------------------------
+
+class ZArmorChunk : Actor
+{
+	Default
+	{
+		Radius 4;
+		Height 8;
+	}
+	States
+	{
+	Spawn:
+		ZSUI B -1;
+		Stop;
+		ZSUI C -1;
+		Stop;
+		ZSUI D -1;
+		Stop;
+		ZSUI E -1;
+		Stop;
+		ZSUI F -1;
+		Stop;
+		ZSUI G -1;
+		Stop;
+		ZSUI H -1;
+		Stop;
+		ZSUI I -1;
+		Stop;
+		ZSUI J -1;
+		Stop;
+		ZSUI K -1;
+		Stop;
+	}
+}
+
+
+// Bell ---------------------------------------------------------------------
+
+class ZBell : Actor native
+{
+	Default
+	{
+		Health 5;
+		Radius 56;
+		Height 120;
+		Mass 0x7fffffff;
+		+SOLID +SHOOTABLE +NOBLOOD +NOGRAVITY +SPAWNCEILING
+		+NOICEDEATH
+		DeathSound "BellRing";
+	}
+
+	action native void A_BellReset1();
+	action native void A_BellReset2();
+
+	States
+	{
+	Spawn:
+		BBLL F -1;
+		Stop;
+	Death:
+		BBLL A 4 A_BellReset1;
+		BBLL BC 4;
+		BBLL D 5 A_Scream;
+		BBLL CB 4;
+		BBLL A 3;
+		BBLL E 4;
+		BBLL F 5;
+		BBLL G 6 A_Scream;
+		BBLL F 5;
+		BBLL EA 4;
+		BBLL BC 5;
+		BBLL D 6 A_Scream;
+		BBLL CB 5;
+		BBLL A 4;
+		BBLL EF 5;
+		BBLL G 7 A_Scream;
+		BBLL FEA 5;
+		BBLL B 6;
+		BBLL C 6;
+		BBLL D 7 A_Scream;
+		BBLL CB 6;
+		BBLL A 5;
+		BBLL EF 6;
+		BBLL G 7 A_Scream;
+		BBLL FEABC 6;
+		BBLL B 7;
+		BBLL A 8;
+		BBLL E 12;
+		BBLL A 10;
+		BBLL B 12;
+		BBLL A 12;
+		BBLL E 14;
+		BBLL A 1 A_BellReset2;
+		Goto Spawn;
+	}
+}
+
+
+// "Christmas" Tree ---------------------------------------------------------
+
+class ZXmasTree : Actor
+{
+	Default
+	{
+		Radius 11;
+		Height 130;
+		Health 20;
+		Mass 0x7fffffff;
+		+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
+		DeathSound "TreeExplode";
+	}
+	States
+	{
+	Spawn:
+		XMAS A -1;
+		Stop;
+	Burn:
+		XMAS B 6 Bright;
+		XMAS C 6 Bright A_Scream;
+		XMAS D 5 Bright;
+		XMAS E 5 Bright A_Explode(30, 64);
+		XMAS F 5 Bright;
+		XMAS G 4 Bright;
+		XMAS H 5;
+		XMAS I 4 A_NoBlocking;
+		XMAS J 4;
+		XMAS K -1;
+		Stop;
+	}
+}
+
+// Cauldron -----------------------------------------------------------------
+
+class ZCauldron : SwitchableDecoration
+{
+	Default
+	{
+		Radius 12;
+		Height 26;
+		+SOLID
+	}
+	States
+	{
+	Active:
+		CDRN B 0 Bright A_PlaySound("Ignite");
+	Spawn:
+		CDRN BCDEFGH 4 Bright;
+		Loop;
+	Inactive:
+		CDRN A -1;
+		Stop;
+	}
+}
+
+class ZCauldronUnlit : ZCauldron
+{
+	States
+	{
+	Spawn:
+		Goto Super::Inactive;
+	}
+}
+
+
+// Water Drip ---------------------------------------------------------------
+
+class HWaterDrip : Actor
+{
+	Default
+	{
+		+MISSILE
+		+NOTELEPORT
+		Gravity 0.125;
+		Mass 1;
+		DeathSound "Drip";
+	}
+	States
+	{
+	Spawn:
+		HWAT A -1;
+		Stop;
+	}
+}
+