From 23e5fbdd4d87c746fc2e0c1864e6a39ef099c7da Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 22 Dec 2017 06:52:54 -0800 Subject: [PATCH 1/3] makes IAA a karma job --- code/game/jobs/job/supervisor.dm | 4 +--- code/game/jobs/jobs.dm | 1 + code/modules/client/client procs.dm | 9 +++++++++ code/modules/karma/karma.dm | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index ba1b2974cc9..97c3cb5a639 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -235,7 +235,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/lawyer title = "Internal Affairs Agent" flag = LAWYER - department_flag = SUPPORT + department_flag = KARMA total_positions = 2 spawn_positions = 2 is_legal = 1 @@ -246,8 +246,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) alt_titles = list("Lawyer","Public Defender") minimal_player_age = 30 - exp_requirements = 300 - exp_type = EXP_TYPE_CREW outfit = /datum/outfit/job/lawyer /datum/outfit/job/lawyer diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index a9aa142ac1d..8ea15782570 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -151,6 +151,7 @@ var/list/nonhuman_positions = list( var/list/whitelisted_positions = list( "Blueshield", + "Internal Affairs Agent", "Nanotrasen Representative", "Barber", "Mechanic", diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 2720f8086d0..294a9f88d52 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -173,6 +173,15 @@ return DB_job_unlock("Security Pod Pilot",30) return + if("10") + if(karma < 10) + to_chat(usr, "You do not have enough karma!") + return + else + if(alert("Are you sure you want to unlock Internal Affairs Agent?", "Confirmation", "No", "Yes") != "Yes") + return + DB_job_unlock("Internal Affairs Agent", 10) + return if(href_list["KarmaBuy2"]) var/karma=verify_karma() switch(href_list["KarmaBuy2"]) diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index b5cdbe0154f..a08d407e229 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -206,6 +206,7 @@ You've gained [totalkarma] total karma in your time here.
"} dat += {" Unlock Barber -- 5KP
Unlock Brig Physician -- 5KP
+ Unlock Internal Affairs Agent -- 10KP
Unlock Nanotrasen Representative -- 30KP
Unlock Blueshield -- 30KP
Unlock Security Pod Pilot -- 30KP
From ba624961b0cec24a55d5c6bea232a6f8cf22c696 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 22 Dec 2017 16:22:47 -0800 Subject: [PATCH 2/3] new approach: 10h playtime req, extra access --- code/game/jobs/job/supervisor.dm | 9 +++++---- code/game/jobs/jobs.dm | 1 - code/modules/client/client procs.dm | 9 --------- code/modules/karma/karma.dm | 1 - 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 97c3cb5a639..e8c910e652a 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -235,17 +235,18 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/lawyer title = "Internal Affairs Agent" flag = LAWYER - department_flag = KARMA + department_flag = SUPPORT total_positions = 2 spawn_positions = 2 is_legal = 1 supervisors = "the magistrate" department_head = list("Captain") selection_color = "#ddddff" - access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) - minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) - alt_titles = list("Lawyer","Public Defender") + access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_research, access_medical, access_construction, access_mailsorting) + minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_research, access_medical, access_construction, access_mailsorting) minimal_player_age = 30 + exp_requirements = 600 + exp_type = EXP_TYPE_CREW outfit = /datum/outfit/job/lawyer /datum/outfit/job/lawyer diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 8ea15782570..a9aa142ac1d 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -151,7 +151,6 @@ var/list/nonhuman_positions = list( var/list/whitelisted_positions = list( "Blueshield", - "Internal Affairs Agent", "Nanotrasen Representative", "Barber", "Mechanic", diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 294a9f88d52..2720f8086d0 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -173,15 +173,6 @@ return DB_job_unlock("Security Pod Pilot",30) return - if("10") - if(karma < 10) - to_chat(usr, "You do not have enough karma!") - return - else - if(alert("Are you sure you want to unlock Internal Affairs Agent?", "Confirmation", "No", "Yes") != "Yes") - return - DB_job_unlock("Internal Affairs Agent", 10) - return if(href_list["KarmaBuy2"]) var/karma=verify_karma() switch(href_list["KarmaBuy2"]) diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index a08d407e229..b5cdbe0154f 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -206,7 +206,6 @@ You've gained [totalkarma] total karma in your time here.
"} dat += {" Unlock Barber -- 5KP
Unlock Brig Physician -- 5KP
- Unlock Internal Affairs Agent -- 10KP
Unlock Nanotrasen Representative -- 30KP
Unlock Blueshield -- 30KP
Unlock Security Pod Pilot -- 30KP
From 9cb2e209d442521114da033ac0f3a234a490f312 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 22 Dec 2017 16:36:49 -0800 Subject: [PATCH 3/3] alt title: Human Resources Agent --- code/game/jobs/job/supervisor.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index e8c910e652a..879b5b9a296 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -244,6 +244,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) selection_color = "#ddddff" access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_research, access_medical, access_construction, access_mailsorting) minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_research, access_medical, access_construction, access_mailsorting) + alt_titles = list("Human Resources Agent") minimal_player_age = 30 exp_requirements = 600 exp_type = EXP_TYPE_CREW