Revert "12/21 modernizations from TG live"

code/modules/power/singularity/singularity.dm

@@ -1,4 +1,4 @@
-
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
 
 /obj/singularity
 	name = "gravitational singularity"
@@ -9,7 +9,7 @@
 	density = 1
 	layer = MASSIVE_OBJ_LAYER
 	luminosity = 6
-	appearance_flags = 0
+	unacidable = 1 //Don't comment this out.
 	var/current_size = 1
 	var/allowed_size = 1
 	var/contained = 1 //Are we going to move around?
@@ -26,7 +26,7 @@
 	var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
 	var/last_warning
 	var/consumedSupermatter = 0 //If the singularity has eaten a supermatter shard and can go to stage six
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	burn_state = LAVA_PROOF
 
 /obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
 	//CARN: admin-alert for chuckle-fuckery.
@@ -60,23 +60,10 @@
 	consume(user)
 	return 1
 
-/obj/singularity/attack_paw(mob/user)
-	consume(user)
-
-/obj/singularity/attack_alien(mob/user)
-	consume(user)
-
-/obj/singularity/attack_animal(mob/user)
-	consume(user)
-
-/obj/singularity/attackby(obj/item/weapon/W, mob/user, params)
-	consume(user)
-	return 1
-
 /obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
 	return 0
 
-/obj/singularity/blob_act(obj/structure/blob/B)
+/obj/singularity/blob_act(obj/effect/blob/B)
 	return
 
 /obj/singularity/ex_act(severity, target)
@@ -250,7 +237,7 @@
 
 /obj/singularity/proc/eat()
 	set background = BACKGROUND_ENABLED
-	for(var/tile in spiral_range_turfs(grav_pull, src))
+	for(var/tile in spiral_range_turfs(grav_pull, src, 1))
 		var/turf/T = tile
 		if(!T || !isturf(loc))
 			continue
@@ -259,7 +246,7 @@
 		else
 			consume(T)
 		for(var/thing in T)
-			if(isturf(loc) && thing != src)
+			if(isturf(loc))
 				var/atom/movable/X = thing
 				if(get_dist(X, src) > consume_range)
 					X.singularity_pull(src, current_size)
@@ -404,11 +391,11 @@
 
 /obj/singularity/proc/mezzer()
 	for(var/mob/living/carbon/M in oviewers(8, src))
-		if(istype(M, /mob/living/brain)) //Ignore brains
+		if(istype(M, /mob/living/carbon/brain)) //Ignore brains
 			continue
 
 		if(M.stat == CONSCIOUS)
-			if (ishuman(M))
+			if (istype(M,/mob/living/carbon/human))
 				var/mob/living/carbon/human/H = M
 				if(istype(H.glasses, /obj/item/clothing/glasses/meson))
 					var/obj/item/clothing/glasses/meson/MS = H.glasses
@@ -428,9 +415,11 @@
 
 
 /obj/singularity/proc/pulse()
+
 	for(var/obj/machinery/power/rad_collector/R in rad_collectors)
-		if(R.z == z && get_dist(R, src) <= 15) // Better than using orange() every process
+		if(get_dist(R, src) <= 15) // Better than using orange() every process
 			R.receive_pulse(energy)
+	return
 
 /obj/singularity/singularity_act()
 	var/gain = (energy/2)