Merge pull request #1288 from Fox-McCloud/singularity-OOP

Singularity and Narsie Refactor

code/modules/admin/verbs/debug.dm

@@ -1109,7 +1109,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	spawn(30)
 		for(var/obj/machinery/the_singularitygen/G in world)
 			if(G.anchored)
-				var/obj/machinery/singularity/S = new /obj/machinery/singularity(get_turf(G), 50)
+				var/obj/singularity/S = new /obj/singularity(get_turf(G), 50)
 				spawn(0)
 					del(G)
 				S.energy = 1750

code/modules/admin/verbs/possess.dm

@@ -2,7 +2,7 @@
 	set name = "Possess Obj"
 	set category = null
 
-	if(istype(O,/obj/machinery/singularity))
+	if(istype(O,/obj/singularity))
 		if(config.forbid_singulo_possession)
 			usr << "It is forbidden to possess singularities."
 			return