From a9480dabb4777dca91e638fff9b394caec7a80b8 Mon Sep 17 00:00:00 2001
From: tkdrg <tkdrg@users.noreply.github.com>
Date: Wed, 5 Nov 2014 20:28:56 -0300
Subject: [PATCH] Fix for infinite loop

---
 code/modules/power/singularity/containment_field.dm | 3 +++
 code/modules/power/singularity/field_generator.dm   | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 8d6300d1854..2e89562a8f9 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -58,6 +58,9 @@
 		return 0
 	..()
 
+/obj/machinery/field/containment/Move()
+	qdel(src)
+
 // Abstract Field Class
 // Used for overriding certain procs
 
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index e3d15860703..34f49fa328b 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -354,4 +354,8 @@ field_generator power level display
 
 /obj/machinery/field/generator/shock(mob/living/user as mob)
 	if(fields.len)
-		..()
\ No newline at end of file
+		..()
+
+/obj/machinery/field/generator/bump(atom/movable/AM as mob|obj)
+	if(fields.len)
+		..()