diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index ea0d037b417..a1563330ee3 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -410,9 +410,6 @@ if(job.supervisors) to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") - if(job.req_admin_notify) - to_chat(H, "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") - //Gives glasses to the vision impaired if(H.disabilities & NEARSIGHTED && !megavend) var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b134ff63572..69f7afc517d 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -11,7 +11,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) spawn_positions = 1 supervisors = "company officials and Corporate Regulations" selection_color = "#ccccff" - req_admin_notify = 1 access = list() //See get_access() minimal_access = list() //See get_access() minimal_player_age = 14 @@ -73,7 +72,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) spawn_positions = 1 supervisors = "the captain" selection_color = "#ddddff" - req_admin_notify = 1 minimal_player_age = 10 economic_modifier = 10 ideal_character_age = 50 @@ -104,4 +102,4 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) /obj/item/weapon/storage/box/ids = 1 ) - messengerbag = /obj/item/weapon/storage/backpack/messenger/com \ No newline at end of file + messengerbag = /obj/item/weapon/storage/backpack/messenger/com diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index ed997508903..775906c9f98 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -9,7 +9,6 @@ spawn_positions = 1 supervisors = "the captain" selection_color = "#ffeeaa" - req_admin_notify = 1 economic_modifier = 10 ideal_character_age = 50 @@ -140,4 +139,4 @@ backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel_eng dufflebag = /obj/item/weapon/storage/backpack/duffel/eng - messengerbag = /obj/item/weapon/storage/backpack/messenger/engi \ No newline at end of file + messengerbag = /obj/item/weapon/storage/backpack/messenger/engi diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 24ebda2409d..7641ee79641 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -15,7 +15,6 @@ var/selection_color = "#ffffff" // Selection screen color var/list/alt_titles // List of alternate titles, if any var/list/title_accesses // A map of title -> list of accesses to add if the person has this title. - var/req_admin_notify // 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/minimal_player_age = 0 // If you have use_age_restriction_for_jobs config option enabled and the database set up, this option will add a requirement for players to be at least minimal_player_age days old. (meaning they first signed in at least that many days before.) var/department = null // Does this position have a department tag? var/head_position = 0 // Is this position Command? @@ -46,7 +45,7 @@ return alt_outfits[H.job] else if(outfit) return outfit - + /datum/job/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, alt_title = null) if(!H) return 0 @@ -239,4 +238,4 @@ var/datum/job/J = SSjobs.GetJobType(jobtype) if(!J) J = SSjobs.GetJob(H.job) - return J.title \ No newline at end of file + return J.title diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 80ad1072371..117d5cb36e9 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -9,7 +9,6 @@ spawn_positions = 1 supervisors = "the captain" selection_color = "#ffddf0" - req_admin_notify = 1 economic_modifier = 10 access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction, diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 8b6e9d51fad..da9eba34742 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -9,7 +9,6 @@ spawn_positions = 1 supervisors = "the captain" selection_color = "#ffddff" - req_admin_notify = 1 economic_modifier = 15 access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_eva, access_external_airlocks, access_tox_storage, access_teleporter, access_sec_doors, access_medical, access_engine, access_construction, @@ -156,4 +155,4 @@ backpack = /obj/item/weapon/storage/backpack/toxins satchel = /obj/item/weapon/storage/backpack/satchel_tox dufflebag = /obj/item/weapon/storage/backpack/duffel/tox - messengerbag = /obj/item/weapon/storage/backpack/messenger/tox \ No newline at end of file + messengerbag = /obj/item/weapon/storage/backpack/messenger/tox diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 9305ebb8322..e1bce85652f 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -9,7 +9,6 @@ spawn_positions = 1 supervisors = "the captain" selection_color = "#ffdddd" - req_admin_notify = 1 economic_modifier = 10 access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, @@ -260,4 +259,4 @@ backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel_sec dufflebag = /obj/item/weapon/storage/backpack/duffel/sec - messengerbag = /obj/item/weapon/storage/backpack/messenger/sec \ No newline at end of file + messengerbag = /obj/item/weapon/storage/backpack/messenger/sec diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index cb80b9f148a..3a8f6569367 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -7,7 +7,6 @@ spawn_positions = 1 selection_color = "#ccffcc" supervisors = "your laws" - req_admin_notify = 1 minimal_player_age = 7 account_allowed = 0 economic_modifier = 0 diff --git a/html/changelogs/skull132_reworking-admin-things.yml b/html/changelogs/skull132_reworking-admin-things.yml new file mode 100644 index 00000000000..bfb5e238596 --- /dev/null +++ b/html/changelogs/skull132_reworking-admin-things.yml @@ -0,0 +1,5 @@ +author: "Skull132" +delete-after: True + +changes: + - tweak: "Edited the join text of heads of staff to no longer require them to adminhelp upon disconnect. This really isn't useful information, believe it or not!"