Singularity Refactor

code/game/objects/items/devices/camera_bug.dm

@@ -170,7 +170,7 @@
 	if(current && current.can_use())
 		var/list/seen = current.can_see()
 		var/list/names = list()
-		for(var/obj/machinery/singularity/S in seen) // god help you if you see more than one
+		for(var/obj/singularity/S in seen) // god help you if you see more than one
 			if(S.name in names)
 				names[S.name]++
 				dat += "[S.name] ([names[S.name]])"

code/game/objects/items/weapons/chrono_eraser.dm

@@ -246,6 +246,9 @@
 /obj/effect/chrono_field/Move()
 	return
 
+/obj/effect/chrono_field/singularity_act()
+	return
+
 /obj/effect/chrono_field/ex_act()
 	return
 

code/game/objects/items/weapons/grenades.dm

@@ -349,7 +349,7 @@
 /obj/item/weapon/grenade/clusterbuster/apocalypse
 	name = "Apocalypse Bomb"
 	desc = "No matter what, do not EVER use this."
-	payload = /obj/machinery/singularity
+	payload = /obj/singularity
 
 /obj/item/weapon/grenade/clusterbuster/ultima
 	name = "Earth Shattering Kaboom"
@@ -456,6 +456,6 @@
 		var/atom/A = new payload(loc)
 		if(istype(A,/obj/item/weapon/grenade))
 			A:prime()
-		if(istype(A,/obj/machinery/singularity)) // I can't emphasize enough how much you should never use this grenade
+		if(istype(A,/obj/singularity)) // I can't emphasize enough how much you should never use this grenade
 			A:energy = 200
 		del src

code/game/objects/items/weapons/storage/backpack.dm

@@ -41,7 +41,7 @@
 			investigate_log("has become a singularity. Caused by [user.key]","singulo")
 			user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!"
 			del(W)
-			var/obj/machinery/singularity/singulo = new /obj/machinery/singularity (get_turf(src))
+			var/obj/singularity/singulo = new /obj/singularity (get_turf(src))
 			singulo.energy = 300 //should make it a bit bigger~
 			message_admins("[key_name_admin(user)] detonated a bag of holding")
 			log_game("[key_name(user)] detonated a bag of holding")
@@ -61,6 +61,11 @@
 			crit_fail = 1
 			icon_state = "brokenpack"
 
+	singularity_act(current_size)
+		var/dist = max((current_size - 2),1)
+		explosion(src.loc,(dist),(dist*2),(dist*4))
+		return
+
 
 /obj/item/weapon/storage/backpack/santabag
 	name = "Santa's Gift Bag"
@@ -300,7 +305,7 @@
 	desc = "A duffelbag designed to hold bananas and bike horns."
 	icon_state = "duffel-clown"
 	item_state = "duffel-clown"
-	
+
 //ERT backpacks.
 /obj/item/weapon/storage/backpack/ert
 	name = "emergency response team backpack"
@@ -330,7 +335,7 @@
 	name = "emergency response team medical backpack"
 	desc = "A spacious backpack with lots of pockets, worn by medical members of a Nanotrasen Emergency Response Team."
 	icon_state = "ert_medical"
-	
+
 //Janitorial
 /obj/item/weapon/storage/backpack/ert/janitor
 	name = "emergency response team janitor backpack"