Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake

refactors narsie

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -163,7 +163,7 @@ var/sc_safecode5 = "[rand(0,9)]"
 	desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
 	move_self = 0 //Contianed narsie does not move!
 	grav_pull = 0 //Contained narsie does not pull stuff in!
-
+	var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
 //Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
 /obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
 	return

code/modules/mob/living/living.dm

@@ -762,6 +762,13 @@
 /mob/living/singularity_pull(S)
 	step_towards(src,S)
 
+/mob/living/narsie_act()
+	if(client)
+		makeNewConstruct(/mob/living/simple_animal/construct/harvester, src, null, 1)
+	spawn_dust()
+	gib()
+	return
+
 /mob/living/proc/do_attack_animation(atom/A)
 	var/pixel_x_diff = 0
 	var/pixel_y_diff = 0

code/modules/mob/living/simple_animal/constructs.dm

@@ -70,7 +70,8 @@
 	Proj.on_hit(src, 0)
 	return 0
 
-
+/mob/living/simple_animal/construct/narsie_act()
+	return
 
 /////////////////Juggernaut///////////////
 

code/modules/power/singularity/narsie.dm

@@ -10,7 +10,6 @@
 	move_self = 1 //Do we move on our own?
 	grav_pull = 5 //How many tiles out do we pull?
 	consume_range = 6 //How many tiles out do we eat
-	var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
 
 /obj/singularity/narsie/large
 	name = "Nar-Sie"
@@ -84,25 +83,7 @@
 
 
 /obj/singularity/narsie/consume(var/atom/A)
-	if(is_type_in_list(A, uneatable))
-		return 0
-
-	if(istype(A,/mob/living/))
-		var/mob/living/C = A
-		if(C.client)
-			makeNewConstruct(/mob/living/simple_animal/construct/harvester, C, null, 1)
-		C.spawn_dust()
-		C.gib()
-		return
-
-	if(isturf(A))
-		var/turf/T = A
-		if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/engine/cult))
-			if(prob(20)) T.ChangeTurf(/turf/simulated/floor/engine/cult)
-
-		else if(istype(T,/turf/simulated/wall) && !istype(T, /turf/simulated/wall/cult))
-			if(prob(20)) T.ChangeTurf(/turf/simulated/wall/cult)
-	return
+	A.narsie_act()
 
 
 /obj/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO