diff --git a/makefile.gaz b/makefile.gaz
index a38eb5f4a..a1154dde6 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -308,6 +308,9 @@ triggers_src :=		trigger \
 					tgarygo \
 					tfemit \
 					tbemit \
+					tabemit \
+					tobemit \
+					tlbemit \
 					tifemit \
 					tggleft \
 					tggright \
diff --git a/source/enemy/ndogfish.cpp b/source/enemy/ndogfish.cpp
index 9b9e04157..d6c303148 100644
--- a/source/enemy/ndogfish.cpp
+++ b/source/enemy/ndogfish.cpp
@@ -213,7 +213,7 @@ void CNpcIronDogfishEnemy::processStandardIronDogfishAttack( int _frames )
 		{
 			// fire at user
 
-			s16 headingToPlayer = ratan2( playerYDist, playerXDist );
+			s16 headingToPlayer = ratan2( playerYDist, playerXDist ) & 4095;
 
 			CProjectile *projectile;
 			projectile = new( "test projectile" ) CProjectile;
diff --git a/source/fx/fx.cpp b/source/fx/fx.cpp
index 2cb3bfcc0..df9a6b496 100644
--- a/source/fx/fx.cpp
+++ b/source/fx/fx.cpp
@@ -149,7 +149,7 @@ CFXBaseAnim::sFXAnim	FXBubbleAcidData=
 		ONE/2,
 		FRM__BUBBLE_2,FRM__BUBBLE_2,
 		1,
-		127,127,255,
+		0,255,0,
 		CFXBaseAnim::FXANIM_FLAG_LOOP | CFXBaseAnim::FXANIM_FLAG_COLLIDE_KILL,
 		{0,-1},
 		CFX::FX_TYPE_SPLASH_WATER
@@ -159,7 +159,7 @@ CFXBaseAnim::sFXAnim	FXBubbleLavaData=
 		ONE/2,
 		FRM__BUBBLE_2,FRM__BUBBLE_2,
 		1,
-		127,127,255,
+		255,0,0,
 		CFXBaseAnim::FXANIM_FLAG_LOOP | CFXBaseAnim::FXANIM_FLAG_COLLIDE_KILL,
 		{0,-1},
 		CFX::FX_TYPE_SPLASH_WATER
@@ -169,7 +169,7 @@ CFXBaseAnim::sFXAnim	FXBubbleOilData=
 		ONE/2,
 		FRM__BUBBLE_2,FRM__BUBBLE_2,
 		1,
-		127,127,255,
+		32,32,32,
 		CFXBaseAnim::FXANIM_FLAG_LOOP | CFXBaseAnim::FXANIM_FLAG_COLLIDE_KILL,
 		{0,-1},
 		CFX::FX_TYPE_SPLASH_WATER
diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp
index 8e349ac9a..ec8486bbb 100644
--- a/source/triggers/trigger.cpp
+++ b/source/triggers/trigger.cpp
@@ -107,6 +107,18 @@
 #include "triggers\tldripemit.h"
 #endif
 
+#ifndef __TRIGGERS_TABEMIT_H__
+#include "triggers\tabemit.h"
+#endif
+
+#ifndef __TRIGGERS_TOBEMIT_H__
+#include "triggers\tobemit.h"
+#endif
+
+#ifndef __TRIGGERS_TLBEMIT_H__
+#include "triggers\tlbemit.h"
+#endif
+
 #ifndef __GAME_GAME_H__
 #include "game\game.h"
 #endif
@@ -190,6 +202,21 @@ CTrigger	*trigger;
 			trigger=(CBubbleEmitterTrigger*)new( "BubbleEmitterTrigger") CBubbleEmitterTrigger();
 			break;
 
+		// Acid bubble emitter
+		case TRIGGER_ACID_BUBBLE_EMITTER:
+			trigger=(CAcidBubbleEmitterTrigger*)new( "AcidBubbleEmitterTrigger") CAcidBubbleEmitterTrigger();
+			break;
+
+		// Oil bubble emitter
+		case TRIGGER_OIL_BUBBLE_EMITTER:
+			trigger=(COilBubbleEmitterTrigger*)new( "OilBubbleEmitterTrigger") COilBubbleEmitterTrigger();
+			break;
+
+		// Lava bubble emitter
+		case TRIGGER_LAVA_BUBBLE_EMITTER:
+			trigger=(CLavaBubbleEmitterTrigger*)new( "LavaBubbleEmitterTrigger") CLavaBubbleEmitterTrigger();
+			break;
+
 		// Bubble geyser emitter
 		case TRIGGER_BUBBLE_GEYSER_EMITTER:
 			trigger=(CBubbleGeyserEmitterTrigger*)new( "BubbleGeyserEmitterTrigger") CBubbleGeyserEmitterTrigger();
diff --git a/source/triggers/trigger.h b/source/triggers/trigger.h
index c7d8152b8..348652cc9 100644
--- a/source/triggers/trigger.h
+++ b/source/triggers/trigger.h
@@ -45,6 +45,9 @@ enum TRIGGER_TYPE
 	TRIGGER_ACID_DRIP_EMITTER,
 	TRIGGER_OIL_DRIP_EMITTER,
 	TRIGGER_LAVA_DRIP_EMITTER,
+	TRIGGER_ACID_BUBBLE_EMITTER,
+	TRIGGER_OIL_BUBBLE_EMITTER,
+	TRIGGER_LAVA_BUBBLE_EMITTER,
 
 // Code based triggers
 	TRIGGER_PLATFORM,
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index f30b9d516..5ca8252a6 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -150,6 +150,9 @@ WaterDripEmitter=18
 AcidDripEmitter=19
 OilDripEmitter=20
 LavaDripEmitter=21
+AcidBubbleEmitter=22
+OilBubbleEmitter=23
+LavaBubbleEmitter=24
 
 ################################################
 # FX
diff --git a/tools/MapEdit/trigger.ini b/tools/MapEdit/trigger.ini
index 86bc65237..2fdce6be4 100644
--- a/tools/MapEdit/trigger.ini
+++ b/tools/MapEdit/trigger.ini
@@ -31,6 +31,12 @@ HasBox=1
 
 [BubbleEmitter]
 
+[AcidBubbleEmitter]
+
+[OilBubbleEmitter]
+
+[LavaBubbleEmitter]
+
 [SteamEmitter]
 
 [StreamGeyser]
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 4ae582c8e..3326596f0 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -2069,6 +2069,14 @@ SOURCE=..\..\..\source\thing\thing.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\tabemit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\tabemit.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\tadripemit.cpp
 # End Source File
 # Begin Source File
@@ -2173,6 +2181,14 @@ SOURCE=..\..\..\source\triggers\tifemit.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\tlbemit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\tlbemit.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\tldripemit.cpp
 # End Source File
 # Begin Source File
@@ -2197,6 +2213,14 @@ SOURCE=..\..\..\source\triggers\tlook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\tobemit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\tobemit.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\todripemit.cpp
 # End Source File
 # Begin Source File