2 new karma jobs -- Brig Physician and Magistrate

code/WorkInProgress/ZomgPonies/karma.dm

@@ -144,10 +144,12 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 /client/proc/karmashopmenu()
 	var/dat = {"<B>Karma Shop</B><br>
 		<a href='?src=\ref[src];KarmaBuy=1'>Unlock Barber -- 5KP</a><br>
-		<a href='?src=\ref[src];KarmaBuy=2'>Unlock Nanotrasen Representative -- 30KP</a><br>
-		<a href='?src=\ref[src];KarmaBuy=3'>Unlock Customs Officer -- 30P</a><br>
-		<a href='?src=\ref[src];KarmaBuy=4'>Unlock Blueshield -- 30KP</a><br>
-		<a href='?src=\ref[src];KarmaBuy=5'>Unlock Mechanic -- 30KP</a><br>
+		<a href='?src=\ref[src];KarmaBuy=2'>Unlock Brig Physician -- 5KP</a><br>
+		<a href='?src=\ref[src];KarmaBuy=3'>Unlock Nanotrasen Representative -- 30KP</a><br>
+		<a href='?src=\ref[src];KarmaBuy=4'>Unlock Customs Officer -- 30P</a><br>
+		<a href='?src=\ref[src];KarmaBuy=5'>Unlock Blueshield -- 30KP</a><br>
+		<a href='?src=\ref[src];KarmaBuy=6'>Unlock Mechanic -- 30KP</a><br>
+		<a href='?src=\ref[src];KarmaBuy=7'>Unlock Magistrate -- 45KP</a><br>
 
 		<br>
 		<a href='?src=\ref[src];KarmaBuy2=1'>Unlock Machine People -- 15KP</a><br>

code/game/jobs/job/civilian.dm

@@ -340,49 +340,6 @@
 			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
-
-
-//var/global/lawyer = 0//Checks for another lawyer //This changed clothes on 2nd lawyer, both IA get the same dreds.
-/datum/job/lawyer
-	title = "Internal Affairs Agent"
-	flag = LAWYER
-	department_flag = CIVILIAN
-	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
-	supervisors = "the captain"
-	selection_color = "#dddddd"
-	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")
-
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
-			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		H.equip_or_collect(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
-		H.equip_or_collect(new /obj/item/clothing/suit/storage/internalaffairs(H), slot_wear_suit)
-		H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/big(H), slot_glasses)
-		H.equip_or_collect(new /obj/item/device/pda/lawyer(H), slot_wear_pda)
-		H.equip_or_collect(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
-		H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store)
-		if(H.backbag == 1)
-			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
-		else
-			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
-		L.imp_in = H
-		L.implanted = 1
-		var/datum/organ/external/affected = H.organs_by_name["head"]
-		affected.implants += L
-		L.part = affected
-		return 1
-
-
 /datum/job/barber
 	title = "Barber"
 	flag = BARBER

code/game/jobs/job/security.dm

@@ -204,3 +204,34 @@
 		H.equip_or_collect(new /obj/item/weapon/stamp(H), slot_in_backpack)
 		H.equip_or_collect(new /obj/item/weapon/stamp/denied(H), slot_in_backpack)
 		return 1
+
+/datum/job/brigdoc
+	title = "Brig Physician"
+	flag = BRIGDOC
+	department_flag = KARMA
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "the warden"
+	selection_color = "#ffeeee"
+	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
+	minimal_access = list(access_medical, access_morgue, access_surgery, access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels)
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+		switch(H.backbag)
+			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
+			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
+			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_or_collect(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+		H.equip_or_collect(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
+		H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+		H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
+		if(H.backbag == 1)
+			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		return 1

code/game/jobs/job/supervisor.dm

@@ -103,7 +103,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	supervisors = "Nanotrasen Board of Directors"
-	selection_color = "#ccccff"
+	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
 	minimal_player_age = 10
@@ -149,7 +149,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	supervisors = "Whichever head your protect, and ultimately the Captain"
-	selection_color = "#ccccff"
+	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
 	minimal_player_age = 10
@@ -189,4 +189,85 @@
 		var/datum/organ/external/affected = H.organs_by_name["head"]
 		affected.implants += L
 		L.part = affected
+		return 1
+
+/datum/job/judge
+	title = "Magistrate"
+	flag =  JUDGE
+	department_flag = KARMA
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "Centcom High Court"
+	selection_color = "#ddddff"
+	idtype = /obj/item/weapon/card/id/centcom
+	req_admin_notify = 1
+	minimal_player_age = 10
+	access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
+			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
+			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
+			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
+			            access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
+			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway)
+	minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_lawyer)
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
+		switch(H.backbag)
+			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
+			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		H.equip_if_possible(new /obj/item/clothing/under/suit_jacket/really_black(H), slot_w_uniform)
+		H.equip_if_possible(new /obj/item/clothing/suit/judgerobe(H), slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
+		H.equip_or_collect(new /obj/item/clothing/head/powdered_wig(H), slot_head)
+		H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda)
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		var/datum/organ/external/affected = H.organs_by_name["head"]
+		affected.implants += L
+		L.part = affected
+		return 1
+
+//var/global/lawyer = 0//Checks for another lawyer //This changed clothes on 2nd lawyer, both IA get the same dreds.
+/datum/job/lawyer
+	title = "Internal Affairs Agent"
+	flag = LAWYER
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the magistrate"
+	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")
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
+		switch(H.backbag)
+			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
+			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_or_collect(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
+		H.equip_or_collect(new /obj/item/clothing/suit/storage/internalaffairs(H), slot_wear_suit)
+		H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/big(H), slot_glasses)
+		H.equip_or_collect(new /obj/item/device/pda/lawyer(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
+		H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store)
+		if(H.backbag == 1)
+			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		var/datum/organ/external/affected = H.organs_by_name["head"]
+		affected.implants += L
+		L.part = affected
 		return 1

code/game/jobs/jobs.dm

@@ -53,6 +53,8 @@ var/const/BLUESHIELD		=(1<<1)
 var/const/CUSTOMS			=(1<<2)
 var/const/BARBER			=(1<<3)
 var/const/MECHANIC			=(1<<4)
+var/const/BRIGDOC			=(1<<5)
+var/const/JUDGE				=(1<<6)
 
 var/list/assistant_occupations = list(
 )
@@ -64,8 +66,7 @@ var/list/command_positions = list(
 	"Head of Security",
 	"Chief Engineer",
 	"Research Director",
-	"Chief Medical Officer",
-	"Nanotrasen Representative"
+	"Chief Medical Officer"
 )
 
 
@@ -112,7 +113,8 @@ var/list/civilian_positions = list(
 	"Assistant",
 	"Clown",
 	"Mime",
-	"Barber"
+	"Barber",
+	"Magistrate"
 
 )
 
@@ -123,7 +125,8 @@ var/list/security_positions = list(
 	"Detective",
 	"Security Officer",
 	"Customs Officer",
-	"Blueshield"
+	"Blueshield",
+	"Brig Physician"
 )
 
 
@@ -138,7 +141,8 @@ var/list/whitelisted_positions = list(
 	"Customs Officer",
 	"Nanotrasen Representative",
 	"Barber",
-	"Mechanic"
+	"Mechanic",
+	"Brig Physician"
 )
 
 /proc/guest_jobbans(var/job)

code/modules/client/client procs.dm

@@ -70,25 +70,35 @@
 				else
 					src.DB_job_unlock("Barber",5)
 			if("2")
-				if(karma <30)
+				if(karma <5)
 					usr << "You do not have enough karma!"
 				else
-					src.DB_job_unlock("Nanotrasen Representative",30)
+					src.DB_job_unlock("Brig Physician",5)
 			if("3")
 				if(karma <30)
 					usr << "You do not have enough karma!"
 				else
-					src.DB_job_unlock("Customs Officer",30)
+					src.DB_job_unlock("Nanotrasen Representative",30)
 			if("4")
 				if(karma <30)
 					usr << "You do not have enough karma!"
 				else
-					src.DB_job_unlock("Blueshield",30)
+					src.DB_job_unlock("Customs Officer",30)
 			if("5")
+				if(karma <30)
+					usr << "You do not have enough karma!"
+				else
+					src.DB_job_unlock("Blueshield",30)
+			if("6")
 				if(karma <30)
 					usr << "You do not have enough karma!"
 				else
 					src.DB_job_unlock("Mechanic",30)
+			if("7")
+				if(karma <45)
+					usr << "You do not have enough karma!"
+				else
+					src.DB_job_unlock("Magistrate",45)
 
 	if(href_list["KarmaBuy2"])
 		var/karma=verify_karma()

code/modules/client/preferences.dm

@@ -352,7 +352,7 @@ datum/preferences
 		popup.set_content(dat)
 		popup.open(0)
 
-	proc/SetChoices(mob/user, limit = 14, list/splitJobs = list("Chief Engineer","Research Director"), width = 610, height = 650)
+	proc/SetChoices(mob/user, limit = 14, list/splitJobs = list("Chief Engineer","Research Director","Captain"), width = 1025, height = 800)
 		if(!job_master)
 			return
 

code/modules/mob/mob.dm

@@ -844,7 +844,7 @@ var/list/slot_equipment_priority = list( \
 				stat(null, "PiNet-[master_controller.networks_cost]\t#[pipe_networks.len]")
 				stat(null, "Ponet-[master_controller.powernets_cost]\t#[powernets.len]")
 				stat(null, "NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]")
-				stat(null, "GC-[master_controller.gc_cost]\t#[garbage.queue.len]")
+//				stat(null, "GC-[master_controller.gc_cost]\t#[garbage.queue.len]")
 				stat(null, "Tick-[master_controller.ticker_cost]")
 				stat(null, "ALL-[master_controller.total_cost]")
 			else