diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm
index 1c84a3a1d65..0c9ae26e1b6 100644
--- a/code/game/objects/items/singularityhammer.dm
+++ b/code/game/objects/items/singularityhammer.dm
@@ -13,18 +13,18 @@
 	throwforce = 15
 	throw_range = 1
 	w_class = WEIGHT_CLASS_HUGE
-	var/charged = 5
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	force_string = "LORD SINGULOTH HIMSELF"
+	var/charged = 5
 
-/obj/item/twohanded/singularityhammer/New()
-	..()
+/obj/item/twohanded/singularityhammer/Initialize()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 
 /obj/item/twohanded/singularityhammer/Destroy()
 	STOP_PROCESSING(SSobj, src)
-	return ..()
+	. = ..()
 
 /obj/item/twohanded/singularityhammer/process()
 	if(charged < 5)
@@ -41,7 +41,7 @@
 			var/atom/movable/A = X
 			if(A == wielder)
 				continue
-			if(A && !A.anchored && !ishuman(X))
+			if(A && !A.anchored && !ishuman(X) && !isobserver(X))
 				step_towards(A,pull)
 				step_towards(A,pull)
 				step_towards(A,pull)