From 14403d15b37cfbd6e537b6580e1639faab354d32 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Mon, 12 Nov 2012 10:05:07 +0000 Subject: [PATCH] - 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 --- code/game/jobs/job/captain.dm | 2 ++ code/game/jobs/job/engineering.dm | 1 + code/game/jobs/job/job.dm | 3 +++ code/game/jobs/job/medical.dm | 1 + code/game/jobs/job/science.dm | 1 + code/game/jobs/job/security.dm | 1 + code/game/jobs/job/silicon.dm | 1 + code/game/jobs/job_controller.dm | 2 ++ code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/adminjump.dm | 2 +- code/modules/admin/verbs/diagnostics.dm | 2 +- 11 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 99b6615eaec..0e72955eb8d 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -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) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index a8420d59011..d071b340fd1 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -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) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 907994efdef..680ea4440c3 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -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 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index d85527f7b9c..69a0aa51eea 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -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) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 83bf8f90259..8efedc08b1b 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -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) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index e14f79ccbb8..fc313a27975 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -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) diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index 1b608e200dc..aac58091416 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -7,6 +7,7 @@ spawn_positions = 1 selection_color = "#ccffcc" supervisors = "your laws" + req_admin_notify = 1 equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index f0c8bf1528f..3b594519f54 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -334,6 +334,8 @@ var/global/datum/controller/occupations/job_master H << "You are the [rank]." H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." + if(job.req_admin_notify) + H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." spawnId(H,rank) H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ec8f72c8754..3663e145347 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -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) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 052ade953e7..c6f675a3a66 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -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" diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 3fafbe17cab..d91bdccf89e 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -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!