From b1e4681c23bb119f032bd43c0c8064481b8ee5aa Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Wed, 22 Mar 2017 11:42:48 -0400
Subject: [PATCH] SSnpc -> SSnpcpool

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

diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 0f791349fd0..3321432d15e 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -632,7 +632,7 @@ var/datum/controller/subsystem/garbage/SSgarbage
 	SearchVar(SSmapping)
 	SearchVar(SSminimap)
 	SearchVar(SSmobs)
-	SearchVar(SSnpc)
+	SearchVar(SSnpcpool)
 	SearchVar(SSorbit)
 	SearchVar(SSpai)
 	SearchVar(pai_card_list)
diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm
index c777b683628..3c7c1a169f3 100644
--- a/code/controllers/subsystem/npcpool.dm
+++ b/code/controllers/subsystem/npcpool.dm
@@ -1,4 +1,4 @@
-var/datum/controller/subsystem/npcpool/SSnpc
+var/datum/controller/subsystem/npcpool/SSnpcpool
 
 /datum/controller/subsystem/npcpool
 	name = "NPC Pool"
@@ -19,7 +19,7 @@ var/datum/controller/subsystem/npcpool/SSnpc
 		botPool_l |= toInsert
 
 /datum/controller/subsystem/npcpool/New()
-	NEW_SS_GLOBAL(SSnpc)
+	NEW_SS_GLOBAL(SSnpcpool)
 
 /datum/controller/subsystem/npcpool/stat_entry()
 	..("T:[botPool_l.len + botPool_l_non.len]|D:[needsDelegate.len]|A:[needsAssistant.len + needsHelp_non.len]|U:[canBeUsed.len + canBeUsed_non.len]")
@@ -121,7 +121,7 @@ var/datum/controller/subsystem/npcpool/SSnpc
 			npcCount++
 
 /datum/controller/subsystem/npcpool/Recover()
-	if (istype(SSnpc.botPool_l))
-		botPool_l = SSnpc.botPool_l
-	if (istype(SSnpc.botPool_l_non))
-		botPool_l_non = SSnpc.botPool_l_non
\ No newline at end of file
+	if (istype(SSnpcpool.botPool_l))
+		botPool_l = SSnpcpool.botPool_l
+	if (istype(SSnpcpool.botPool_l_non))
+		botPool_l_non = SSnpcpool.botPool_l_non
\ No newline at end of file
diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm
index 992053926ad..ad76749ec84 100644
--- a/code/modules/mob/interactive.dm
+++ b/code/modules/mob/interactive.dm
@@ -146,7 +146,7 @@
 	..()
 
 
-/client/proc/resetSNPC(var/mob/A in SSnpc.botPool_l)
+/client/proc/resetSNPC(var/mob/A in SSnpcpool.botPool_l)
 	set name = "Reset SNPC"
 	set desc = "Reset the SNPC"
 	set category = "Debug"
@@ -163,7 +163,7 @@
 			T.retal = 0
 			T.doing = 0
 
-/client/proc/toggleSNPC(var/mob/A in SSnpc.botPool_l)
+/client/proc/toggleSNPC(var/mob/A in SSnpcpool.botPool_l)
 	set name = "Toggle SNPC Proccessing Mode"
 	set desc = "Toggle SNPC Proccessing Mode"
 	set category = "Debug"
@@ -180,7 +180,7 @@
 			T.forceProcess = 1
 			to_chat(usr, "[T]'s processing has been switched to [T.alternateProcessing ? "High Profile" : "Low Profile"]")
 
-/client/proc/customiseSNPC(var/mob/A in SSnpc.botPool_l)
+/client/proc/customiseSNPC(var/mob/A in SSnpcpool.botPool_l)
 	set name = "Customize SNPC"
 	set desc = "Customise the SNPC"
 	set category = "Debug"
@@ -390,7 +390,7 @@
 
 	doSetup()
 
-	SSnpc.insertBot(src)
+	SSnpcpool.insertBot(src)
 
 	loadVoice()