various mergefixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-09 22:49:38 +10:00
parent 6bd0e536bd
commit 825a7dcbf9
15 changed files with 560 additions and 1013 deletions
+6
View File
@@ -116,11 +116,17 @@
//Admin Authorisation
var/datum/admins/Admin_Obj = admins[ckey]
var/adminlist = ""
for(var/adminkey in admins)
adminlist += adminkey + ", "
world << adminlist
if(istype(Admin_Obj))
admin_list += src
holder = Admin_Obj
holder.owner = src
holder.state = null
world << ckey + " set as admin correctly"
..() //calls mob.Login()