diff --git a/makefile.gaz b/makefile.gaz
index 37308624c..7bb22bded 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -297,6 +297,7 @@ triggers_src :=		trigger \
 					tplatfrm \
 					tgarygo \
 					tfemit \
+					tbemit \
 					tifemit \
 					tggleft \
 					tggright \
diff --git a/source/triggers/tfemit.cpp b/source/triggers/tfemit.cpp
index 1f0727908..67879c138 100644
--- a/source/triggers/tfemit.cpp
+++ b/source/triggers/tfemit.cpp
@@ -2,7 +2,7 @@
 
 	tfemit.h
 
-	Author:		PKG
+	Author:		CRB
 	Created:	
 	Project:	Spongebob
 	Purpose:	
diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp
index eb986481b..6adf52e5a 100644
--- a/source/triggers/trigger.cpp
+++ b/source/triggers/trigger.cpp
@@ -51,6 +51,10 @@
 #include "triggers\tifemit.h"
 #endif
 
+#ifndef __TRIGGERS_TBEMIT_H__
+#include "triggers\tbemit.h"
+#endif
+
 #ifndef __TRIGGERS_TGGLEFT_H__
 #include "triggers\tggleft.h"
 #endif
@@ -110,11 +114,6 @@ CTrigger	*trigger;
 			trigger=(CGaryStartTrigger*)new("GaryStartTrigger") CGaryStartTrigger();
 			break;
 
-		// Flame emitter
-		case TRIGGER_FLAMEEMITTER:
-			trigger=(CFlameEmitterTrigger*)new( "FlameEmitterTrigger") CFlameEmitterTrigger();
-			break;
-
 		// Gary stop trigger
 		case TRIGGER_GARYSTOP:
 			trigger=(CGaryStopTrigger*)new("GaryStopTrigger") CGaryStopTrigger();
@@ -130,10 +129,20 @@ CTrigger	*trigger;
 			trigger=(CGaryGoRightTrigger*)new("GaryGoRightTrigger") CGaryGoRightTrigger();
 			break;
 
+		// Flame emitter
+		case TRIGGER_FLAMEEMITTER:
+			trigger=(CFlameEmitterTrigger*)new( "FlameEmitterTrigger") CFlameEmitterTrigger();
+			break;
+
 		case TRIGGER_INTERMITTENTFLAMEEMITTER:
 			trigger=(CIntermittentFlameEmitterTrigger*)new( "IntermittentFlameEmitterTrigger") CIntermittentFlameEmitterTrigger();
 			break;
 
+		// Bubble emitter
+		case TRIGGER_BUBBLEEMITTER:
+			trigger=(CBubbleEmitterTrigger*)new( "BubbleEmitterTrigger") CBubbleEmitterTrigger();
+			break;
+
 		case TRIGGER_PLATFORM:
 			trigger = (CPlatformTrigger*)new ("PlatformTrigger") CPlatformTrigger();
 			break;
diff --git a/source/triggers/trigger.h b/source/triggers/trigger.h
index cfce8205a..b0b5dbf61 100644
--- a/source/triggers/trigger.h
+++ b/source/triggers/trigger.h
@@ -35,6 +35,7 @@ enum TRIGGER_TYPE
 	TRIGGER_GARYSTOP,
 	TRIGGER_GARYGOLEFT,
 	TRIGGER_GARYGORIGHT,
+	TRIGGER_BUBBLEEMITTER,
 
 // Code based triggers
 	TRIGGER_PLATFORM,
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index ebc534c5c..a78726d70 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -137,6 +137,7 @@ IntermittentFlameEmitter=8
 GaryStop=9
 GaryGoLeft=10
 GaryGoRight=11
+BubbleEmitter=12
 
 ################################################
 # FX
diff --git a/tools/MapEdit/trigger.ini b/tools/MapEdit/trigger.ini
index c433d8fce..9561e6452 100644
--- a/tools/MapEdit/trigger.ini
+++ b/tools/MapEdit/trigger.ini
@@ -25,6 +25,8 @@ HasBox=1
 
 [IntermittentFlameEmitter]
 
+[BubbleEmitter]
+
 [GaryStop]
 
 [GaryGoLeft]
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 4b1661dca..4d33ddfce 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -1909,6 +1909,14 @@ SOURCE=..\..\..\source\thing\thing.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\tbemit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\tbemit.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\tcamlock.cpp
 # End Source File
 # Begin Source File