Giovanni Job Titles & Clan Availability Reduction, Tremere/Sabbat Titles

_maps/map_files/Vampire/westfield_mall/westfield_mall.dmm

@@ -2075,7 +2075,7 @@
 /obj/structure/chair/office{
 	dir = 4
 	},
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /turf/open/floor/carpet/darkpack/redsilver,
 /area/vtm/westfield_mall/interior/chantry)
 "ahg" = (
@@ -2407,7 +2407,7 @@
 /area/vtm/interior/police)
 "aif" = (
 /obj/structure/chair/office,
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/westfield_mall/interior/chantry)
 "aig" = (
@@ -2857,7 +2857,7 @@
 /turf/open/floor/city/plating,
 /area/vtm/westfield_mall/interior)
 "ajB" = (
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /obj/structure/chair/wood/darkpack/red,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/westfield_mall/interior/chantry)
@@ -4694,7 +4694,7 @@
 /obj/structure/chair/office/darkpack/red{
 	dir = 8
 	},
-/obj/effect/landmark/start/darkpack/hecata/famiglia,
+/obj/effect/landmark/start/darkpack/hecata/soldato,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/bianchiBank)
 "apF" = (
@@ -7444,7 +7444,7 @@
 /turf/open/misc/dirt,
 /area/vtm/interior/sewer)
 "ayp" = (
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /obj/structure/chair/office/darkpack/red{
 	dir = 8
 	},
@@ -8580,7 +8580,7 @@
 /area/vtm/westfield_mall/interior/theatre)
 "aCw" = (
 /obj/effect/turf_decal/siding/wood/dark,
-/obj/effect/landmark/start/darkpack/hecata/famiglia,
+/obj/effect/landmark/start/darkpack/hecata/soldato,
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/bianchiBank)
 "aCx" = (
@@ -12782,7 +12782,7 @@
 /obj/structure/chair/office{
 	dir = 8
 	},
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /turf/open/floor/carpet/darkpack/redsilver,
 /area/vtm/westfield_mall/interior/chantry)
 "aQf" = (
@@ -14463,7 +14463,7 @@
 /area/vtm/interior/police)
 "aVO" = (
 /obj/structure/chair/sofa/corp/right,
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/westfield_mall/interior/chantry)
 "aVP" = (
@@ -14585,7 +14585,7 @@
 /turf/open/floor/plating/canalplating,
 /area/vtm/interior/sewer)
 "aWl" = (
-/obj/effect/landmark/start/darkpack/chantry/archivist,
+/obj/effect/landmark/start/darkpack/chantry/apprentice,
 /obj/structure/chair/wood/darkpack/red{
 	dir = 1
 	},
@@ -16052,7 +16052,7 @@
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/interior/sewer)
 "cID" = (
-/obj/effect/landmark/start/darkpack/hecata/squadra,
+/obj/effect/landmark/start/darkpack/hecata/socio,
 /turf/open/floor/city/plating_stone,
 /area/vtm/interior/bianchiBank)
 "cLl" = (
@@ -16901,7 +16901,7 @@
 /turf/open/floor/city/plating,
 /area/vtm/interior/shop)
 "iKw" = (
-/obj/effect/landmark/start/darkpack/hecata/famiglia,
+/obj/effect/landmark/start/darkpack/hecata/soldato,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/bianchiBank)
 "iRP" = (
@@ -17243,7 +17243,7 @@
 /turf/open/floor/plating/concrete,
 /area/vtm/westfield_mall/interior/janitor)
 "lXz" = (
-/obj/effect/landmark/start/darkpack/hecata/squadra,
+/obj/effect/landmark/start/darkpack/hecata/socio,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/bianchiBank)
 "mbi" = (
@@ -17875,7 +17875,7 @@
 /area/vtm/westfield_mall/skatepark)
 "rDj" = (
 /obj/item/kirbyplants/darkpack/random,
-/obj/effect/landmark/start/darkpack/hecata/squadra,
+/obj/effect/landmark/start/darkpack/hecata/socio,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/bianchiBank)
 "rGI" = (

code/__DEFINES/~darkpack/is_helpers.dm

@@ -1,5 +1,5 @@
 #define is_vampire_job(job_type)  (istype(job_type, /datum/job/vampire))
 #define is_prince_job(job_type) (istype(job_type, /datum/job/vampire/prince))
-#define is_sabbatist(job_type) (istype(job_type, /datum/job/vampire/sabbatpack || /datum/job/vampire/sabbatpriest || /datum/job/vampire/sabbatductus))
+#define is_sabbatist(job_type) (istype(job_type, /datum/job/vampire/true_sabbat || /datum/job/vampire/sabbatpriest || /datum/job/vampire/sabbatductus))
 #define is_sabbat_priest(job_type) (istype(job_type, /datum/job/vampire/sabbatpriest))
 #define is_sabbat_ductus(job_type) (istype(job_type, /datum/job/vampire/sabbatductus))

code/__DEFINES/~darkpack/jobs.dm

@@ -43,7 +43,7 @@
 #define JOB_SWEEPER "Sweeper"
 
 //Tremere
-#define JOB_CHANTRY_ARCHIVIST "Chantry Archivist"
+#define JOB_CHANTRY_APPRENTICE "Chantry Apprentice"
 #define JOB_CHANTRY_REGENT "Chantry Regent"
 #define JOB_CHANTRY_GARGOYLE "Chantry Gargoyle"
 
@@ -70,13 +70,13 @@
 
 //Giovanni
 #define JOB_CAPO "Capo"
-#define JOB_LA_SQUADRA "La Squadra"
-#define JOB_LA_FAMIGLIA "La Famiglia"
+#define JOB_SOLDATO "Soldato"
+#define JOB_SOCIO "Socio"
 
 //Sabbat
 #define JOB_SABBAT_DUCTUS "Sabbat Ductus"
 #define JOB_SABBAT_PRIEST "Sabbat Priest"
-#define JOB_SABBAT_PACK "Sabbat Pack"
+#define JOB_TRUE_SABBAT "True Sabbat"
 #define JOB_SABBAT_SABBATIST "Sabbatist"
 
 // Axe Gang
@@ -141,7 +141,7 @@
 #define JOB_DISPLAY_ORDER_TAPSTER 28
 
 #define JOB_DISPLAY_ORDER_REGENT 29
-#define JOB_DISPLAY_ORDER_ARCHIVIST 30
+#define JOB_DISPLAY_ORDER_APPRENTICE 30
 #define JOB_DISPLAY_ORDER_GARGOYLE 31
 
 #define JOB_DISPLAY_ORDER_GIOVANNI 32
@@ -156,7 +156,7 @@
 #define JOB_DISPLAY_ORDER_ZADRUGA 39
 
 #define JOB_DISPLAY_ORDER_SABBATDUCTUS 40
-#define JOB_DISPLAY_ORDER_SABBATPACK 41
+#define JOB_DISPLAY_ORDER_TRUE_SABBAT 41
 #define JOB_DISPLAY_ORDER_SABBATPRIEST 42
 
 #define JOB_DISPLAY_ORDER_COUNCIL 43

modular_darkpack/modules/jobs/code/camarilla/seneschal.dm

@@ -27,7 +27,7 @@
 	allowed_splats = list(SPLAT_KINDRED)
 	allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD)
 
-	known_contacts = list("Prince","Sheriff","Tremere Regent","Dealer","Primogens")
+	known_contacts = list("Prince","Sheriff","Harpy","Tremere Regent","Dealer","Primogens")
 
 /datum/outfit/job/vampire/clerk
 	name = "Seneschal"

modular_darkpack/modules/jobs/code/giovanni/capo.dm

@@ -19,6 +19,10 @@
 	allowed_splats = list(SPLAT_KINDRED)
 	allowed_clans = list(VAMPIRE_CLAN_GIOVANNI)
 
+	alt_titles = list(
+		"Capa"
+	)
+
 /datum/outfit/job/vampire/capo
 	name = "Capo"
 	jobtype = /datum/job/vampire/capo

modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm → modular_darkpack/modules/jobs/code/giovanni/socio.dm

@@ -1,11 +1,11 @@
-/datum/job/vampire/famiglia
-	title = JOB_LA_FAMIGLIA
+/datum/job/vampire/socio
+	title = JOB_SOCIO
 	faction = FACTION_CITY
 	total_positions = 10
 	spawn_positions = 10
 	supervisors = "the Family or your Spouse"
-	config_tag = "LA_FAMIGLIA"
-	outfit = /datum/outfit/job/vampire/famiglia
+	config_tag = "SOCIO"
+	outfit = /datum/outfit/job/vampire/socio
 	job_flags = CITY_JOB_FLAGS
 	display_order = JOB_DISPLAY_ORDER_GIOVANNI
 	exp_required_type_department = EXP_TYPE_GIOVANNI
@@ -15,17 +15,21 @@
 	)
 
 	allowed_splats = list(SPLAT_GHOUL, SPLAT_NONE, SPLAT_KINDRED)
-	allowed_clans = list(VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_LASOMBRA)
+	allowed_clans = list(VAMPIRE_CLAN_CAITIFF)
 	description = "Your family is a strange one. Maybe you are strange too, because sitting next to your great uncles as an equal is something you are greatly interested in."
 	minimal_masquerade = 0
 
-/datum/outfit/job/vampire/famiglia
-	name = "La Famiglia"
-	jobtype = /datum/job/vampire/famiglia
+	alt_titles = list(
+		"Socia"
+	)
+
+/datum/outfit/job/vampire/socio
+	name = "Socio"
+	jobtype = /datum/job/vampire/socio
 	glasses = /obj/item/clothing/glasses/vampire/sun
 	uniform = /obj/item/clothing/under/vampire/suit
 	suit = /obj/item/clothing/suit/vampire/trench
 	shoes = /obj/item/clothing/shoes/vampire
-	l_pocket = /obj/item/smartphone/giovanni_famiglia
+	l_pocket = /obj/item/smartphone/giovanni_socio
 	r_pocket = /obj/item/vamp/keys/giovanni
 	backpack_contents = list(/obj/item/card/credit=1)

modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm → modular_darkpack/modules/jobs/code/giovanni/soldato.dm

@@ -1,11 +1,11 @@
-/datum/job/vampire/squadra
-	title = JOB_LA_SQUADRA
+/datum/job/vampire/soldato
+	title = JOB_SOLDATO
 	faction = FACTION_CITY
 	total_positions = 10
 	spawn_positions = 10
 	supervisors = "the Family and the Traditions"
-	config_tag = "LA_SQUADRA"
-	outfit = /datum/outfit/job/vampire/squadra
+	config_tag = "SOLDATO"
+	outfit = /datum/outfit/job/vampire/soldato
 	job_flags = CITY_JOB_FLAGS
 	display_order = JOB_DISPLAY_ORDER_GIOVANNI
 	exp_required_type_department = EXP_TYPE_GIOVANNI
@@ -19,14 +19,18 @@
 	allowed_splats = list(SPLAT_KINDRED)
 	allowed_clans = list(VAMPIRE_CLAN_GIOVANNI)
 
-/datum/outfit/job/vampire/squadra
-	name = "La Squadra"
-	jobtype = /datum/job/vampire/squadra
+	alt_titles = list(
+		"Soldata"
+	)
+
+/datum/outfit/job/vampire/soldato
+	name = "Soldato"
+	jobtype = /datum/job/vampire/soldato
 
 	glasses = /obj/item/clothing/glasses/vampire/sun
 	uniform = /obj/item/clothing/under/vampire/suit
 	suit = /obj/item/clothing/suit/vampire/trench
 	shoes = /obj/item/clothing/shoes/vampire
-	l_pocket = /obj/item/smartphone/giovanni_squadra
+	l_pocket = /obj/item/smartphone/giovanni_soldato
 	r_pocket = /obj/item/vamp/keys/giovanni
 	backpack_contents = list(/obj/item/card/credit/rich=1, /obj/item/ritual_tome/necromancy=1)

modular_darkpack/modules/jobs/code/landmarks.dm

@@ -79,8 +79,8 @@ JOB_START_HELPER(law_enforcement/fbi, JOB_FEDERAL_INVESTIGATOR)
 	name = "generic hecata start"
 
 JOB_START_HELPER(hecata/capo, JOB_CAPO)
-JOB_START_HELPER(hecata/famiglia, JOB_LA_SQUADRA)
-JOB_START_HELPER(hecata/squadra, JOB_LA_FAMIGLIA)
+JOB_START_HELPER(hecata/soldato, JOB_SOLDATO)
+JOB_START_HELPER(hecata/socio, JOB_SOCIO)
 
 /* Civilian */
 /obj/effect/landmark/start/darkpack/citizen
@@ -98,7 +98,7 @@ JOB_START_HELPER(citizen/graveyardkeeper, JOB_GRAVEYARD_KEEPER)
 	name = "generic sabbat start"
 
 JOB_START_HELPER(sabbat/ductus, JOB_SABBAT_DUCTUS)
-JOB_START_HELPER(sabbat/pack, JOB_SABBAT_PACK)
+JOB_START_HELPER(sabbat/true_sabbat, JOB_TRUE_SABBAT)
 JOB_START_HELPER(sabbat/priest, JOB_SABBAT_PRIEST)
 JOB_START_HELPER(sabbat/sabbatist, JOB_SABBAT_SABBATIST)
 
@@ -107,7 +107,7 @@ JOB_START_HELPER(sabbat/sabbatist, JOB_SABBAT_SABBATIST)
 	name = "generic chantry start"
 
 JOB_START_HELPER(chantry/regent, JOB_CHANTRY_REGENT)
-JOB_START_HELPER(chantry/archivist, JOB_CHANTRY_ARCHIVIST)
+JOB_START_HELPER(chantry/apprentice, JOB_CHANTRY_APPRENTICE)
 JOB_START_HELPER(chantry/gargoyle, JOB_CHANTRY_GARGOYLE)
 
 /* Forest Wolves */

modular_darkpack/modules/jobs/code/sabbat/pack.dm

@@ -1,11 +1,11 @@
-/datum/job/vampire/sabbatpack
-	title = JOB_SABBAT_PACK
+/datum/job/vampire/true_sabbat
+	title = JOB_TRUE_SABBAT
 	faction = FACTION_CITY
 	total_positions = 5
 	spawn_positions = 5
 	supervisors = "Caine"
-	config_tag = "SABBAT_PACK"
-	outfit = /datum/outfit/job/vampire/sabbatpack
+	config_tag = "TRUE_SABBAT"
+	outfit = /datum/outfit/job/vampire/true_sabbat
 	job_flags = CITY_JOB_FLAGS
 	allowed_splats = list(SPLAT_KINDRED)
 	exp_required_type_department = EXP_TYPE_SABBAT
@@ -16,17 +16,17 @@
 
 	description = "You are a member of the Sabbat. You are charged with rebellion against the Elders and the Camarilla, against the Jyhad, against the Masquerade and the Traditions, and the recognition of Caine as the true Dark Father of all Kindred kind. NOTE: BY PLAYING THIS ROLE YOU AGREE TO AND HAVE READ THE SERVER'S RULES ON ESCALATION FOR ANTAGS. KEEP THINGS INTERESTING AND ENGAGING FOR BOTH SIDES. KILLING PLAYERS JUST BECAUSE YOU CAN MAY RESULT IN A ROLEBAN."
 	minimal_masquerade = 0
-	display_order = JOB_DISPLAY_ORDER_SABBATPACK
+	display_order = JOB_DISPLAY_ORDER_TRUE_SABBAT
 	whitelisted = TRUE
 
-/datum/outfit/job/vampire/sabbatpack
+/datum/outfit/job/vampire/true_sabbat
 	name = "Sabbat Pack"
-	jobtype = /datum/job/vampire/sabbatpack
+	jobtype = /datum/job/vampire/true_sabbat
 	l_pocket = /obj/item/smartphone
 	r_pocket = /obj/item/vamp/keys/sabbat
 	uses_default_clan_clothes = TRUE
 
-/datum/outfit/job/vampire/sabbatpack/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/vampire/true_sabbat/pre_equip(mob/living/carbon/human/H)
 	. = ..()
 	if(H.mind)
 		H.mind.add_antag_datum(/datum/antagonist/sabbatist)

modular_darkpack/modules/jobs/code/tremere/archivist.dm → modular_darkpack/modules/jobs/code/tremere/apprentice.dm

@@ -1,35 +1,40 @@
-/datum/job/vampire/archivist
-	title = JOB_CHANTRY_ARCHIVIST
+/datum/job/vampire/apprentice
+	title = JOB_CHANTRY_APPRENTICE
 	faction = FACTION_CITY
 	total_positions = 4
 	spawn_positions = 4
 	supervisors = SUPERVISOR_REGENT
-	config_tag = "CHANTRY_ARCHIVIST"
-	outfit = /datum/outfit/job/vampire/archivist
+	config_tag = "CHANTRY_APPRENTICE"
+	outfit = /datum/outfit/job/vampire/apprentice
 	job_flags = CITY_JOB_FLAGS
 	exp_required_type_department = EXP_TYPE_CHANTRY
 	department_for_prefs = /datum/job_department/chantry
 	departments_list = list(
 		/datum/job_department/chantry,
 	)
-	display_order = JOB_DISPLAY_ORDER_ARCHIVIST
+	display_order = JOB_DISPLAY_ORDER_APPRENTICE
 
 	description = "Keep a census of events and provide information to neonates. Listen to the Regent Carefully. Study blood magic and protect the chantry."
 	minimal_masquerade = 3
 	allowed_splats = list(SPLAT_KINDRED)
 	allowed_clans = list(VAMPIRE_CLAN_TREMERE)
 	known_contacts = list("Tremere Regent")
 
-/datum/outfit/job/vampire/archivist
-	name = "Archivist"
-	jobtype = /datum/job/vampire/archivist
+	alt_titles = list(
+		"Chantry Acolyte",
+		"Chantry Magister"
+	)
+
+/datum/outfit/job/vampire/apprentice
+	name = "Apprentice"
+	jobtype = /datum/job/vampire/apprentice
 
 	id = /obj/item/card/archive
 	glasses = /obj/item/clothing/glasses/vampire/perception
 	shoes = /obj/item/clothing/shoes/vampire
 	gloves = /obj/item/clothing/gloves/vampire/latex
 	uniform = /obj/item/clothing/under/vampire/archivist
 	r_pocket = /obj/item/vamp/keys/archive
-	l_pocket = /obj/item/smartphone/archivist
+	l_pocket = /obj/item/smartphone/tremere_apprentice
 	accessory = /obj/item/clothing/accessory/pocketprotector/full
 	backpack_contents = list(/obj/item/ritual_tome/arcane=1, /obj/item/card/credit=1, /obj/item/scythe/vamp=1)