From 799eadb6c87ec83268735be6c209727cf266f80a Mon Sep 17 00:00:00 2001
From: Sawu <koa_l@hotmail.com>
Date: Thu, 2 Apr 2015 05:19:21 +1100
Subject: [PATCH] Fixes to SNPCs * Fixes two runtimes (stat menu and taking a
 delegate/assistant) * Fixes SNPCs not being inserted into the NPCPool * Makes
 the NPCPool fire more often for maximum robustness.

---
 code/controllers/subsystem/npcpool.dm | 18 ++++++++++--------
 code/modules/mob/interactive.dm       |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm
index 16326980e2f..4e4c5a8442b 100644
--- a/code/controllers/subsystem/npcpool.dm
+++ b/code/controllers/subsystem/npcpool.dm
@@ -2,7 +2,7 @@ var/datum/subsystem/npcpool/SSbp
 
 /datum/subsystem/npcpool
 	name = "NPCPool"
-	priority = 27
+	priority = 100
 
 	var/list/canBeUsed = list()
 	var/list/canBeUsed_non = list()
@@ -23,7 +23,7 @@ var/datum/subsystem/npcpool/SSbp
 
 
 /datum/subsystem/npcpool/stat_entry()
-	stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) (T:[botPool_l.len + botPool_l_non] | D: [needsDelegate.len] | A: [needsAssistant.len + needsHelp_non.len] | U: [canBeUsed.len + canBeUsed_non.len])")
+	stat(name, "[round(cost,0.001)]ds (CPU:[round(cpu,1)]%) (T:[botPool_l.len + botPool_l_non.len] | D: [needsDelegate.len] | A: [needsAssistant.len + needsHelp_non.len] | U: [canBeUsed.len + canBeUsed_non.len])")
 
 
 /datum/subsystem/npcpool/fire()
@@ -76,9 +76,10 @@ var/datum/subsystem/npcpool/SSbp
 				var/facCount = 0
 				var/helpProb = 0
 				for(var/C in check.faction)
-					if(candidate.faction[facCount] == C)
-						helpProb = min(100,helpProb + 25)
-					facCount++
+					for(var/D in candidate.faction)
+						if(D == C)
+							helpProb = min(100,helpProb + 25)
+						facCount++
 				if(facCount == 1 && helpProb > 0)
 					helpProb = 100
 				if(prob(helpProb))
@@ -94,9 +95,10 @@ var/datum/subsystem/npcpool/SSbp
 				var/facCount = 0
 				var/helpProb = 0
 				for(var/C in check.faction)
-					if(candidate.faction[facCount] == C)
-						helpProb = min(100,helpProb + 10)
-					facCount++
+					for(var/D in candidate.faction)
+						if(D == C)
+							helpProb = min(100,helpProb + 25)
+						facCount++
 				if(facCount == 1 && helpProb > 0)
 					helpProb = 100
 				if(prob(helpProb))
diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm
index cd7dd65d019..00194761fb7 100644
--- a/code/modules/mob/interactive.dm
+++ b/code/modules/mob/interactive.dm
@@ -196,6 +196,8 @@
 	if(TRAITS & TRAIT_THIEVING)
 		slyness = 75
 
+	SSbp.insertBot(src)
+
 
 /mob/living/carbon/human/interactive/attack_hand(mob/living/carbon/human/M as mob)
 	..()