diff --git a/src/deh_tables.c b/src/deh_tables.c
index eadb207f2..a3394b50b 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -1586,6 +1586,10 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
 	"S_AMPAURA",
 	"S_AMPBURST",
 
+	// Tripwire VFX on player for bumping it or passing it
+	"S_TRIPWIREOK",
+	"S_TRIPWIRELOCKOUT",
+
 	"S_GOTIT",
 
 	"S_CHARGEAURA",
@@ -3591,6 +3595,9 @@ const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for sanity t
 	"MT_AMPAURA",
 	"MT_AMPBURST",
 
+	"MT_TRIPWIREOK",
+	"MT_TRIPWIRELOCKOUT",
+
 	"MT_GOTIT",
 
 	"MT_CHARGEAURA",
diff --git a/src/info.c b/src/info.c
index fcc7c4591..16dd5bd07 100644
--- a/src/info.c
+++ b/src/info.c
@@ -612,6 +612,9 @@ char sprnames[NUMSPRITES + 1][5] =
 	"AMPD",
 
 	"EXPC",
+	
+	"TWOK",
+	"TW_L",
 
 	"SOR_",
 
@@ -2187,6 +2190,9 @@ state_t states[NUMSTATES] =
 	{SPR_AMPD,                 FF_FULLBRIGHT|FF_ANIMATE|0, -1, {NULL}, 4, 2, S_NULL}, // S_AMPAURA
 	{SPR_AMPB,                 FF_FULLBRIGHT|FF_ADD|FF_PAPERSPRITE|2, -1, {NULL}, 4, 2, S_NULL}, // S_AMPBURST
 
+	{SPR_TWOK,                 FF_FULLBRIGHT|FF_ANIMATE|0, 56, {NULL}, 55, 1, S_NULL}, // S_TRIPWIREOK
+	{SPR_TW_L,                 FF_FULLBRIGHT|FF_ANIMATE|0, 56, {NULL}, 55, 1, S_NULL}, // S_TRIPWIRELOCKOUT
+
 	{SPR_SOR_,                 FF_FULLBRIGHT|FF_ANIMATE|0, 28, {NULL}, 27, 1, S_NULL}, // S_GOTIT
 
 	{SPR_TRC1,                 FF_FULLBRIGHT|FF_ANIMATE|0, -1, {NULL}, 4, 2, S_NULL}, // S_CHARGEAURA
@@ -13967,6 +13973,60 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
+	{           // MT_TRIPWIREOK
+		-1,             // doomednum
+		S_TRIPWIREOK,   // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		67*FRACUNIT,    // radius
+		67*FRACUNIT,    // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
+		S_NULL          // raisestate
+	},
+
+{           // MT_TRIPWIRELOCKOUT
+		-1,             // doomednum
+		S_TRIPWIRELOCKOUT,// spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		67*FRACUNIT,    // radius
+		67*FRACUNIT,    // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
+		S_NULL          // raisestate
+	},
+
 	{           // MT_GOIIT
 		-1,             // doomednum
 		S_GOTIT,    // spawnstate
diff --git a/src/info.h b/src/info.h
index dd99ca9c4..288c1d329 100644
--- a/src/info.h
+++ b/src/info.h
@@ -1153,6 +1153,9 @@ typedef enum sprite
 	SPR_AMPD,
 
 	SPR_EXPC,
+	
+	SPR_TWOK, // Tripwire OK
+	SPR_TW_L, // Tripwire Lockout
 
 	SPR_SOR_,
 
@@ -2653,6 +2656,9 @@ typedef enum state
 	S_AMPAURA,
 	S_AMPBURST,
 
+	S_TRIPWIREOK,
+	S_TRIPWIRELOCKOUT,
+
 	S_GOTIT,
 
 	S_CHARGEAURA,
@@ -4685,6 +4691,9 @@ typedef enum mobj_type
 	MT_AMPAURA,
 	MT_AMPBURST,
 
+	MT_TRIPWIREOK,
+	MT_TRIPWIRELOCKOUT,
+
 	MT_GOTIT,
 
 	MT_CHARGEAURA,