diff --git a/code/__DEFINES/~darkpack/jobs.dm b/code/__DEFINES/~darkpack/jobs.dm index 74bec4e99341..d9f7e7a6bc0d 100644 --- a/code/__DEFINES/~darkpack/jobs.dm +++ b/code/__DEFINES/~darkpack/jobs.dm @@ -84,11 +84,11 @@ #define JOB_SUPPLY_TECH "Supply Technician" // Forest Wolves -#define JOB_GAROU_COUNCIL "Councillor" // Elder, Athro -#define JOB_GAROU_TRUTHCATCHER "Truthcatcher" // Adren+ -#define JOB_GAROU_WARDER "Warder" // Adren+ -#define JOB_GAROU_WYRMFOE "Wyrmfoe" // Fostern -#define JOB_GAROU_GUARDIAN "Guardian" +#define JOB_GAROU_COUNCIL "Sept Councillor" // Elder, Athro +#define JOB_GAROU_TRUTHCATCHER "Sept Truthcatcher" // Adren+ +#define JOB_GAROU_WARDER "Sept Warder" // Adren+ +#define JOB_GAROU_WYRMFOE "Sept Wyrmfoe" // Fostern +#define JOB_GAROU_GUARDIAN "Sept Guardian" // Pentex #define JOB_PENTEX_FIRST "First Team" diff --git a/modular_darkpack/modules/jobs/code/anarchs/baron.dm b/modular_darkpack/modules/jobs/code/anarchs/baron.dm index ca815fab1478..899a1d1b14b4 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/baron.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/baron.dm @@ -13,14 +13,14 @@ /datum/job_department/anarch, ) - known_contacts = list("Bouncer", "Emissary", "Sweeper", "Prince", "Sheriff") + known_contacts = list(JOB_BRUISER, JOB_EMISSARY, JOB_SWEEPER, JOB_TAPSTER, JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY, JOB_DEALER) allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) allowed_splats = list(SPLAT_KINDRED) description = "You lead the Anarchs in the City. A Camarilla faction that values freedom and individuality. While not a fan of the traditions, you still respect the Masquerade." minimum_masquerade = 3 /datum/outfit/job/vampire/baron - name = "Baron" + name = JOB_BARON jobtype = /datum/job/vampire/baron id = /obj/item/card/baron diff --git a/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm b/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm index cf0dad0a02e1..3cb71bab4688 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm @@ -24,14 +24,14 @@ "Molotov", ) - known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper") + known_contacts = list(JOB_BARON, JOB_TAPSTER, JOB_EMISSARY, JOB_SWEEPER) allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) allowed_splats = list(SPLAT_KINDRED) description = "You are the enforcer of the Anarchs. The baron is always in need of muscle power. Enforce the Traditions - in the anarch way." minimum_masquerade = 2 /datum/outfit/job/vampire/bruiser - name = "Bruiser" + name = JOB_BRUISER jobtype = /datum/job/vampire/bruiser id = /obj/item/card/bruiser diff --git a/modular_darkpack/modules/jobs/code/anarchs/emissary.dm b/modular_darkpack/modules/jobs/code/anarchs/emissary.dm index d2722725efdb..71572012c60e 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/emissary.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/emissary.dm @@ -13,14 +13,14 @@ /datum/job_department/anarch, ) - known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper", "Prince", "Sheriff") - allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) + known_contacts = list(JOB_BARON, JOB_BRUISER, JOB_SWEEPER, JOB_TAPSTER, JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY, JOB_DEALER) + allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_NAGARAJA) allowed_splats = list(SPLAT_KINDRED) description = "You are a diplomat for the anarchs. Make deals, keep the peace, all through words, not violence. But the latter may come to pass if the former fails." minimum_masquerade = 2 /datum/outfit/job/vampire/emissary - name = "emissary" + name = JOB_EMISSARY jobtype = /datum/job/vampire/emissary id = /obj/item/card/emissary diff --git a/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm b/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm index e2eceed65329..13a27fed57e7 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm @@ -13,14 +13,14 @@ /datum/job_department/anarch, ) - known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper") + known_contacts = list(JOB_BARON, JOB_BRUISER, JOB_EMISSARY, JOB_TAPSTER) allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) allowed_splats = list(SPLAT_KINDRED) description = "You are the observer of the anarchs. You watch out for any new kindred, suspicious individuals, and any new rumors near the anarch turf, and then report it to your anarchs." minimum_masquerade = 2 /datum/outfit/job/vampire/sweeper - name = "Sweeper" + name = JOB_SWEEPER jobtype = /datum/job/vampire/sweeper id = /obj/item/card/sweeper diff --git a/modular_darkpack/modules/jobs/code/anarchs/tapster.dm b/modular_darkpack/modules/jobs/code/anarchs/tapster.dm index c8bd0dba784d..f0b3479d94ce 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/tapster.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/tapster.dm @@ -23,14 +23,14 @@ "Waitress" ) - known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper") + known_contacts = list(JOB_BARON, JOB_BRUISER, JOB_EMISSARY, JOB_SWEEPER) allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL) splat_slots = list(SPLAT_NONE = 2, SPLAT_GHOUL = 2) description = "You are a bartender of the local biker hangout. Serve the eclectic clients that pass through, and try not to ask too many questions." minimum_masquerade = 0 /datum/outfit/job/vampire/tapster - name = "Tapster" + name = JOB_TAPSTER jobtype = /datum/job/vampire/tapster id = /obj/item/card/tapster diff --git a/modular_darkpack/modules/jobs/code/camarilla/harpy.dm b/modular_darkpack/modules/jobs/code/camarilla/harpy.dm index cb4053c3e849..4fcf598f153f 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/harpy.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/harpy.dm @@ -3,8 +3,8 @@ description = "You are an expert on the nightlife of Cainite society. Acting as one of the chief advisors on all things related to boons and diplomacy, the Prince defers quite the amount of judgement to you. Don't squander it." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA - total_positions = 3 - spawn_positions = 3 + total_positions = 1 + spawn_positions = 1 supervisors = SUPERVISOR_PRINCE config_tag = "HARPY" req_admin_notify = 1 @@ -21,17 +21,17 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 //Uncomment when players get exp enough + minimal_generation = 11 //Uncomment when players get exp enough minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) - known_contacts = list("Prince","Sheriff","Tremere Regent","Dealer","Emissary","Baron","Primogens") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_CHANTRY_REGENT, JOB_DEALER, JOB_EMISSARY, JOB_BARON, JOB_PRIMOGEN_BANU_HAQIM, JOB_PRIMOGEN_TOREADOR, JOB_PRIMOGEN_LASOMBRA, JOB_PRIMOGEN_MALKAVIAN, JOB_PRIMOGEN_VENTRUE, JOB_PRIMOGEN_NOSFERATU) - 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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) + allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA) /datum/outfit/job/vampire/harpy - name = "Harpy" + name = JOB_HARPY jobtype = /datum/job/vampire/harpy ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/hound.dm b/modular_darkpack/modules/jobs/code/camarilla/hound.dm index 203a5992d562..06f2395d08df 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/hound.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/hound.dm @@ -24,10 +24,10 @@ allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL) allowed_clans = list(VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, 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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) - known_contacts = list("Prince", "Sheriff") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL) /datum/outfit/job/vampire/hound - name = "Hound" + name = JOB_HOUND jobtype = /datum/job/vampire/hound ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/banu_haqim.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/banu_haqim.dm index 4816a28c0b25..55ea064b4b76 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/banu_haqim.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/banu_haqim.dm @@ -21,16 +21,16 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 - minimum_immortal_age = 50 + minimal_generation = 10 + minimum_immortal_age = 100 minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY) /datum/outfit/job/vampire/banuprim - name = "Primogen Banu Haqim" + name = JOB_PRIMOGEN_BANU_HAQIM jobtype = /datum/job/vampire/primogen_banu ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm index d5090b7b1ad3..ea77de8983f9 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm @@ -22,16 +22,16 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 - minimum_immortal_age = 50 + minimal_generation = 10 + minimum_immortal_age = 100 minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_LASOMBRA) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY) /datum/outfit/job/vampire/lasombraprim - name = "Primogen Lasombra" + name = JOB_PRIMOGEN_LASOMBRA jobtype = /datum/job/vampire/primogen_lasombra ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm index 174c2c996329..16c22d92d917 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm @@ -22,16 +22,16 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 - minimum_immortal_age = 5 // Actually Malkavian Primo is whoever showed for work that day. Crazy bunch. + minimal_generation = 10 + minimum_immortal_age = 50 // Actually Malkavian Primo is whoever showed for work that day. Crazy bunch. minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_DOMINATE_MALKAVIAN) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY) /datum/outfit/job/vampire/malkav - name = "Primogen Malkavian" + name = JOB_PRIMOGEN_MALKAVIAN jobtype = /datum/job/vampire/primogen_malkavian ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm index 9f5d30d84860..20e774fe62a8 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm @@ -22,16 +22,17 @@ /datum/job_department/city_services ) - minimal_generation = 12 - minimum_immortal_age = 15 + minimal_generation = 10 + minimum_immortal_age = 100 minimum_masquerade = 5 + allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_NOSFERATU) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY) /datum/outfit/job/vampire/nosferatu - name = "Primogen Nosferatu" + name = JOB_PRIMOGEN_NOSFERATU jobtype = /datum/job/vampire/primogen_nosferatu ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm index b9ccff0ea6e2..ac4dc483c7a5 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm @@ -22,16 +22,16 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 - minimum_immortal_age = 50 + minimal_generation = 10 + minimum_immortal_age = 100 minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_TOREADOR) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY) /datum/outfit/job/vampire/toreador - name = "Primogen Toreador" + name = JOB_PRIMOGEN_TOREADOR jobtype = /datum/job/vampire/primogen_toreador ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm index 2a4ae75592e8..23edaae3bb31 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm @@ -21,16 +21,16 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 - minimum_immortal_age = 50 + minimal_generation = 10 + minimum_immortal_age = 100 minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_VENTRUE) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HARPY) /datum/outfit/job/vampire/ventrue - name = "Primogen Ventrue" + name = JOB_PRIMOGEN_VENTRUE jobtype = /datum/job/vampire/primogen_ventrue ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/prince.dm b/modular_darkpack/modules/jobs/code/camarilla/prince.dm index e86b3edde072..e875b1b0b176 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/prince.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/prince.dm @@ -28,20 +28,26 @@ allowed_clans = list(VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER) known_contacts = list( - "Sheriff", - "Seneschal", - "Dealer", - "Tremere Regent", - "Primogens", - "Baron", - "Voivode" + JOB_SHERIFF, + JOB_SENESCHAL, + JOB_HARPY, + JOB_DEALER, + JOB_CHANTRY_REGENT, + JOB_PRIMOGEN_BANU_HAQIM, + JOB_PRIMOGEN_TOREADOR, + JOB_PRIMOGEN_LASOMBRA, + JOB_PRIMOGEN_MALKAVIAN, + JOB_PRIMOGEN_VENTRUE, + JOB_PRIMOGEN_NOSFERATU, + JOB_BARON, + JOB_VOIVODE ) /datum/job/vampire/prince/get_captaincy_announcement(mob/living/captain) return "Prince [captain.real_name] is in the city!" /datum/outfit/job/vampire/prince - name = "Prince" + name = JOB_PRINCE jobtype = /datum/job/vampire/prince ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm b/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm index b4d93e481a52..2fd2fe9c8be9 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm @@ -21,15 +21,15 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 + minimal_generation = 11 minimum_masquerade = 5 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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD) - known_contacts = list("Prince","Sheriff","Tremere Regent","Dealer","Primogens") + known_contacts = list(JOB_PRINCE,JOB_SHERIFF,JOB_CHANTRY_REGENT,JOB_DEALER,JOB_EMISSARY,JOB_BARON,JOB_PRIMOGEN_BANU_HAQIM,JOB_PRIMOGEN_TOREADOR,JOB_PRIMOGEN_LASOMBRA,JOB_PRIMOGEN_MALKAVIAN,JOB_PRIMOGEN_VENTRUE,JOB_PRIMOGEN_NOSFERATU) /datum/outfit/job/vampire/clerk - name = "Seneschal" + name = JOB_SENESCHAL jobtype = /datum/job/vampire/clerk ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm b/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm index ad4bd4741b58..2275ff743711 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm @@ -21,15 +21,15 @@ /datum/job_department/camarilla, ) - minimal_generation = 12 + minimal_generation = 11 minimum_masquerade = 5 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) - known_contacts = list("Prince","Seneschal","Dealer") + known_contacts = list(JOB_PRINCE,JOB_SENESCHAL,JOB_DEALER, JOB_HARPY, JOB_HOUND) /datum/outfit/job/vampire/sheriff - name = "Sheriff" + name = JOB_SHERIFF jobtype = /datum/job/vampire/sheriff ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm b/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm index 033b4c42a85c..ba0f87e9af2d 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm @@ -22,14 +22,15 @@ "Tower Personal Attendant" ) - known_contacts = list("Prince", "Sheriff", "Seneschal") + known_contacts = list(JOB_PRINCE, JOB_SHERIFF, JOB_SENESCHAL, JOB_HOUND) allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, 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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA) + splat_slots = list(SPLAT_KINDRED = 1) description = "You work directly for the Millenium Tower and its administrative staff in a variety of ways, you may even be a personal retainer of one of the top three, to the point that any oddities that you may see over night or hear are either things you are already aware or you simply laugh them off and try not to think about it." minimum_masquerade = 4 /datum/outfit/job/vampire/towerwork - name = "Tower Employee" + name = JOB_TOWERWORK jobtype = /datum/job/vampire/towerwork id = /obj/item/card/tower_employee diff --git a/modular_darkpack/modules/jobs/code/clinic/director.dm b/modular_darkpack/modules/jobs/code/clinic/director.dm index 4229413981c9..0b55c904b416 100644 --- a/modular_darkpack/modules/jobs/code/clinic/director.dm +++ b/modular_darkpack/modules/jobs/code/clinic/director.dm @@ -13,12 +13,13 @@ /datum/job_department/clinic, ) + known_contacts = list(JOB_DOCTOR) + description = "Keep Saint John's clinic up and running. Collect blood by helping mortals at the Clinic." - allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE) - allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_BAALI, 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_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA) + allowed_splats = list(SPLAT_GHOUL, SPLAT_NONE, SPLAT_KINFOLK) // Removed kindred, clinic director should be human as agreed by impromptu poll in #general. Head of the clinic, should be impartial etc etc. /datum/outfit/job/vampire/clinic_director - name = "Clinic Director" + name = JOB_CLINIC_DIRECTOR jobtype = /datum/job/vampire/clinic_director ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/clinic/doctor.dm b/modular_darkpack/modules/jobs/code/clinic/doctor.dm index 85a14831b9f9..288b3e12c659 100644 --- a/modular_darkpack/modules/jobs/code/clinic/doctor.dm +++ b/modular_darkpack/modules/jobs/code/clinic/doctor.dm @@ -14,10 +14,11 @@ /datum/job_department/clinic, ) + known_contacts = list(JOB_CLINIC_DIRECTOR, JOB_DOCTOR) + description = "Help your fellow kindred in all matters medicine related. Sell blood. Keep your human colleagues ignorant." - allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE) + allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE, SPLAT_GAROU, SPLAT_CORAX) allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_VENTRUE_ANTITRIBU, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA) - known_contacts = list("Clinic Director") alt_titles = list( "Doctor", @@ -34,7 +35,7 @@ /datum/outfit/job/vampire/clinic_doctor - name = "Doctor" + name = JOB_DOCTOR jobtype = /datum/job/vampire/doctor ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/garou/councillor.dm b/modular_darkpack/modules/jobs/code/garou/councillor.dm index 9bfc9dea083f..f8b0da1ba9f1 100644 --- a/modular_darkpack/modules/jobs/code/garou/councillor.dm +++ b/modular_darkpack/modules/jobs/code/garou/councillor.dm @@ -25,14 +25,14 @@ ) known_contacts = list( - "Truthcatcher", - "Warder", - "Wyrmfoe", - "Guardian" + JOB_GAROU_TRUTHCATCHER, + JOB_GAROU_WARDER, + JOB_GAROU_WYRMFOE, + JOB_GAROU_GUARDIAN ) /datum/outfit/job/vampire/councillor - name = "Sept Councillor" + name = JOB_GAROU_COUNCIL jobtype = /obj/item/card/park_ranger/oversight id = /obj/item/card/park_ranger/oversight diff --git a/modular_darkpack/modules/jobs/code/garou/guardian.dm b/modular_darkpack/modules/jobs/code/garou/guardian.dm index 23b2d8c18175..992efd78c2d1 100644 --- a/modular_darkpack/modules/jobs/code/garou/guardian.dm +++ b/modular_darkpack/modules/jobs/code/garou/guardian.dm @@ -25,14 +25,14 @@ ) known_contacts = list( - "Councillor", - "Truthcatcher", - "Warder", - "Wyrmfoe" + JOB_GAROU_COUNCIL, + JOB_GAROU_TRUTHCATCHER, + JOB_GAROU_WARDER, + JOB_GAROU_WYRMFOE ) /datum/outfit/job/vampire/guardian - name = "Sept Guardian" + name = JOB_GAROU_GUARDIAN jobtype = /datum/job/vampire/guardian id = /obj/item/card/park_ranger diff --git a/modular_darkpack/modules/jobs/code/garou/truthcatcher.dm b/modular_darkpack/modules/jobs/code/garou/truthcatcher.dm index c0f610d7e326..e2e511e7271c 100644 --- a/modular_darkpack/modules/jobs/code/garou/truthcatcher.dm +++ b/modular_darkpack/modules/jobs/code/garou/truthcatcher.dm @@ -26,14 +26,14 @@ ) known_contacts = list( - "Councillor", - "Warder", - "Wyrmfoe", - "Guardian" + JOB_GAROU_COUNCIL, + JOB_GAROU_WARDER, + JOB_GAROU_WYRMFOE, + JOB_GAROU_GUARDIAN ) /datum/outfit/job/vampire/trutchcatcher - name = "Sept Truthcatcher" + name = JOB_GAROU_TRUTHCATCHER jobtype = /datum/job/vampire/truthcatcher id = /obj/item/card/park_ranger/guide diff --git a/modular_darkpack/modules/jobs/code/garou/warder.dm b/modular_darkpack/modules/jobs/code/garou/warder.dm index 5d991a16154f..3c069a3b372f 100644 --- a/modular_darkpack/modules/jobs/code/garou/warder.dm +++ b/modular_darkpack/modules/jobs/code/garou/warder.dm @@ -26,14 +26,14 @@ ) known_contacts = list( - "Councillor", - "Truthcatcher", - "Wyrmfoe", - "Guardian" + JOB_GAROU_COUNCIL, + JOB_GAROU_TRUTHCATCHER, + JOB_GAROU_WYRMFOE, + JOB_GAROU_GUARDIAN ) /datum/outfit/job/vampire/warder - name = "Sept Warder" + name = JOB_GAROU_WARDER jobtype = /datum/job/vampire/warder id = /obj/item/card/park_ranger/leader diff --git a/modular_darkpack/modules/jobs/code/garou/wyrmfoe.dm b/modular_darkpack/modules/jobs/code/garou/wyrmfoe.dm index 30091dc9cb7d..3fec80d906c8 100644 --- a/modular_darkpack/modules/jobs/code/garou/wyrmfoe.dm +++ b/modular_darkpack/modules/jobs/code/garou/wyrmfoe.dm @@ -25,14 +25,14 @@ ) known_contacts = list( - "Councillor", - "Truthcatcher", - "Wyrmfoe", - "Guardian" + JOB_GAROU_COUNCIL, + JOB_GAROU_TRUTHCATCHER, + JOB_GAROU_WARDER, + JOB_GAROU_GUARDIAN ) /datum/outfit/job/vampire/wyrmfoe - name = "Sept Wyrmfoe" + name = JOB_GAROU_WYRMFOE jobtype = /datum/job/vampire/wyrmfoe id = /obj/item/card/park_ranger/biologist diff --git a/modular_darkpack/modules/jobs/code/giovanni/capo.dm b/modular_darkpack/modules/jobs/code/giovanni/capo.dm index 589e2881f17d..eaa9abd0ce54 100644 --- a/modular_darkpack/modules/jobs/code/giovanni/capo.dm +++ b/modular_darkpack/modules/jobs/code/giovanni/capo.dm @@ -13,13 +13,15 @@ /datum/job_department/giovanni, ) + known_contacts = list(JOB_LA_FAMIGLIA, JOB_LA_SQUADRA) + description = "Pure blood runs through your veins and, with it, old power. Throughout your long life you have learnt to hold onto two things and never let go: money, and family." minimum_masquerade = 0 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_GIOVANNI) /datum/outfit/job/vampire/capo - name = "Capo" + name = JOB_CAPO jobtype = /datum/job/vampire/capo glasses = /obj/item/clothing/glasses/vampire/sun diff --git a/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm b/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm index cad54bdf5ec3..f89d7f820ecf 100644 --- a/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm +++ b/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm @@ -13,13 +13,15 @@ /datum/job_department/giovanni, ) + known_contacts = list(JOB_CAPO, JOB_LA_SQUADRA) + allowed_splats = list(SPLAT_GHOUL, SPLAT_NONE, SPLAT_KINDRED) 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." minimum_masquerade = 0 /datum/outfit/job/vampire/famiglia - name = "La Famiglia" + name = JOB_LA_FAMIGLIA jobtype = /datum/job/vampire/famiglia glasses = /obj/item/clothing/glasses/vampire/sun uniform = /obj/item/clothing/under/vampire/suit diff --git a/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm b/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm index 7c8343e08c7e..38414db64a23 100644 --- a/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm +++ b/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm @@ -13,13 +13,15 @@ /datum/job_department/giovanni, ) + known_contacts = list(JOB_LA_FAMIGLIA, JOB_CAPO) + description = "Whether born or Embraced into the family, you are one of the Giovanni. Be you a necromancer, financier or lowly fledgling, remember that so long as you stand with your family, they too will stand with you." minimum_masquerade = 0 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_GIOVANNI) /datum/outfit/job/vampire/squadra - name = "La Squadra" + name = JOB_LA_SQUADRA jobtype = /datum/job/vampire/squadra glasses = /obj/item/clothing/glasses/vampire/sun diff --git a/modular_darkpack/modules/jobs/code/hunters/abbe.dm b/modular_darkpack/modules/jobs/code/hunters/abbe.dm index 508fbbe275c2..bf48dd61c468 100644 --- a/modular_darkpack/modules/jobs/code/hunters/abbe.dm +++ b/modular_darkpack/modules/jobs/code/hunters/abbe.dm @@ -15,10 +15,13 @@ departments_list = list( /datum/job_department/society_of_leopold, ) + + known_contacts = list(JOB_CONDOTTIERI, JOB_INQUISITOR, JOB_NOVICE) + allowed_splats = list(SPLAT_NONE) /datum/outfit/job/vampire/abbe - name = "Abbe" + name = JOB_ABBE jobtype = /datum/job/vampire/abbe id = /obj/item/card/hunter diff --git a/modular_darkpack/modules/jobs/code/hunters/condottieri.dm b/modular_darkpack/modules/jobs/code/hunters/condottieri.dm index ce5f1b242761..557b559b07d3 100644 --- a/modular_darkpack/modules/jobs/code/hunters/condottieri.dm +++ b/modular_darkpack/modules/jobs/code/hunters/condottieri.dm @@ -17,10 +17,12 @@ /datum/job_department/society_of_leopold, ) + known_contacts = list(JOB_ABBE, JOB_INQUISITOR, JOB_NOVICE) + allowed_splats = list(SPLAT_NONE) /datum/outfit/job/vampire/condottieri - name = "Condottieri" + name = JOB_CONDOTTIERI jobtype = /datum/job/vampire/condottieri id = /obj/item/card/hunter diff --git a/modular_darkpack/modules/jobs/code/hunters/inquisitor.dm b/modular_darkpack/modules/jobs/code/hunters/inquisitor.dm index 33d1b3796fe2..130707231d28 100644 --- a/modular_darkpack/modules/jobs/code/hunters/inquisitor.dm +++ b/modular_darkpack/modules/jobs/code/hunters/inquisitor.dm @@ -15,11 +15,14 @@ departments_list = list( /datum/job_department/society_of_leopold, ) - splat_slots = list(SPLAT_GHOUL = 1, SPLAT_KINFOLK = 1, SPLAT_NONE = 3) + + known_contacts = list(JOB_ABBE, JOB_CONDOTTIERI, JOB_NOVICE) + + splat_slots = list(SPLAT_GHOUL = 1, SPLAT_KINFOLK = 1) allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINFOLK) // infiltrators and betrayal arcs /datum/outfit/job/vampire/inquisitor - name = "Inquisitor" + name = JOB_INQUISITOR jobtype = /datum/job/vampire/inquisitor id = /obj/item/card/hunter diff --git a/modular_darkpack/modules/jobs/code/hunters/novice.dm b/modular_darkpack/modules/jobs/code/hunters/novice.dm index 598045ed4589..ba227bfb79a3 100644 --- a/modular_darkpack/modules/jobs/code/hunters/novice.dm +++ b/modular_darkpack/modules/jobs/code/hunters/novice.dm @@ -16,11 +16,14 @@ /datum/job_department/society_of_leopold, ) - allowed_splats = list(SPLAT_NONE) + known_contacts = list(JOB_ABBE, JOB_CONDOTTIERI, JOB_INQUISITOR) + + splat_slots = list(SPLAT_KINFOLK = 1) + allowed_splats = list(SPLAT_NONE, SPLAT_KINFOLK) // infiltrators and betrayal arcs /datum/outfit/job/vampire/novice - name = "Novice" + name = JOB_NOVICE jobtype = /datum/job/vampire/novice id = /obj/item/card/hunter diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm index ab47ee9cc53c..4f1b167c5b18 100644 --- a/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm +++ b/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm @@ -27,7 +27,7 @@ minimum_masquerade = 3 /datum/outfit/job/vampire/club_worker - name = "Stripper" + name = JOB_CLUB_WORKER jobtype = /datum/job/vampire/citizen l_pocket = /obj/item/smartphone r_pocket = /obj/item/vamp/keys/strip diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm index 82dcb43dee6e..a7e24cc510db 100644 --- a/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm +++ b/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm @@ -15,7 +15,7 @@ minimum_masquerade = 0 /datum/outfit/job/vampire/janitor - name = "Street Janitor" + name = JOB_STREET_JANITOR jobtype = /datum/job/vampire/janitor id = /obj/item/card/cleaning diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm index a5eeb52a6c8d..f1f0654e7bce 100644 --- a/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm +++ b/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm @@ -12,7 +12,8 @@ departments_list = list( /datum/job_department/church, ) - allowed_splats = list(SPLAT_NONE) + allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_KINDRED) + allowed_clans = list(VAMPIRE_CLAN_LASOMBRA) // They do religious shit don't @ me description = "Be the shepherd of the flock in " + CITY_NAME + ", lead them to salvation, piety and righteousness." alt_titles = list( @@ -28,7 +29,7 @@ ) /datum/outfit/job/vampire/priest - name = "Priest" + name = JOB_PRIEST jobtype = /datum/job/vampire/priest uniform = /obj/item/clothing/under/vampire/graveyard diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm index 4b85f3563910..f0c4a91be7c8 100644 --- a/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm +++ b/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm @@ -17,7 +17,7 @@ minimum_masquerade = 0 /datum/outfit/job/vampire/taxi - name = "Taxi Driver" + name = JOB_TAXI_DRIVER jobtype = /datum/job/vampire/taxi glasses = /obj/item/clothing/glasses/vampire/sun diff --git a/modular_darkpack/modules/jobs/code/pentex/affairs.dm b/modular_darkpack/modules/jobs/code/pentex/affairs.dm index eb7cbfb4dffc..73a397343dd8 100644 --- a/modular_darkpack/modules/jobs/code/pentex/affairs.dm +++ b/modular_darkpack/modules/jobs/code/pentex/affairs.dm @@ -19,7 +19,7 @@ allowed_splats = list(SPLAT_GAROU) minimum_masquerade = 5 // minimal_renown_rank = 3 - allowed_tribes = list(TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_RONIN) + allowed_tribes = list(TRIBE_BLACK_SPIRAL_DANCERS) display_order = JOB_DISPLAY_ORDER_AFFAIRS departments_list = list( @@ -29,7 +29,9 @@ known_contacts = list( JOB_PENTEX_LEAD, JOB_PENTEX_EXEC, - JOB_PENTEX_SEC_CHIEF + JOB_PENTEX_SEC_CHIEF, + JOB_PENTEX_EMPLOYEE, + JOB_PENTEX_SEC ) paycheck = PAYCHECK_COMMAND diff --git a/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm b/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm index 7a56cc10c5c8..3126dbca4c41 100644 --- a/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm +++ b/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm @@ -35,7 +35,9 @@ known_contacts = list( JOB_PENTEX_EXEC, JOB_PENTEX_AFFAIRS, - JOB_PENTEX_SEC_CHIEF + JOB_PENTEX_SEC_CHIEF, + JOB_PENTEX_EMPLOYEE, + JOB_PENTEX_SEC ) paycheck = PAYCHECK_COMMAND diff --git a/modular_darkpack/modules/jobs/code/pentex/employee.dm b/modular_darkpack/modules/jobs/code/pentex/employee.dm index d5640e0e6a67..e1da3ae704a5 100644 --- a/modular_darkpack/modules/jobs/code/pentex/employee.dm +++ b/modular_darkpack/modules/jobs/code/pentex/employee.dm @@ -35,7 +35,9 @@ known_contacts = list( JOB_PENTEX_LEAD, JOB_PENTEX_EXEC, - JOB_PENTEX_AFFAIRS + JOB_PENTEX_AFFAIRS, + JOB_PENTEX_SEC_CHIEF, + JOB_PENTEX_SEC ) paycheck = PAYCHECK_CREW diff --git a/modular_darkpack/modules/jobs/code/pentex/executive.dm b/modular_darkpack/modules/jobs/code/pentex/executive.dm index 6f4cfc3bdca8..e3ab3d3868a5 100644 --- a/modular_darkpack/modules/jobs/code/pentex/executive.dm +++ b/modular_darkpack/modules/jobs/code/pentex/executive.dm @@ -28,7 +28,7 @@ "Endron Chief Financial Officer" ) - allowed_splats = list(SPLAT_GAROU, SPLAT_KINDRED) + allowed_splats = list(SPLAT_GAROU, SPLAT_NONE, SPLAT_KINFOLK, SPLAT_GHOUL, SPLAT_KINDRED) minimum_masquerade = 4 // minimal_renown_rank = 3 allowed_tribes = list(TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_RONIN) @@ -41,7 +41,9 @@ known_contacts = list( JOB_PENTEX_LEAD, JOB_PENTEX_AFFAIRS, - JOB_PENTEX_SEC_CHIEF + JOB_PENTEX_SEC_CHIEF, + JOB_PENTEX_EMPLOYEE, + JOB_PENTEX_SEC ) paycheck = PAYCHECK_COMMAND diff --git a/modular_darkpack/modules/jobs/code/pentex/sec.dm b/modular_darkpack/modules/jobs/code/pentex/sec.dm index ac8318a934b7..4fe20cab94e9 100644 --- a/modular_darkpack/modules/jobs/code/pentex/sec.dm +++ b/modular_darkpack/modules/jobs/code/pentex/sec.dm @@ -28,7 +28,8 @@ JOB_PENTEX_LEAD, JOB_PENTEX_EXEC, JOB_PENTEX_AFFAIRS, - JOB_PENTEX_SEC_CHIEF + JOB_PENTEX_SEC_CHIEF, + JOB_PENTEX_EMPLOYEE ) paycheck = PAYCHECK_CREW diff --git a/modular_darkpack/modules/jobs/code/pentex/secchief.dm b/modular_darkpack/modules/jobs/code/pentex/secchief.dm index fa07dde36ab6..ad31a91ba6c2 100644 --- a/modular_darkpack/modules/jobs/code/pentex/secchief.dm +++ b/modular_darkpack/modules/jobs/code/pentex/secchief.dm @@ -16,7 +16,7 @@ job_flags = CITY_JOB_FLAGS outfit = /datum/outfit/job/vampire/secchief - allowed_splats = list(SPLAT_GAROU, SPLAT_KINDRED) + allowed_splats = list(SPLAT_GAROU, SPLAT_KINDRED, SPLAT_KINFOLK, SPLAT_GHOUL, SPLAT_NONE) minimum_masquerade = 4 // minimal_renown_rank = 3 allowed_tribes = list(TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_RONIN) @@ -29,7 +29,9 @@ known_contacts = list( JOB_PENTEX_LEAD, JOB_PENTEX_EXEC, - JOB_PENTEX_AFFAIRS + JOB_PENTEX_AFFAIRS, + JOB_PENTEX_EMPLOYEE, + JOB_PENTEX_SEC ) paycheck = PAYCHECK_COMMAND @@ -38,7 +40,7 @@ liver_traits = list(TRAIT_ROYAL_METABOLISM) /datum/outfit/job/vampire/secchief - name = "Endron Chief of Security" + name = JOB_PENTEX_SEC_CHIEF jobtype = /datum/job/vampire/secchief // ears = /obj/item/p25radio diff --git a/modular_darkpack/modules/jobs/code/police/captain.dm b/modular_darkpack/modules/jobs/code/police/captain.dm index f3a4db76409b..65ded14c3d58 100644 --- a/modular_darkpack/modules/jobs/code/police/captain.dm +++ b/modular_darkpack/modules/jobs/code/police/captain.dm @@ -17,9 +17,11 @@ description = "Underpaid, overworked, and understrength. Do your best to keep the order in " + CITY_NAME + ". Keep the officers in line." minimum_masquerade = 0 + known_contacts = list(JOB_POLICE_SERGEANT, JOB_EMERGENCY_DISPATCHER, JOB_FEDERAL_INVESTIGATOR) + /datum/outfit/job/vampire/police_captain - name = "Police Captain" + name = JOB_POLICE_CAPTAIN jobtype = /datum/job/vampire/police_captain ears = /obj/item/radio/headset/darkpack/police diff --git a/modular_darkpack/modules/jobs/code/police/dispatcher.dm b/modular_darkpack/modules/jobs/code/police/dispatcher.dm index 822a5b67cc21..207d21194eff 100644 --- a/modular_darkpack/modules/jobs/code/police/dispatcher.dm +++ b/modular_darkpack/modules/jobs/code/police/dispatcher.dm @@ -14,15 +14,14 @@ /datum/job_department/clinic, ) - allowed_splats = list(SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE) - splat_slots = list(SPLAT_GHOUL = 1, SPLAT_KINFOLK = 1) + allowed_splats = list(SPLAT_NONE) description = "Report emergencies to the correct emergency service." minimum_masquerade = 0 - known_contacts = list("Police Captain") + known_contacts = list(JOB_POLICE_CAPTAIN, JOB_POLICE_SERGEANT) /datum/outfit/job/vampire/dispatcher - name = "Dispatcher" + name = JOB_EMERGENCY_DISPATCHER jobtype = /datum/job/vampire/dispatcher uniform = /obj/item/clothing/under/vampire/office ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/police/fbi.dm b/modular_darkpack/modules/jobs/code/police/fbi.dm index 75b247a8b663..8dbd0eab1d8e 100644 --- a/modular_darkpack/modules/jobs/code/police/fbi.dm +++ b/modular_darkpack/modules/jobs/code/police/fbi.dm @@ -13,14 +13,19 @@ /datum/job_department/police, ) + alt_titles = list( + "Federal Investigator", + "SAD Officer", + "Project Twilight Operative", + "FIRSTLIGHT Analyst", + ) + allowed_splats = list(SPLAT_NONE) description = "Enforce the Law." - minimum_masquerade = 0 - - known_contacts = list("Police Captain") + minimum_masquerade = 3 /datum/outfit/job/vampire/fbi - name = "Federal Investigator" + name = JOB_FEDERAL_INVESTIGATOR jobtype = /datum/job/vampire/fbi ears = /obj/item/radio/headset/darkpack/police diff --git a/modular_darkpack/modules/jobs/code/police/police.dm b/modular_darkpack/modules/jobs/code/police/police.dm index 11e2fb127123..aced9c3636f8 100644 --- a/modular_darkpack/modules/jobs/code/police/police.dm +++ b/modular_darkpack/modules/jobs/code/police/police.dm @@ -20,15 +20,15 @@ ) allowed_splats = list(SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE) - splat_slots = list(SPLAT_GHOUL = 2, SPLAT_KINFOLK = 2) + splat_slots = list(SPLAT_GHOUL = 1, SPLAT_KINFOLK = 1) // Infiltrators, normal humans shouldn't be outnumbered in their own police department. description = "Enforce the Law." minimum_masquerade = 0 - known_contacts = list("Police Captain") + known_contacts = list(JOB_POLICE_CAPTAIN, JOB_POLICE_SERGEANT, JOB_EMERGENCY_DISPATCHER) /datum/outfit/job/vampire/police_officer - name = "Police Officer" + name = JOB_POLICE_OFFICER jobtype = /datum/job/vampire/police_officer ears = /obj/item/radio/headset/darkpack/police diff --git a/modular_darkpack/modules/jobs/code/police/sergeant.dm b/modular_darkpack/modules/jobs/code/police/sergeant.dm index f88bb12b754a..5ee63f28cdd8 100644 --- a/modular_darkpack/modules/jobs/code/police/sergeant.dm +++ b/modular_darkpack/modules/jobs/code/police/sergeant.dm @@ -20,15 +20,15 @@ "Detective", ) - allowed_splats = list(SPLAT_GHOUL, SPLAT_NONE) + allowed_splats = list(SPLAT_NONE) description = "Enforce the law. Keep the officers in line. Follow what the Captain says." minimum_masquerade = 0 - known_contacts = list("Police Captain") + known_contacts = list(JOB_POLICE_CAPTAIN, JOB_EMERGENCY_DISPATCHER) /datum/outfit/job/vampire/police_sergeant - name = "Police Sergeant" + name = JOB_POLICE_SERGEANT jobtype = /datum/job/vampire/police_sergeant ears = /obj/item/radio/headset/darkpack/police diff --git a/modular_darkpack/modules/jobs/code/sabbat/ductus.dm b/modular_darkpack/modules/jobs/code/sabbat/ductus.dm index 54320a1261a2..9b31e43eee40 100644 --- a/modular_darkpack/modules/jobs/code/sabbat/ductus.dm +++ b/modular_darkpack/modules/jobs/code/sabbat/ductus.dm @@ -17,11 +17,14 @@ display_order = JOB_DISPLAY_ORDER_SABBATDUCTUS whitelisted = TRUE + known_contacts = list(JOB_SABBAT_PACK, JOB_SABBAT_PRIEST) + + /datum/antagonist/sabbatist/ductus antag_hud_name = "ductus_priest" /datum/outfit/job/vampire/sabbatductus - name = "Sabbat Ductus" + name = JOB_SABBAT_DUCTUS jobtype = /datum/job/vampire/sabbatductus l_pocket = /obj/item/smartphone r_pocket = /obj/item/vamp/keys/sabbat diff --git a/modular_darkpack/modules/jobs/code/sabbat/pack.dm b/modular_darkpack/modules/jobs/code/sabbat/pack.dm index 31a647b54c1b..42bdb4ab4d81 100644 --- a/modular_darkpack/modules/jobs/code/sabbat/pack.dm +++ b/modular_darkpack/modules/jobs/code/sabbat/pack.dm @@ -18,8 +18,11 @@ display_order = JOB_DISPLAY_ORDER_SABBATPACK whitelisted = TRUE + known_contacts = list(JOB_SABBAT_DUCTUS, JOB_SABBAT_PRIEST) + + /datum/outfit/job/vampire/sabbatpack - name = "Sabbat Pack" + name = JOB_SABBAT_PACK jobtype = /datum/job/vampire/sabbatpack l_pocket = /obj/item/smartphone r_pocket = /obj/item/vamp/keys/sabbat diff --git a/modular_darkpack/modules/jobs/code/sabbat/priest.dm b/modular_darkpack/modules/jobs/code/sabbat/priest.dm index 208b076c0927..fbf53dfe4180 100644 --- a/modular_darkpack/modules/jobs/code/sabbat/priest.dm +++ b/modular_darkpack/modules/jobs/code/sabbat/priest.dm @@ -18,8 +18,11 @@ display_order = JOB_DISPLAY_ORDER_SABBATPRIEST whitelisted = TRUE + known_contacts = list(JOB_SABBAT_DUCTUS, JOB_SABBAT_PACK) + + /datum/outfit/job/vampire/sabbatpriest - name = "Sabbat Priest" + name = JOB_SABBAT_PRIEST jobtype = /datum/job/vampire/sabbatpriest l_pocket = /obj/item/smartphone r_pocket = /obj/item/vamp/keys/sabbat diff --git a/modular_darkpack/modules/jobs/code/sabbat/sabbat.dm b/modular_darkpack/modules/jobs/code/sabbat/sabbat.dm index 2868d0a58a05..60d3c0595ca6 100644 --- a/modular_darkpack/modules/jobs/code/sabbat/sabbat.dm +++ b/modular_darkpack/modules/jobs/code/sabbat/sabbat.dm @@ -20,7 +20,7 @@ H.forceMove(D.loc) /datum/antagonist/sabbatist - name = "Sabbatist" + name = JOB_SABBAT_SABBATIST roundend_category = "sabbattites" antagpanel_category = FACTION_SABBAT pref_flag = ROLE_SABBAT diff --git a/modular_darkpack/modules/jobs/code/supply/dealer.dm b/modular_darkpack/modules/jobs/code/supply/dealer.dm index 66bf314be100..fff860a2370c 100644 --- a/modular_darkpack/modules/jobs/code/supply/dealer.dm +++ b/modular_darkpack/modules/jobs/code/supply/dealer.dm @@ -1,8 +1,8 @@ /datum/job/vampire/dealer title = "Dealer" faction = FACTION_CITY - total_positions = 2 - spawn_positions = 2 + total_positions = 1 + spawn_positions = 1 supervisors = "nobody. You are beholden only to yourself." config_tag = "DEALER" job_flags = CITY_JOB_FLAGS @@ -14,14 +14,13 @@ /datum/job_department/supply, ) - known_contacts = list("Prince", "Seneschal", "Sheriff", "Baron") - allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_GAROU, SPLAT_NONE) - splat_slots = list(SPLAT_NONE = 1) + known_contacts = list(JOB_PRINCE, JOB_SENESCHAL, JOB_SHERIFF, JOB_BARON, JOB_SUPPLY_TECH, JOB_HARPY, JOB_EMISSARY) + allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_GAROU, SPLAT_NONE, SPLAT_KINFOLK, SPLAT_CORAX) description = "You provide both legal and illegal supplies to those that get busy during the night. You are your own person yet you know people are out for you. Time to buckle in..." - minimum_masquerade = 0 + minimum_masquerade = 3 /datum/outfit/job/vampire/dealer - name = "Dealer" + name = JOB_DEALER jobtype = /datum/job/vampire/dealer uniform = /obj/item/clothing/under/vampire/suit shoes = /obj/item/clothing/shoes/vampire/jackboots diff --git a/modular_darkpack/modules/jobs/code/supply/supply_tech.dm b/modular_darkpack/modules/jobs/code/supply/supply_tech.dm index 9b3785d86209..705d84b3ee5c 100644 --- a/modular_darkpack/modules/jobs/code/supply/supply_tech.dm +++ b/modular_darkpack/modules/jobs/code/supply/supply_tech.dm @@ -18,8 +18,11 @@ description = "You work at the warehouse, moving boxes and selling not-quite legal goods to anyone who has the money." minimum_masquerade = 0 + known_contacts = list(JOB_DEALER) + + /datum/outfit/job/vampire/supply_tech - name = "Supply Technician" + name = JOB_SUPPLY_TECH jobtype = /datum/job/vampire/supply uniform = /obj/item/clothing/under/vampire/suit shoes = /obj/item/clothing/shoes/vampire/jackboots diff --git a/modular_darkpack/modules/jobs/code/tremere/archivist.dm b/modular_darkpack/modules/jobs/code/tremere/archivist.dm index 206e8da85768..6bde82cda33d 100644 --- a/modular_darkpack/modules/jobs/code/tremere/archivist.dm +++ b/modular_darkpack/modules/jobs/code/tremere/archivist.dm @@ -17,10 +17,10 @@ minimum_masquerade = 3 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_TREMERE) - known_contacts = list("Tremere Regent") + known_contacts = list(JOB_CHANTRY_REGENT, JOB_CHANTRY_GARGOYLE) /datum/outfit/job/vampire/archivist - name = "Archivist" + name = JOB_CHANTRY_ARCHIVIST jobtype = /datum/job/vampire/archivist id = /obj/item/card/archive diff --git a/modular_darkpack/modules/jobs/code/tremere/gargoyle.dm b/modular_darkpack/modules/jobs/code/tremere/gargoyle.dm index 76bd71d692cd..f3fdfc645350 100644 --- a/modular_darkpack/modules/jobs/code/tremere/gargoyle.dm +++ b/modular_darkpack/modules/jobs/code/tremere/gargoyle.dm @@ -17,10 +17,10 @@ minimum_masquerade = 3 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_GARGOYLE) - known_contacts = list("Tremere Regent") + known_contacts = list(JOB_CHANTRY_REGENT, JOB_CHANTRY_ARCHIVIST) /datum/outfit/job/vampire/gargoyle - name = "Chantry Gargoyle" + name = JOB_CHANTRY_GARGOYLE jobtype = /datum/job/vampire/gargoyle id = /obj/item/card/archive glasses = /obj/item/clothing/glasses/vampire/red diff --git a/modular_darkpack/modules/jobs/code/tremere/regent.dm b/modular_darkpack/modules/jobs/code/tremere/regent.dm index 199672b1d445..173bd7524a34 100644 --- a/modular_darkpack/modules/jobs/code/tremere/regent.dm +++ b/modular_darkpack/modules/jobs/code/tremere/regent.dm @@ -18,10 +18,10 @@ allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_TREMERE) - known_contacts = list("Prince") + known_contacts = list(JOB_PRINCE, JOB_CHANTRY_GARGOYLE, JOB_CHANTRY_ARCHIVIST, JOB_SHERIFF, JOB_SENESCHAL) /datum/outfit/job/vampire/regent - name = "Chantry Regent" + name = JOB_CHANTRY_REGENT jobtype = /datum/job/vampire/regent id = /obj/item/card/regent diff --git a/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm b/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm index aaefca1e7fd8..01b8e23b579e 100644 --- a/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm +++ b/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm @@ -20,10 +20,10 @@ description = "Whether you are of Voivode-in-Waiting's blood or if you've been honored, you are one of the Kin of the Voivode. Protect your Family, as your Family would protect you." minimum_masquerade = 2 - known_contacts = list("Prince", "Baron", "Sheriff") + known_contacts = list(JOB_PRINCE, JOB_BARON, JOB_SHERIFF, JOB_VOIVODE, JOB_ZADRUGA) /datum/outfit/job/vampire/bogatyr - name = "Bogatyr" + name = JOB_BOGATYR jobtype = /datum/job/vampire/bogatyr id = /obj/item/card/bogatyr glasses = /obj/item/clothing/glasses/vampire/yellow diff --git a/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm b/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm index 04e23fc24691..b9fb1f85ceb9 100644 --- a/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm +++ b/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm @@ -19,10 +19,10 @@ description = "You are a Childe of the Voivode-in-Waiting, the ancient Tzimisce Elder who has rested beneath the Earth for an age longer than the city that now rests on their bones. Honor them in all your actions, and remember that you walk with their favor." minimum_masquerade = 2 - known_contacts = list("Prince", "Baron", "Sheriff") + known_contacts = list(JOB_PRINCE, JOB_BARON, JOB_SHERIFF, JOB_BOGATYR, JOB_ZADRUGA) /datum/outfit/job/vampire/voivode - name = "Voivode" + name = JOB_VOIVODE jobtype = /datum/job/vampire/voivode id = /obj/item/card/voivode glasses = /obj/item/clothing/glasses/vampire/yellow diff --git a/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm b/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm index 800ebfe43bc2..6fc94a40f398 100644 --- a/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm +++ b/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm @@ -17,10 +17,10 @@ description = "You were born in servitude to the Master of the Manor: your father served the Voivode, as did his father. Now, you carry their blood, and with it their responsibilities." minimum_masquerade = 2 - known_contacts = list("Prince", "Baron", "Sheriff") + known_contacts = list(JOB_PRINCE, JOB_BARON, JOB_SHERIFF, JOB_BOGATYR, JOB_VOIVODE) /datum/outfit/job/vampire/zadruga - name = "Zadruga" + name = JOB_ZADRUGA jobtype = /datum/job/vampire/zadruga id = /obj/item/card/bogatyr glasses = /obj/item/clothing/glasses/vampire/yellow