- Spawning as a head of staff or AI will now display the following line, along with the standard hierarchy stuff: "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp."

- Trying to remove someone's jobban through 'show player panel' -> 'jobban' -> 'click on job' will still bring up the banning panel, with a note that you can't use the old panel, it will however now properly have the banned player's ckey inserted as the search criteria, instead of your ckey.
- Jump-to-mob now uses mob_list instead of sortmobs()

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5044 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-11-12 10:05:07 +00:00
parent 77980e5225
commit 14403d15b3
11 changed files with 15 additions and 3 deletions

View File

@@ -8,6 +8,7 @@
supervisors = "Nanotrasen officials and Space law"
selection_color = "#ccccff"
idtype = /obj/item/weapon/card/id/gold
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)
@@ -46,6 +47,7 @@
supervisors = "the captain"
selection_color = "#ddddff"
idtype = /obj/item/weapon/card/id/silver
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)

View File

@@ -8,6 +8,7 @@
supervisors = "the captain"
selection_color = "#ffeeaa"
idtype = /obj/item/weapon/card/id/silver
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)

View File

@@ -28,5 +28,8 @@
//the type of the ID the player will have
var/idtype = /obj/item/weapon/card/id
//If this is set to 1, a text is printed to the player when jobs are assigned, telling him that he should let admins know that he has to disconnect.
var/req_admin_notify
/datum/job/proc/equip(var/mob/living/carbon/human/H)
return 1

View File

@@ -8,6 +8,7 @@
supervisors = "the captain"
selection_color = "#ffddf0"
idtype = /obj/item/weapon/card/id/silver
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)

View File

@@ -8,6 +8,7 @@
supervisors = "the captain"
selection_color = "#ffddff"
idtype = /obj/item/weapon/card/id/silver
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)

View File

@@ -8,6 +8,7 @@
supervisors = "the captain"
selection_color = "#ffdddd"
idtype = /obj/item/weapon/card/id/silver
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)

View File

@@ -7,6 +7,7 @@
spawn_positions = 1
selection_color = "#ccffcc"
supervisors = "your laws"
req_admin_notify = 1
equip(var/mob/living/carbon/human/H)

View File

@@ -334,6 +334,8 @@ var/global/datum/controller/occupations/job_master
H << "<B>You are the [rank].</B>"
H << "<b>As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>"
if(job.req_admin_notify)
H << "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>"
spawnId(H,rank)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears)

View File

@@ -651,7 +651,7 @@
if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban.
if(!config.ban_legacy_system)
usr << "Unfortunately, database based unbanning cannot be done through this panel"
DB_ban_panel(usr.client.ckey)
DB_ban_panel(M.ckey)
return
var/msg
for(var/job in joblist)

View File

@@ -30,7 +30,7 @@
alert("Admin jumping disabled")
return
/client/proc/jumptomob(var/mob/M in sortmobs())
/client/proc/jumptomob(var/mob/M in mob_list)
set category = "Admin"
set name = "Jump to Mob"

View File

@@ -134,7 +134,7 @@
if(!check_rights(R_SERVER)) return
message_admins("[usr] manually reloaded admins.txt")
message_admins("[usr] manually reloaded admins")
load_admins()
feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!