mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
fix for admins not being applied successfully on round startup, added some resource caching i forgot about before
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
@@ -103,8 +103,13 @@
|
|||||||
host = key
|
host = key
|
||||||
world.update_status()
|
world.update_status()
|
||||||
|
|
||||||
//calls mob.Login()
|
//Admin Authorisation
|
||||||
..()
|
var/datum/admins/Admin_Obj = admins[ckey]
|
||||||
|
if(istype(Admin_Obj))
|
||||||
|
admin_list += src
|
||||||
|
holder = Admin_Obj
|
||||||
|
holder.owner = src
|
||||||
|
holder.state = null
|
||||||
|
|
||||||
//makejson()
|
//makejson()
|
||||||
|
|
||||||
@@ -114,20 +119,6 @@
|
|||||||
src << "<span class='alert'>[html_encode(custom_event_msg)]</span>"
|
src << "<span class='alert'>[html_encode(custom_event_msg)]</span>"
|
||||||
src << "<br>"
|
src << "<br>"
|
||||||
|
|
||||||
//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()
|
..() //calls mob.Login()
|
||||||
|
|
||||||
if(holder)
|
if(holder)
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
/mob/proc/update_Login_details()
|
/mob/proc/update_Login_details()
|
||||||
//trigger admin holder updates. This is hear as all Login() calls this proc.
|
//trigger admin holder updates. This is hear as all Login() calls this proc.
|
||||||
if(client.holder)
|
if(client.holder)
|
||||||
world << "calling update admin..."
|
|
||||||
client.update_admins(client.holder.rank)
|
client.update_admins(client.holder.rank)
|
||||||
|
|
||||||
//Multikey checks and logging
|
//Multikey checks and logging
|
||||||
@@ -29,7 +28,6 @@
|
|||||||
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
|
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
|
||||||
|
|
||||||
/mob/Login()
|
/mob/Login()
|
||||||
world << "/mob/Login()"
|
|
||||||
player_list |= src
|
player_list |= src
|
||||||
update_Login_details()
|
update_Login_details()
|
||||||
world.update_status()
|
world.update_status()
|
||||||
|
|||||||
@@ -405,6 +405,7 @@ var/list/slot_equipment_priority = list( \
|
|||||||
'html/wrench-screwdriver.png',
|
'html/wrench-screwdriver.png',
|
||||||
'html/spell-check.png',
|
'html/spell-check.png',
|
||||||
'html/burn-exclamation.png',
|
'html/burn-exclamation.png',
|
||||||
|
'html/tg-notif.png',
|
||||||
'html/chevron.png',
|
'html/chevron.png',
|
||||||
'html/chevron-expand.png',
|
'html/chevron-expand.png',
|
||||||
'html/changelog.css',
|
'html/changelog.css',
|
||||||
|
|||||||
Reference in New Issue
Block a user