Swaps FBI to a Precinct Detective, renames the PD Chief as a Precinct Captain

code/__DEFINES/jobs.dm

@@ -44,10 +44,10 @@
 #define JOB_DISPLAY_ORDER_REGENT 25
 #define JOB_DISPLAY_ORDER_ARCHIVIST 26
 #define JOB_DISPLAY_ORDER_GIOVANNI 27
-#define JOB_DISPLAY_ORDER_POLICE_CHIEF 28
+#define JOB_DISPLAY_ORDER_PRECINCT_CAPTAIN 28
 #define JOB_DISPLAY_ORDER_POLICE 29
 #define JOB_DISPLAY_ORDER_POLICE_SERGEANT 30
-#define JOB_DISPLAY_ORDER_FBI 31
+#define JOB_DISPLAY_ORDER_PRECINCT_DETECTIVE 31
 #define JOB_DISPLAY_ORDER_VOIVODE 32
 #define JOB_DISPLAY_ORDER_BOGATYR 33
 #define JOB_DISPLAY_ORDER_ZADRUGA 34

code/__DEFINES/preferences.dm

@@ -87,7 +87,7 @@
 #define EXP_TYPE_GIOVANNI   "Giovanni Family"
 #define EXP_TYPE_TZIMISCE   "Tzimisce Mansion"
 #define EXP_TYPE_WAREHOUSE      "Warehouse"
-#define EXP_TYPE_NATIONAL_SECURITY      "National Security"
+#define EXP_TYPE_PRECINCT_DB      "Precinct DB"
 #define EXP_TYPE_CHURCH         "Church"
 #define EXP_TYPE_SPECIAL		"Special"
 #define EXP_TYPE_GHOST			"Ghost"

code/datums/datacore.dm

@@ -158,7 +158,7 @@
 		"Anarch" = GLOB.anarch_positions,
 		"Giovanni" = GLOB.giovanni_positions,
 		"Old Clan Tzimisce" = GLOB.tzimisce_positions,
-		"Law Enforcement" = GLOB.police_positions + GLOB.national_security_positions,
+		"Law Enforcement" = GLOB.police_positions + GLOB.precinct_db_positions,
 		"Warehouse" = GLOB.warehouse_positions,
 		"Triad" = GLOB.gang_positions
 	)

code/modules/jobs/jobs.dm

@@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(leader_positions, list(
 	"Prince",
 	"Baron",
 	"Chantry Regent",
-	"Police Chief",
+	"Precinct Captain",
 	"Dealer",
     "Capo",
 	"Clinic Director"
@@ -36,15 +36,15 @@ GLOBAL_LIST_INIT(citizen_positions, list(
 ))
 
 GLOBAL_LIST_INIT(police_positions, list(
-    "Police Chief",
+    "Precinct Captain",
     "Police Sergeant",
     "Police Officer",
 	"Emergency Dispatcher"
 
 ))
 
-GLOBAL_LIST_INIT(national_security_positions, list(
-    "Federal Investigator"
+GLOBAL_LIST_INIT(precinct_db_positions, list(
+    "Precinct Detective"
 ))
 
 GLOBAL_LIST_INIT(services_positions, list(
@@ -111,14 +111,14 @@ GLOBAL_LIST_INIT(position_categories, list(
     EXP_TYPE_SERVICES = list("jobs" = services_positions, "color" = "#e8e6e6"),
     EXP_TYPE_CHURCH = list("jobs" = church_positions, "color" = " #fff700"),
     EXP_TYPE_POLICE = list("jobs" = police_positions, "color" = "#1d22cc"),
-    EXP_TYPE_NATIONAL_SECURITY = list("jobs" = national_security_positions, "color" = " #000491"),
+    EXP_TYPE_PRECINCT_DB = list("jobs" = precinct_db_positions, "color" = "#000491"),
     EXP_TYPE_GANG = list("jobs" = gang_positions, "color" = "#837524"),
     EXP_TYPE_TZIMISCE = list("jobs" = tzimisce_positions, "color" = "#fa0207")
 ))
 
 
 GLOBAL_LIST_INIT(exp_jobsmap, list(
-	EXP_TYPE_CREW = list("titles" = command_positions | church_positions | camarilla_council_positions | citizen_positions | police_positions | national_security_positions | anarch_positions | services_positions  | giovanni_positions | tzimisce_positions | warehouse_positions | tremere_positions | gang_positions | clinic_positions), // crew positions
+	EXP_TYPE_CREW = list("titles" = command_positions | church_positions | camarilla_council_positions | citizen_positions | police_positions | precinct_db_positions | anarch_positions | services_positions  | giovanni_positions | tzimisce_positions | warehouse_positions | tremere_positions | gang_positions | clinic_positions), // crew positions
 	EXP_TYPE_CAMARILLIA = list("titles" = command_positions),
 	EXP_TYPE_TREMERE = list("titles" = tremere_positions),
 	EXP_TYPE_ANARCH = list("titles" = anarch_positions),
@@ -132,7 +132,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
     EXP_TYPE_TZIMISCE = list("titles" = tzimisce_positions),
     EXP_TYPE_WAREHOUSE = list("titles" = warehouse_positions),
     EXP_TYPE_CHURCH = list("titles" = church_positions),
-    EXP_TYPE_NATIONAL_SECURITY = list("titles" = national_security_positions),
+    EXP_TYPE_PRECINCT_DB = list("titles" = precinct_db_positions),
 
 ))
 

code/modules/mining/machine_vending.dm

@@ -256,9 +256,9 @@
 /obj/machinery/mineral/equipment_vendor/restricted/police
 	jobs_allowed = list(
 		"Police Officer" = 200,
-		"Federal Investigator" = 400,
+		"Police Detective" = 400,
 		"Police Sergeant" = 500,
-		"Police Chief" = 15000,	// don't you love the militirization of the police?
+		"Precinct Captain" = 15000,	// don't you love the militirization of the police?
 	)
 	prize_list = list(
 		new /datum/data/mining_equipment("handcuffs", /obj/item/restraints/handcuffs, 1),

code/modules/vtmb/jobs/fbi.dm

@@ -1,11 +1,11 @@
 
 /datum/job/vamp/fbi
-	title = "Federal Investigator"
-	department_head = list("Federal Bureau of Investigation")
+	title = "Precinct Detective"
+	department_head = list("The Precinct Captain")
 	faction = "Vampire"
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = " the FBI"
+	supervisors = " the Precinct Captain"
 	selection_color = "#1a1d8a"
 
 	outfit = /datum/outfit/job/fbi
@@ -14,8 +14,8 @@
 	minimal_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE)
 	paycheck = PAYCHECK_MEDIUM
 	paycheck_department = ACCOUNT_SRV
-	display_order = JOB_DISPLAY_ORDER_FBI
-	exp_type_department = EXP_TYPE_NATIONAL_SECURITY
+	display_order = JOB_DISPLAY_PRECINCT_DETECTIVE
+	exp_type_department = EXP_TYPE_PRECINCT_DB
 
 	allowed_species = list("Human")
 	minimal_generation = 13
@@ -26,7 +26,7 @@
 	known_contacts = list("Police Chief")
 
 /datum/outfit/job/fbi
-	name = "Federal Investigator"
+	name = "Precinct Detective"
 	jobtype = /datum/job/vamp/fbi
 
 	ears = /obj/item/p25radio/police/government

code/modules/vtmb/jobs/jobs.dm

@@ -336,7 +336,7 @@
 	desc = "Sponsored by the Government. This one seems slightly more worn down than all the others."
 
 /obj/item/card/id/police/chief
-	name = "police chief badge"
+	name = "Precinct Captain badge"
 	desc = "Sponsored by the Government. This one has a chrome plated finish."
 
 /obj/item/card/id/police/fbi

code/modules/vtmb/jobs/police.dm

@@ -81,7 +81,7 @@
 	backpack_contents = list(/obj/item/passport=1, /obj/item/implant/radio=1, /obj/item/vamp/creditcard=1, /obj/item/ammo_box/vampire/c9mm = 1, /obj/item/restraints/handcuffs = 1,/obj/item/melee/classic_baton/vampire = 1, /obj/item/storage/firstaid/ifak = 1)
 
 /datum/job/vamp/police_chief
-	title = "Police Chief"
+	title = "Precinct Captain"
 	department_head = list("Police Department")
 	faction = "Vampire"
 	total_positions = 1
@@ -95,7 +95,7 @@
 	minimal_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE)
 	paycheck = PAYCHECK_COMMAND
 	paycheck_department = ACCOUNT_SRV
-	display_order = JOB_DISPLAY_ORDER_POLICE_CHIEF
+	display_order = JOB_DISPLAY_ORDER_PRECINCT_CAPTAIN
 	exp_type_department = EXP_TYPE_POLICE
 
 	allowed_species = list("Human")
@@ -106,7 +106,7 @@
 //	known_contacts = list("Investigator")
 
 /datum/outfit/job/police_chief
-	name = "Police Chief"
+	name = "Precinct Captain"
 	jobtype = /datum/job/vamp/police_chief
 
 	ears = /obj/item/p25radio/police/command

code/modules/wod13/clothcode.dm

@@ -671,8 +671,8 @@
 	armor = list(MELEE = 25, BULLET = 25, LASER = 10, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 25, ACID = 10, WOUND = 25)
 
 /obj/item/clothing/suit/vampire/jacket/fbi
-	name = "Federal Bureau of Investigation jacket"
-	desc = "\"FBI OPEN UP!!\""
+	name = "Discontinued Old Jacket"
+	desc = "\"Warn by the new members of the SFPD's Detective Bureau. Still have yet to issue new ones. We aren't FBI.\"" // need new sprites - tzula
 	icon_state = "fbi"
 	armor = list(MELEE = 25, BULLET = 25, LASER = 10, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 25, ACID = 10, WOUND = 25)
 
@@ -743,7 +743,7 @@
 
 // They got an Army vest post-PD update. I am just giving them the same, instead coded into their equipment instead of mapped.
 /obj/item/clothing/suit/vampire/vest/police/chief
-	name = "police chief duty vest"
+	name = "Precinct Captain duty vest"
 	icon_state = "chiefvest"
 	desc = "Composite bulletproof vest with SFPD markings, tailored for improved protection. This one has captain insignia on it."
 	armor = list(MELEE = 70, BULLET = 70, LASER = 10, ENERGY = 10, BOMB = 60, BIO = 0, RAD = 0, FIRE = 50, ACID = 10, WOUND = 30)