From 62a6a02db98a52d350acbe7fabdf457d4e2ecc55 Mon Sep 17 00:00:00 2001
From: Cheridan <d_h2005@yahoo.com>
Date: Thu, 15 Aug 2013 14:35:04 -0500
Subject: [PATCH] Constructs get named-numbers now so you can actually tell
 who's being a gryphon/reading WGW over the radio. Tweaks to Newsie

---
 .../mob/living/simple_animal/constructs.dm        |  7 +++++--
 code/modules/power/singularity/singularity.dm     | 15 +++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 858e2108571..3332f188f6e 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -1,7 +1,7 @@
 
 /mob/living/simple_animal/construct
 	name = "Construct"
-	real_name = "Contruct"
+	real_name = "Construct"
 	desc = ""
 	speak_emote = list("hisses")
 	emote_hear = list("wails","screeches")
@@ -25,6 +25,9 @@
 	minbodytemp = 0
 	faction = "cult"
 
+/mob/living/simple_animal/construct/New()
+	name = text("[initial(name)] ([rand(1, 1000)])")
+	real_name = name
 
 /mob/living/simple_animal/construct/Life()
 	..()
@@ -255,7 +258,7 @@
 	var/energy = 0
 	var/max_energy = 1000
 
-/mob/living/simple_animal/constructbehemoth/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_animal/construct/behemoth/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
 		if(O.force >= 11)
 			var/damage = O.force
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 93fbbdf5b07..343522e0ab1 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -452,7 +452,7 @@ var/global/list/uneatable = list(
 
 
 /obj/machinery/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
-	name = "Nar-Sie"
+	name = "Nar-sie's Avatar"
 	desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
 	icon = 'icons/obj/magic_terror.dmi'
 	pixel_x = -89
@@ -461,8 +461,8 @@ var/global/list/uneatable = list(
 	contained = 0 //Are we going to move around?
 	dissipate = 0 //Do we lose energy over time?
 	move_self = 1 //Do we move on our own?
-	grav_pull = 10 //How many tiles out do we pull?
-	consume_range = 3 //How many tiles out do we eat
+	grav_pull = 5 //How many tiles out do we pull?
+	consume_range = 6 //How many tiles out do we eat
 
 /obj/machinery/singularity/narsie/large
 	name = "Nar-Sie"
@@ -472,6 +472,7 @@ var/global/list/uneatable = list(
 	pixel_y = -256
 	current_size = 12
 	move_self = 1 //Do we move on our own?
+	grav_pull = 10
 	consume_range = 12 //How many tiles out do we eat
 
 /obj/machinery/singularity/narsie/large/New()
@@ -509,11 +510,9 @@ var/global/list/uneatable = list(
 
 
 /obj/machinery/singularity/narsie/mezzer()
-	for(var/mob/living/carbon/human/M in oviewers(8, src))
+	for(var/mob/living/carbon/M in oviewers(8, src))
 		if(M.stat == CONSCIOUS)
-			if(iscultist(M))
-				continue
-			else
+			if(!iscultist(M))
 				M << "\red You feel your sanity crumble away in an instant as you gaze upon [src.name]..."
 				M.apply_effect(3, STUN)
 
@@ -524,7 +523,7 @@ var/global/list/uneatable = list(
 
 	if(istype(A,/mob/living/))
 		var/mob/living/C = A
-		if(!iscultist(C))//if someone's not a cultist (includes constructs/cult xenos/whatever)
+		if(!iscultist(C))//TODO: Make Narsie reward her cultists with transformation into a construct.
 			C.dust()
 
 	if(isturf(A))