Merge resolution.

This commit is contained in:
Zuhayr
2013-11-29 22:36:36 +10:30
44 changed files with 290 additions and 136 deletions
@@ -13,6 +13,10 @@ var/datum/paiController/paiController // Global handler for pAI candidates
var/ready = 0
/hook/startup/proc/paiControllerSetup()
paiController = new /datum/paiController()
return 1
/datum/paiController
var/list/pai_candidates = list()