diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index a0b1cb4afa12..a3cac811b145 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -3473,8 +3473,8 @@ /obj/structure/vampdoor/prison{ dir = 8 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/master, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "cbT" = ( @@ -5251,8 +5251,8 @@ /obj/structure/vampdoor/reinf{ dir = 8 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/plating/stone, /area/vtm/interior/voivodate/sanctum) "daK" = ( @@ -12237,8 +12237,8 @@ /area/vtm/interior/ghetto) "heH" = ( /obj/structure/vampdoor/reinf, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/master, /turf/open/floor/wood/smooth, /area/vtm/interior/voivodate) "heM" = ( @@ -13017,6 +13017,17 @@ /obj/effect/turf_decal/bordur, /turf/open/floor/plating/sidewalk/old, /area/vtm/interior/hotel) +"hEY" = ( +/obj/effect/turf_decal/bordur{ + dir = 1 + }, +/obj/structure/vampdoor/reinf{ + dir = 8 + }, +/obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate, +/turf/open/floor/city/plating_mono, +/area/vtm/interior/voivodate/sanctum) "hFd" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -13173,8 +13184,8 @@ /obj/structure/vampdoor/reinf{ dir = 8 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/plating/sidewalk/old, /area/vtm/interior/voivodate/sanctum) "hJu" = ( @@ -14725,8 +14736,8 @@ /obj/structure/vampdoor/reinf{ dir = 8 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "izL" = ( @@ -15210,6 +15221,15 @@ /obj/structure/coclock, /turf/open/floor/city/plating, /area/vtm/interior/museum) +"iSq" = ( +/obj/effect/turf_decal/bordur, +/obj/structure/vampdoor/reinf{ + dir = 8 + }, +/obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate, +/turf/open/floor/city/plating_mono, +/area/vtm/interior/voivodate/sanctum) "iSP" = ( /obj/effect/turf_decal/siding/white/corner{ color = "#570090" @@ -16759,8 +16779,8 @@ /area/vtm/interior/gang) "jNQ" = ( /obj/structure/vampdoor/prison, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "jNV" = ( @@ -21636,8 +21656,8 @@ /area/vtm/interior/endron_facility/restricted) "mIw" = ( /obj/structure/vampdoor/prison, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/plating/stone, /area/vtm/interior/voivodate/sanctum) "mIC" = ( @@ -23775,8 +23795,8 @@ dir = 4 }, /obj/structure/vampdoor/reinf, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "nXv" = ( @@ -25583,8 +25603,8 @@ dir = 1 }, /obj/structure/vampdoor/oldwood, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate) "oVN" = ( @@ -32568,8 +32588,8 @@ dir = 8 }, /obj/structure/vampdoor/reinf, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "sPw" = ( @@ -37270,8 +37290,8 @@ /obj/structure/vampdoor/reinf{ dir = 4 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/wood/smooth/old, /area/vtm/interior/voivodate) "vws" = ( @@ -38203,8 +38223,8 @@ /obj/structure/vampdoor/prison{ dir = 8 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/master, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "wcF" = ( @@ -38748,8 +38768,8 @@ /obj/structure/vampdoor/reinf{ dir = 8 }, -/obj/effect/mapping_helpers/door/access/voivodate_master, /obj/effect/mapping_helpers/door/lock, +/obj/effect/mapping_helpers/door/access/voivodate/advanced, /turf/open/floor/city/plating_mono, /area/vtm/interior/voivodate/sanctum) "wuR" = ( @@ -88651,8 +88671,8 @@ tBB tBB tBB tBB -izK -wuQ +hEY +iSq tBB tBB tBB diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index c91f00eb2313..3e801a5b1e99 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -29,6 +29,8 @@ #define JOB_UNAVAILABLE_KINDRED_CLAN 15 #define JOB_UNAVAILABLE_FERA_TRIBE 16 #define JOB_UNAVAILABLE_FERA_AUSPICE 17 +#define JOB_UNAVAILABLE_CLAN_SLOTS 18 // APOC EDIT START +#define JOB_UNAVAILABLE_TRIBE_SLOTS 19 // APOC EDIT END // DARKPACK EDIT ADD END diff --git a/code/__DEFINES/~darkpack/factions.dm b/code/__DEFINES/~darkpack/factions.dm index edfa94b41185..a4b24c493ce0 100644 --- a/code/__DEFINES/~darkpack/factions.dm +++ b/code/__DEFINES/~darkpack/factions.dm @@ -5,6 +5,7 @@ #define FACTION_CAMARILLA "camarilla" #define FACTION_SABBAT "sabbat" #define FACTION_GIOVANNI "giovanni-faction" +#define FACTION_VOIVODATE "seers-voivodate" // City faction #define FACTION_CITY "city" diff --git a/code/__DEFINES/~darkpack/jobs.dm b/code/__DEFINES/~darkpack/jobs.dm index 3bf0605aee87..e1b64e580977 100644 --- a/code/__DEFINES/~darkpack/jobs.dm +++ b/code/__DEFINES/~darkpack/jobs.dm @@ -26,16 +26,17 @@ #define JOB_TOWERWORK "Tower Employee" //Primogens -#define JOB_PRIMOGEN_TOREADOR "Primogen Toreador" -#define JOB_PRIMOGEN_BANU_HAQIM "Primogen Banu Haqim" -#define JOB_PRIMOGEN_LASOMBRA "Primogen Lasombra" -#define JOB_PRIMOGEN_MALKAVIAN "Primogen Malkavian" -#define JOB_PRIMOGEN_NOSFERATU "Primogen Nosferatu" -#define JOB_PRIMOGEN_VENTRUE "Primogen Ventrue" +#define JOB_PRIMOGEN_TOREADOR "Toreador Primogen" +#define JOB_PRIMOGEN_BANU_HAQIM "Banu Haqim Primogen" +#define JOB_PRIMOGEN_LASOMBRA "Lasombra Primogen" +#define JOB_PRIMOGEN_MALKAVIAN "Malkavian Primogen" +#define JOB_PRIMOGEN_NOSFERATU "Nosferatu Primogen" +#define JOB_PRIMOGEN_VENTRUE "Ventrue Primogen" +#define JOB_PRIMOGEN_DUSKBORN "Duskborn Primogen" // APOC EDIT CHANGE - JOBS //Anarch #define JOB_BARON "Baron" -#define JOB_TAPSTER "The Anarchy Rose Employee" // APOC EDIT CHANGE - JOBS +#define JOB_TAPSTER "Retinue" // APOC EDIT CHANGE - JOBS #define JOB_BRUISER "Bruiser" #define JOB_EMISSARY "Emissary" #define JOB_SWEEPER "Sweeper" @@ -60,7 +61,7 @@ #define JOB_FEDERAL_INVESTIGATOR "Federal Investigator" //Clinic -#define JOB_CLINIC_DIRECTOR "Clinic Director" +#define JOB_CLINIC_DIRECTOR "Senior Doctor" #define JOB_DOCTOR "Doctor" //Church @@ -122,6 +123,7 @@ #define JOB_DISPLAY_ORDER_NOSFERATU 10 #define JOB_DISPLAY_ORDER_TOREADOR 11 #define JOB_DISPLAY_ORDER_VENTRUE 12 +#define JOB_DISPLAY_ORDER_DUSKBORN 13 #define JOB_DISPLAY_ORDER_CLINICS_DIRECTOR 1 #define JOB_DISPLAY_ORDER_DOCTOR 2 @@ -136,10 +138,11 @@ #define JOB_DISPLAY_ORDER_BARON 1 #define JOB_DISPLAY_ORDER_EMISSARY 2 -#define JOB_DISPLAY_ORDER_SWEEPER 3 -#define JOB_DISPLAY_ORDER_BRUISER 4 -#define JOB_DISPLAY_ORDER_LIAISON 5 -#define JOB_DISPLAY_ORDER_TAPSTER 6 +#define JOB_DISPLAY_ORDER_REEVE 3 +#define JOB_DISPLAY_ORDER_SWEEPER 4 +#define JOB_DISPLAY_ORDER_BRUISER 5 +#define JOB_DISPLAY_ORDER_LIAISON 6 +#define JOB_DISPLAY_ORDER_TAPSTER 7 #define JOB_DISPLAY_ORDER_REGENT 1 #define JOB_DISPLAY_ORDER_ARCHIVIST 2 diff --git a/code/__DEFINES/~darkpack/lock_access_defines.dm b/code/__DEFINES/~darkpack/lock_access_defines.dm index 12d6d17fdfdc..0d67c1da5926 100644 --- a/code/__DEFINES/~darkpack/lock_access_defines.dm +++ b/code/__DEFINES/~darkpack/lock_access_defines.dm @@ -4,6 +4,8 @@ #define LOCKACCESS_PRINCE "prince" #define LOCKACCESS_PRIMOGEN "primogen" +#define LOCKACCESS_DUSKBORN_PRIMOGEN "duskborn" + #define LOCKACCESS_BANU "banuhaqim" #define LOCKACCESS_BANU_PRIMOGEN "primBanu" diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 8dd28a795465..47608cd24eba 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -258,6 +258,33 @@ SUBSYSTEM_DEF(job) player.mind.set_assigned_role(job) unassigned -= player job.current_positions++ + // APOC EDIT CHANGE START + var/splat_pref = player.client.prefs.read_preference(/datum/preference/choiced/splats) + var/datum/splat/vampire/kindred/clan_pref = get_kindred_splat(player) + var/datum/splat/werewolf/tribe_pref = get_werewolf_splat(player) + var/player_splat_id + var/player_clan_id + var/player_tribe_id + if(ispath(splat_pref)) + var/datum/splat/player_splat = GLOB.splat_prototypes[splat_pref] + player_splat_id = player_splat.id + else + player_splat_id = splat_pref + + if(clan_pref) // APOC EDIT ADD START + player_clan_id = clan_pref.clan.id + else if(tribe_pref) + player_tribe_id = tribe_pref.name + if(job.splat_slots) + if(job.splat_slots[player_splat_id] > 0) + job.splat_slots[player_splat_id] = job.splat_slots[player_splat_id] - 1 + if(job.clan_slots) + if(job.clan_slots[player_clan_id] > 0) + job.clan_slots[player_clan_id] = job.clan_slots[player_clan_id] - 1 + if(job.tribe_slots) + if(job.tribe_slots[player_tribe_id] > 0) + job.tribe_slots[player_tribe_id] = job.tribe_slots[player_tribe_id] - 1 + // APOC EDIT CHANGE END return TRUE /datum/controller/subsystem/job/proc/find_occupation_candidates(datum/job/job, level = 0) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 09f26ee9835d..36051a01ad5b 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -153,6 +153,10 @@ return "Your character's tribe is incompatible for [jobtitle]." if(JOB_UNAVAILABLE_FERA_AUSPICE) return "Your character's auspice is incompatible for [jobtitle]." + if(JOB_UNAVAILABLE_CLAN_SLOTS) // APOC EDIT ADD START + return "[jobtitle] doesn't have any free clan slots for you." + if(JOB_UNAVAILABLE_TRIBE_SLOTS) + return "[jobtitle] doesn't have any free tribe slots for your tribe." // APOC EDIT ADD END // DARKPACK EDIT END return GENERIC_JOB_UNAVAILABLE_ERROR diff --git a/modular_darkpack/modules/doors/code/keys/keys.dm b/modular_darkpack/modules/doors/code/keys/keys.dm index 42c98e809e52..a9746d1f22f1 100644 --- a/modular_darkpack/modules/doors/code/keys/keys.dm +++ b/modular_darkpack/modules/doors/code/keys/keys.dm @@ -173,8 +173,7 @@ GLOBAL_LIST_INIT(city_door_lock_ids, list()) name = "dark keys" accesslocks = list( LOCKACCESS_LASOMBRA, - LOCKACCESS_KIASYD, - LOCKACCESS_CHURCH + LOCKACCESS_KIASYD ) color = "#290355" @@ -183,11 +182,9 @@ GLOBAL_LIST_INIT(city_door_lock_ids, list()) accesslocks = list( LOCKACCESS_LASOMBRA, LOCKACCESS_KIASYD, - LOCKACCESS_CHURCH, LOCKACCESS_PRIMOGEN, LOCKACCESS_PRIMOGEN_LASOMBRA, LOCKACCESS_JAZZ_CLUB, - LOCKACCESS_THEATRE, LOCKACCESS_CAMARILLA, LOCKACCESS_PRIMOGEN_LASOMBRA, ) @@ -218,6 +215,12 @@ GLOBAL_LIST_INIT(city_door_lock_ids, list()) ) color = "#8cc4ff" +/obj/item/vamp/keys/giovanni + name = "church keys" + accesslocks = list( + LOCKACCESS_CHURCH + ) + /obj/item/vamp/keys/malkav/primogen name = "really insane keys" accesslocks = list( @@ -248,6 +251,15 @@ GLOBAL_LIST_INIT(city_door_lock_ids, list()) ) color = "#06053d" +/obj/item/vamp/keys/duskborn/primogen + name = "brass keys" + accesslocks = list( + LOCKACCESS_JAZZ_CLUB, + LOCKACCESS_THEATRE, + LOCKACCESS_CAMARILLA, + LOCKACCESS_DUSKBORN_PRIMOGEN + ) + /obj/item/vamp/keys/banuhaqim/primogen name = "really just keys" // lol accesslocks = list( diff --git a/modular_darkpack/modules/jobs/code/_job_assignment.dm b/modular_darkpack/modules/jobs/code/_job_assignment.dm index 426fc90b6316..05544ce03618 100644 --- a/modular_darkpack/modules/jobs/code/_job_assignment.dm +++ b/modular_darkpack/modules/jobs/code/_job_assignment.dm @@ -18,13 +18,23 @@ /datum/controller/subsystem/job/proc/check_job_eligibility_darkpack(mob/dead/new_player/player, datum/job/possible_job, debug_prefix = "", add_job_to_log = FALSE) var/client/player_client = GET_CLIENT(player) var/splat_pref = player_client.prefs.read_preference(/datum/preference/choiced/splats) + var/datum/splat/clan_pref = get_kindred_splat(player) // APOC EDIT ADD START + var/datum/splat/tribe_pref = get_werewolf_splat(player) // APOC EDIT ADD END var/player_splat_id + var/player_clan_id // APOC EDIT ADD START + var/player_tribe_id // APOC EDIT ADD END + if(ispath(splat_pref)) var/datum/splat/player_splat = GLOB.splat_prototypes[splat_pref] player_splat_id = player_splat.id else player_splat_id = splat_pref + if(clan_pref) // APOC EDIT ADD START + player_clan_id = clan_pref.id + else if(tribe_pref) + player_tribe_id = tribe_pref.name + if(possible_job.allowed_splats && !(player_splat_id in possible_job.allowed_splats)) job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPLAT, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_SPLAT @@ -33,6 +43,14 @@ job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPLAT_SLOTS, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_SPLAT_SLOTS + if(possible_job.clan_slots && (possible_job.clan_slots[player_clan_id] == 0)) // APOC EDIT ADD START + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_CLAN_SLOTS, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + return JOB_UNAVAILABLE_CLAN_SLOTS + + if(possible_job.tribe_slots && (possible_job.tribe_slots[player_tribe_id] == 0)) + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_TRIBE_SLOTS, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + return JOB_UNAVAILABLE_TRIBE_SLOTS // APOC EDIT ADD END + /* if(possible_job.whitelisted) job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_WHITELIST, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") diff --git a/modular_darkpack/modules/jobs/code/_jobs.dm b/modular_darkpack/modules/jobs/code/_jobs.dm index f31c0912168a..4bd3a76937e1 100644 --- a/modular_darkpack/modules/jobs/code/_jobs.dm +++ b/modular_darkpack/modules/jobs/code/_jobs.dm @@ -23,6 +23,8 @@ var/list/allowed_clans ///List of Clans that are disallowed to do this job. var/list/disallowed_clans + ///List of clans that are limited to a certain amount of that clan doing this job. e.g.: list(VAMPIRE_CLAN_TZIMISCE = 1, VAMPIRE_CLAN_MALKAVIAN = 0) // APOC EDIT ADD START + var/list/clan_slots // APOC EDIT ADD END // WTA ///Minimum Renown Rank necessary to do this job. @@ -33,7 +35,8 @@ ///List of Auspices that are allowed to do this job. var/list/allowed_auspice var/list/disallowed_auspice - + ///List of tribe that are limited to a certain amount of that tribe doing this job. e.g.: list(TRIBE_BLACK_SPIRAL_DANCERS = 1, TRIBE_BONE_GNAWERS = 0) // APOC EDIT ADD START + var/list/tribe_slots // APOC EDIT ADD END ///If this job requires whitelisting before it can be selected for characters. var/whitelisted = FALSE diff --git a/modular_darkpack/modules/jobs/code/anarchs/baron.dm b/modular_darkpack/modules/jobs/code/anarchs/baron.dm index 2fc867529b19..1e7b104bca4f 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/baron.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/baron.dm @@ -3,10 +3,12 @@ faction = FACTION_ANARCHS total_positions = 1 spawn_positions = 1 - supervisors = "the Anarchs and the Traditions" + supervisors = "the Anarchs and the Status Perfectus" config_tag = "BARON" job_flags = CITY_JOB_FLAGS outfit = /datum/outfit/job/vampire/baron + exp_requirements = 3000 + exp_required_type_department = EXP_TYPE_ANARCH display_order = JOB_DISPLAY_ORDER_BARON departments_list = list( @@ -14,9 +16,9 @@ ) known_contacts = list("Bouncer", "Emissary", "Sweeper", "Prince", "Sheriff") - 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_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_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." + description = "You hold ground on what the Second Revolt has left in the city. As one of San Francisco's Barons, you directly represent the Status Perfectus and the Second Revolt. Uphold the interests of your Anarchs and try not to turn your hot peace with the Camarilla into a hot war. You have a haven under the Dragonsbreath Smokeshop, your cover business." minimum_masquerade = 3 /datum/outfit/job/vampire/baron diff --git a/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm b/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm index ee3cf10de71a..edc0283aa082 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/bruiser.dm @@ -1,8 +1,8 @@ /datum/job/vampire/bruiser title = JOB_BRUISER faction = FACTION_ANARCHS - total_positions = 7 - spawn_positions = 7 + total_positions = 3 + spawn_positions = 3 supervisors = SUPERVISOR_BARON config_tag = "BRUISER" job_flags = CITY_JOB_FLAGS @@ -25,12 +25,12 @@ ) known_contacts = list("Baron", "Bouncer", "Emissary", "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_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, SPLAT_GHOUL) - maximal_generation = 9 - maximum_immortal_age = 200 - 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 +// maximal_generation = 9 +// maximum_immortal_age = 200 + description = "You are the enforcer of the Anarchs. The baron is always in need of muscle power. Enforce the Status Perfectus. You can find the Anarch haven under the Dragonsbreath Smokeshop." + minimum_masquerade = 3 /datum/outfit/job/vampire/bruiser name = "Bruiser" diff --git a/modular_darkpack/modules/jobs/code/anarchs/emissary.dm b/modular_darkpack/modules/jobs/code/anarchs/emissary.dm index d2722725efdb..f74adf80cb74 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/emissary.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/emissary.dm @@ -8,16 +8,18 @@ job_flags = CITY_JOB_FLAGS outfit = /datum/outfit/job/vampire/emissary + exp_requirements = 1600 + exp_required_type_department = EXP_TYPE_ANARCH display_order = JOB_DISPLAY_ORDER_EMISSARY departments_list = list( /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) +// 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 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 + 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. You can find the Anarch haven under the Dragonsbreath Smokeshop." + minimum_masquerade = 3 /datum/outfit/job/vampire/emissary name = "emissary" diff --git a/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm b/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm index 38a5d3123a09..5d4c79887a74 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/sweeper.dm @@ -1,8 +1,8 @@ /datum/job/vampire/sweeper title = JOB_SWEEPER faction = FACTION_ANARCHS - total_positions = 3 - spawn_positions = 3 + total_positions = 2 + spawn_positions = 2 supervisors = SUPERVISOR_BARON config_tag = "SWEEPER" job_flags = CITY_JOB_FLAGS @@ -10,14 +10,14 @@ display_order = JOB_DISPLAY_ORDER_SWEEPER departments_list = list( - /datum/job_department/anarch, + /datum/job_department/anarch ) known_contacts = list("Baron", "Bouncer", "Emissary", "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_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_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, SPLAT_GHOUL) - 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 + 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. You can find the Anarch haven under the Dragonsbreath Smokeshop." + minimum_masquerade = 3 /datum/outfit/job/vampire/sweeper name = "Sweeper" diff --git a/modular_darkpack/modules/jobs/code/anarchs/tapster.dm b/modular_darkpack/modules/jobs/code/anarchs/tapster.dm index a1dea1c3635d..02faadde3de4 100644 --- a/modular_darkpack/modules/jobs/code/anarchs/tapster.dm +++ b/modular_darkpack/modules/jobs/code/anarchs/tapster.dm @@ -1,8 +1,8 @@ /datum/job/vampire/tapster title = JOB_TAPSTER faction = FACTION_ANARCHS - total_positions = 2 - spawn_positions = 2 + total_positions = 3 + spawn_positions = 3 supervisors = SUPERVISOR_BARON_PUBLIC config_tag = "TAPSTER" job_flags = CITY_JOB_FLAGS @@ -26,13 +26,14 @@ */ known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper") - allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL) - splat_slots = list(SPLAT_NONE = 2, SPLAT_GHOUL = 2) - description = "You are an employee of the local smoke shop. Serve the eclectic clients that pass through, and try not to ask too many questions." // APOC EDIT CHANGE - JOBS + allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINDRED) + splat_slots = list(SPLAT_NONE = 2, SPLAT_GHOUL = 2, SPLAT_KINDRED = 1) + maximum_immortal_age = 5 + description = "You have been given keys to the DragonsBreath Smokeshop, but are not trusted to hold a real title. You are either a ghoul, a doll, a fledgeling, or someone impersonating one of the three." // APOC EDIT CHANGE - JOBS minimum_masquerade = 0 /datum/outfit/job/vampire/tapster - name = "Tapster" + name = "Retinue" 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 dc9c5d7c338d..090f0986fcc0 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/harpy.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/harpy.dm @@ -3,13 +3,13 @@ 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 = 2 + spawn_positions = 2 supervisors = SUPERVISOR_PRINCE config_tag = "HARPY" req_admin_notify = 1 minimal_player_age = 10 - exp_requirements = 180 + exp_requirements = 1000 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -22,15 +22,15 @@ ) minimal_generation = 12 //Uncomment when players get exp enough - maximal_generation = 9 - maximum_immortal_age = 200 - minimum_masquerade = 5 +// maximal_generation = 9 +// maximum_immortal_age = 200 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) known_contacts = list("Prince","Sheriff","Tremere Regent","Dealer","Emissary","Baron","Primogens") - 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_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) /datum/outfit/job/vampire/harpy name = "Harpy" diff --git a/modular_darkpack/modules/jobs/code/camarilla/hound.dm b/modular_darkpack/modules/jobs/code/camarilla/hound.dm index 0f980d846e77..98fcab9b0a48 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/hound.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/hound.dm @@ -3,11 +3,11 @@ description = "You are the Prince's enforcer. You report to the Sheriff and uphold the Traditions." auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY faction = FACTION_CAMARILLA - total_positions = 7 - spawn_positions = 7 + total_positions = 3 + spawn_positions = 3 supervisors = SUPERVISOR_SHERIFF minimal_player_age = 7 - exp_requirements = 20 +// exp_requirements = 20 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -20,11 +20,11 @@ /datum/job_department/camarilla, ) - maximal_generation = 9 - maximum_immortal_age = 200 +// maximal_generation = 9 +// maximum_immortal_age = 200 minimum_masquerade = 3 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) +// 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") 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..af7b946fca11 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/banu_haqim.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/banu_haqim.dm @@ -1,6 +1,6 @@ /datum/job/vampire/primogen_banu title = JOB_PRIMOGEN_BANU_HAQIM - description = "Offer your infinite knowledge to Prince of the City, while overseeing the Banu Haqim in the city. Monitor their contracts and ensure they remain true to the ways of the Clan. You have an official cover with the Police Department as a local civilian consultant, ensure things run smoothly, on either end." + description = "Offer your infinite knowledge to Prince of the City, while overseeing the Banu Haqim in the city. Monitor their contracts and ensure they remain true to the ways of the Clan." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -16,6 +16,8 @@ job_flags = CITY_JOB_FLAGS outfit = /datum/outfit/job/vampire/banuprim + exp_requirements = 1600 + exp_required_type = EXP_TYPE_CAMARILLA display_order = JOB_DISPLAY_ORDER_BANU departments_list = list( /datum/job_department/camarilla, @@ -23,14 +25,14 @@ minimal_generation = 12 minimum_immortal_age = 50 - minimum_masquerade = 5 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER) known_contacts = list("Prince") /datum/outfit/job/vampire/banuprim - name = "Primogen Banu Haqim" + name = "Banu Haqim Primogen" jobtype = /datum/job/vampire/primogen_banu ears = /obj/item/radio/headset/darkpack diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/duskborn.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/duskborn.dm new file mode 100644 index 000000000000..a111c06b5140 --- /dev/null +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/duskborn.dm @@ -0,0 +1,42 @@ +/datum/job/vampire/primogen_duskborn + title = JOB_PRIMOGEN_DUSKBORN + description = "You are too valuable to not have a position, but you are not recognized enough for anything more. You are tasked with managing the city's thinbloods and Caitiff population. You may be a Caitiff yourself, however unlikely that may be." + auto_deadmin_role_flags = DEADMIN_POSITION_HEAD + faction = FACTION_CAMARILLA + total_positions = 1 + spawn_positions = 1 + supervisors = SUPERVISOR_TRADITIONS + req_admin_notify = 1 + minimal_player_age = 14 + exp_requirements = 1600 + exp_required_type = EXP_TYPE_CAMARILLA + exp_required_type_department = EXP_TYPE_CAMARILLA + exp_granted_type = EXP_TYPE_CAMARILLA + config_tag = "PRIMOGEN_DUSKBORN" + job_flags = CITY_JOB_FLAGS + outfit = /datum/outfit/job/vampire/duskborn + + display_order = JOB_DISPLAY_ORDER_DUSKBORN + departments_list = list( + /datum/job_department/camarilla + ) + + minimal_generation = 13 + minimum_immortal_age = 50 + minimum_masquerade = 4 + allowed_splats = list(SPLAT_KINDRED) +// allowed_clans = list(VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_WARRIOR_SALUBRI) + + known_contacts = list("Prince") + +/datum/outfit/job/vampire/duskborn + name = "Primogen Duskborn" + jobtype = /datum/job/vampire/primogen_duskborn + + ears = /obj/item/radio/headset/darkpack + id = /obj/item/card/primogen + uniform = /obj/item/clothing/under/vampire/suit + suit = /obj/item/clothing/suit/vampire/trench + shoes = /obj/item/clothing/shoes/vampire/jackboots + l_pocket = /obj/item/smartphone/duskborn_primo + backpack_contents = list(/obj/item/vamp/keys/duskborn/primogen=1, /obj/item/card/credit/elder=1, /obj/item/card/whip, /obj/item/card/steward, /obj/item/card/myrmidon) diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm index d5090b7b1ad3..c556983e687d 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/lasombra.dm @@ -1,6 +1,6 @@ /datum/job/vampire/primogen_lasombra title = JOB_PRIMOGEN_LASOMBRA - description = "Offer your infinite knowledge to Prince of the City. Monitor those of your Clan and your lesser cousins, while holding a Court of Blood as need be, for all it takes for the Camarilla to turn on you is one mistake. You and Your Clan were given a domain in the local Church and in the vicinity of a swarm of Lupines, keep matters under control." + description = "Offer your infinite knowledge to Prince of the City. Monitor those of your Clan and your lesser cousins, while holding a Court of Blood as need be, for all it takes for the Camarilla to turn on you is one mistake." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_TRADITIONS req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 180 + exp_requirements = 1600 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -18,13 +18,12 @@ display_order = JOB_DISPLAY_ORDER_LASOMBRA departments_list = list( - /datum/job_department/church, - /datum/job_department/camarilla, + /datum/job_department/camarilla ) minimal_generation = 12 minimum_immortal_age = 50 - minimum_masquerade = 5 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_LASOMBRA) diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm index 174c2c996329..f40364b59ea9 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/malkavian.dm @@ -1,6 +1,6 @@ /datum/job/vampire/primogen_malkavian title = JOB_PRIMOGEN_MALKAVIAN - description = "Offer your infinite knowledge to Prince of the City. You likely have a hold over the local hospital, make good use of it and ensure the blood bags remain available." + description = "Offer your infinite knowledge to Prince of the City. Uphold clan interests. Lead the children of the moon and shattered mirror." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_TRADITIONS req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 180 + exp_requirements = 1600 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -18,13 +18,12 @@ display_order = JOB_DISPLAY_ORDER_MALKAVIAN departments_list = list( - /datum/job_department/clinic, - /datum/job_department/camarilla, + /datum/job_department/camarilla ) minimal_generation = 12 - minimum_immortal_age = 5 // Actually Malkavian Primo is whoever showed for work that day. Crazy bunch. - minimum_masquerade = 5 + minimum_immortal_age = 50 // Actually Malkavian Primo is whoever showed for work that day. Crazy bunch. + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_DOMINATE_MALKAVIAN) diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm index 9f5d30d84860..da905fc8a7de 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/nosferatu.dm @@ -1,6 +1,6 @@ /datum/job/vampire/primogen_nosferatu title = JOB_PRIMOGEN_NOSFERATU - description = "Offer your infinite knowledge to Prince of the City, and run the warren, your domain watches over the sewers." + description = "Offer your infinite knowledge to Prince of the City. Manage what's left of your Warrens. Keep your clan interests in mind." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_TRADITIONS req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 180 + exp_requirements = 1600 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -18,13 +18,12 @@ display_order = JOB_DISPLAY_ORDER_NOSFERATU departments_list = list( - /datum/job_department/camarilla, - /datum/job_department/city_services + /datum/job_department/camarilla ) minimal_generation = 12 - minimum_immortal_age = 15 - minimum_masquerade = 5 + minimum_immortal_age = 50 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_NOSFERATU) diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm index b9ccff0ea6e2..b9fb736e796b 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/toreador.dm @@ -1,6 +1,6 @@ /datum/job/vampire/primogen_toreador title = JOB_PRIMOGEN_TOREADOR - description = "Offer your infinite knowledge to Prince of the City. Take care of the Strip Club and its Elysium, for it is your domain and a social center within the city." + description = "Offer your infinite knowledge to Prince of the City. Keep clan interests in mind." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_TRADITIONS req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 180 + exp_requirements = 1600 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -18,13 +18,12 @@ display_order = JOB_DISPLAY_ORDER_TOREADOR departments_list = list( - /datum/job_department/strip_club, - /datum/job_department/camarilla, + /datum/job_department/camarilla ) minimal_generation = 12 minimum_immortal_age = 50 - minimum_masquerade = 5 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_TOREADOR) diff --git a/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm b/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm index 2a4ae75592e8..57e4390f468b 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/primogens/ventrue.dm @@ -1,6 +1,6 @@ /datum/job/vampire/primogen_ventrue title = JOB_PRIMOGEN_VENTRUE - description = "Offer your infinite knowledge to Prince of the City. Maintain the local Jazz Club, in front of the Tower, and its Elysium." + description = "Offer your infinite knowledge to Prince of the City. Uphold Clan interests and look out for prospective protege for it." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_TRADITIONS req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 180 + exp_requirements = 1600 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -23,14 +23,14 @@ minimal_generation = 12 minimum_immortal_age = 50 - minimum_masquerade = 5 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_VENTRUE) known_contacts = list("Prince") /datum/outfit/job/vampire/ventrue - name = "Primogen Ventrue" + name = "Primogen Ventrue Primogen" 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..f4c6082306e2 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/prince.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/prince.dm @@ -1,6 +1,6 @@ /datum/job/vampire/prince title = JOB_PRINCE - description = "You are the top dog of this city. You hold Praxis over " + CITY_NAME + ", and your word is law. Make sure the Masquerade is upheld, and your status is respected." + description = "You are the Prince of San Francisco, a chair vacated and filled with regularity. You grasp Praxis of this city, holding over domain, at least on paper and wherever the Anarchs aren't pushing you out. Try not to turn your hot peace with them into a hot war." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD faction = FACTION_CAMARILLA total_positions = 1 @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_TRADITIONS req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 180 + exp_requirements = 3000 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -21,11 +21,11 @@ /datum/job_department/camarilla, ) - minimal_generation = 10 + minimal_generation = 12 minimum_immortal_age = 75 - minimum_masquerade = 5 + minimum_masquerade = 4 allowed_splats = list(SPLAT_KINDRED) - 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) + 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, VAMPIRE_CLAN_CAITIFF) known_contacts = list( "Sheriff", diff --git a/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm b/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm index b4d93e481a52..595fa86b33c1 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/seneschal.dm @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_PRINCE req_admin_notify = 1 minimal_player_age = 10 - exp_requirements = 180 + exp_requirements = 2000 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -22,7 +22,7 @@ ) minimal_generation = 12 - minimum_masquerade = 5 + minimum_masquerade = 4 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) diff --git a/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm b/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm index ad4bd4741b58..50348a892937 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/sheriff.dm @@ -8,7 +8,7 @@ supervisors = SUPERVISOR_PRINCE req_admin_notify = 1 minimal_player_age = 14 - exp_requirements = 120 + exp_requirements = 2000 exp_required_type = EXP_TYPE_CAMARILLA exp_required_type_department = EXP_TYPE_CAMARILLA exp_granted_type = EXP_TYPE_CAMARILLA @@ -22,7 +22,7 @@ ) minimal_generation = 12 - minimum_masquerade = 5 + minimum_masquerade = 4 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) diff --git a/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm b/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm index 30112046d41e..cf6714e19c5e 100644 --- a/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm +++ b/modular_darkpack/modules/jobs/code/camarilla/tower_employee.dm @@ -1,8 +1,8 @@ /datum/job/vampire/towerwork title = JOB_TOWERWORK faction = FACTION_CAMARILLA - total_positions = 4 - spawn_positions = 4 + total_positions = 3 + spawn_positions = 3 supervisors = SUPERVISOR_SENESCHAL_PUBLIC exp_granted_type = EXP_TYPE_CAMARILLA config_tag = "TOWER_EMPLOYEE" @@ -22,11 +22,11 @@ "Tower Personal Attendant" ) - maximal_generation = 9 - maximum_immortal_age = 200 +// maximal_generation = 9 +// maximum_immortal_age = 200 known_contacts = list("Prince", "Sheriff", "Seneschal") 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) +// 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) 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 diff --git a/modular_darkpack/modules/jobs/code/clinic/director.dm b/modular_darkpack/modules/jobs/code/clinic/director.dm index 4229413981c9..35964b020cc1 100644 --- a/modular_darkpack/modules/jobs/code/clinic/director.dm +++ b/modular_darkpack/modules/jobs/code/clinic/director.dm @@ -1,24 +1,31 @@ /datum/job/vampire/clinic_director title = JOB_CLINIC_DIRECTOR faction = FACTION_CITY - total_positions = 1 - spawn_positions = 1 + total_positions = 2 + spawn_positions = 2 supervisors = "the Hospital Administrator" exp_required_type_department = EXP_TYPE_CLINIC config_tag = "CLINIC_DIRECTOR" outfit = /datum/outfit/job/vampire/clinic_director job_flags = CITY_JOB_FLAGS display_order = JOB_DISPLAY_ORDER_CLINICS_DIRECTOR + known_contacts = list("Senior Doctor", "Doctor") departments_list = list( /datum/job_department/clinic, ) - 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) + description = "Senior staff at Ocean Clinic, help the rest of the doctors, nurses, and EMTs with whatever they need. Uphold high standards of care." + allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE, SPLAT_GAROU, SPLAT_KINFOLK, 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_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, VAMPIRE_CLAN_WARRIOR_SALUBRI) + + alt_titles = list( + "Head of Surgery", + "Care Coordinator", + "Shift Operations Supervisor" + ) /datum/outfit/job/vampire/clinic_director - name = "Clinic Director" + name = "Senior Doctor" 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 7f1c0e083e9c..9be073edeb37 100644 --- a/modular_darkpack/modules/jobs/code/clinic/doctor.dm +++ b/modular_darkpack/modules/jobs/code/clinic/doctor.dm @@ -14,12 +14,12 @@ /datum/job_department/clinic, ) - description = "Help your fellow kindred in all matters medicine related. Sell blood. Keep your human colleagues ignorant." - maximal_generation = 9 - maximum_immortal_age = 200 - allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, 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_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") + description = "Work your job at the Ocean Clinic. Help patients, keep a tidy space, and uphold high standards of care." +// maximal_generation = 9 +// maximum_immortal_age = 200 + allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE, SPLAT_CORAX, SPLAT_GAROU) +// allowed_clans = list(VAMPIRE_CLAN_WARRIOR_SALUBRI, 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("Senior Doctor", "Doctor") alt_titles = list( "Doctor", @@ -31,7 +31,7 @@ "Surgeon", "Physician", "Paramedic", - "EMT", + "EMT" ) diff --git a/modular_darkpack/modules/jobs/code/giovanni/capo.dm b/modular_darkpack/modules/jobs/code/giovanni/capo.dm index 589e2881f17d..9ce65a39e548 100644 --- a/modular_darkpack/modules/jobs/code/giovanni/capo.dm +++ b/modular_darkpack/modules/jobs/code/giovanni/capo.dm @@ -1,6 +1,6 @@ /datum/job/vampire/capo title = JOB_CAPO - faction = FACTION_GIOVANNI +// faction = FACTION_GIOVANNI total_positions = 1 spawn_positions = 1 supervisors = "the Family and the Traditions" diff --git a/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm b/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm index 92fd139c298a..cddc25012df9 100644 --- a/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm +++ b/modular_darkpack/modules/jobs/code/giovanni/la_famiglia.dm @@ -1,6 +1,6 @@ /datum/job/vampire/famiglia title = JOB_LA_FAMIGLIA - faction = FACTION_GIOVANNI +// faction = FACTION_GIOVANNI total_positions = 10 spawn_positions = 10 supervisors = "the Family" diff --git a/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm b/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm index bd713ff7881c..c85c2a1f9821 100644 --- a/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm +++ b/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm @@ -1,6 +1,6 @@ /datum/job/vampire/squadra title = JOB_LA_SQUADRA - faction = FACTION_GIOVANNI +// faction = FACTION_GIOVANNI total_positions = 10 spawn_positions = 10 supervisors = "the Family and the Traditions" diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm index 43f23704042a..aaa39a4e807f 100644 --- a/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm +++ b/modular_darkpack/modules/jobs/code/miscelllaneous/priest.dm @@ -13,7 +13,7 @@ /datum/job_department/church, ) allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINDRED) - allowed_clans = list(VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_BANU_HAQIM_VIZIER) //Each have pretty big religious influences, so! +// allowed_clans = list(VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_BANU_HAQIM_VIZIER) //Each have pretty big religious influences, so! maximal_generation = 11 maximum_immortal_age = 100 description = "Be the shepherd of the flock in " + CITY_NAME + ", lead them to salvation, piety and righteousness." diff --git a/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm b/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm index 27dc2f822c46..92839291cc78 100644 --- a/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm +++ b/modular_darkpack/modules/jobs/code/tzimisce/bogatyr.dm @@ -1,13 +1,14 @@ /datum/job/vampire/bogatyr title = JOB_BOGATYR - faction = FACTION_SABBAT + faction = FACTION_VOIVODATE total_positions = 2 // APOC EDIT CHANGE - JOBS - (Voivode) spawn_positions = 2 // APOC EDIT CHANGE - JOBS - (Voivode) supervisors = " the Laws of Hospitality" config_tag = "BOGATYR" outfit = /datum/outfit/job/vampire/bogatyr job_flags = CITY_JOB_FLAGS + exp_requirements = 1000 exp_required_type_department = EXP_TYPE_MANOR departments_list = list( /datum/job_department/manor, @@ -22,7 +23,7 @@ maximum_immortal_age = 200 minimum_masquerade = 2 - known_contacts = list("Prince", "Baron", "Sheriff") + known_contacts = list("Voivode", "Zadruga", "Bogatyr", "Bogatyr Captain") /datum/outfit/job/vampire/bogatyr name = "Bogatyr" @@ -36,4 +37,4 @@ suit = /obj/item/clothing/suit/vampire/bogatyr belt = /obj/item/storage/belt/sheath/vamp/sword l_pocket = /obj/item/smartphone/bogatyr - backpack_contents = list(/obj/item/vamp/keys/voivodate = 1, /obj/item/card/credit=1) // DARKPACK EDIT CHANGE - JOBS - (Voivode) + backpack_contents = list(/obj/item/vamp/keys/voivodate/advanced = 1, /obj/item/card/credit=1) // DARKPACK EDIT CHANGE - JOBS - (Voivode) diff --git a/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm b/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm index 504648e4ce91..2ea97f7ca238 100644 --- a/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm +++ b/modular_darkpack/modules/jobs/code/tzimisce/voivode.dm @@ -1,8 +1,9 @@ /datum/job/vampire/voivode title = JOB_VOIVODE - faction = FACTION_SABBAT - total_positions = 1 - spawn_positions = 1 + faction = FACTION_VOIVODATE + total_positions = 2 + spawn_positions = 2 + exp_requirements = 3000 supervisors = " the Laws of Hospitality" config_tag = "VOIVODE" outfit = /datum/outfit/job/vampire/voivode @@ -16,6 +17,8 @@ allowed_splats = list(SPLAT_KINDRED) allowed_clans = list(VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_OLD_CLAN_TZIMISCE) // APOC EDIT CHANGE - JOBS - (Voivode) + clan_slots = list(VAMPIRE_CLAN_TZIMISCE = 1, VAMPIRE_CLAN_MALKAVIAN = 1, VAMPIRE_CLAN_TOREADOR = 1, VAMPIRE_CLAN_OLD_CLAN_TZIMISCE = 1) + description = "You are a leader of the Seer's Voivodate. A congregation of Seer clans, leading the new Voivodate in the face of near systemic Collapse. Oversee the Hospitality on your lands, and guard the Sarcophagus of the Voivode-in-Waiting in Waiting kept in your basement." // APOC EDIT CHANGE - JOBS - (Voivode) minimum_masquerade = 2 @@ -31,4 +34,19 @@ shoes = /obj/item/clothing/shoes/vampire/jackboots belt = /obj/item/storage/belt/sheath/vamp/sword l_pocket = /obj/item/smartphone/voivode - backpack_contents = list(/obj/item/vamp/keys/voivodate/master = 1, /obj/item/instrument/eguitar/vamp = 1, /obj/item/card/credit/elder = 1) // DARKPACK EDIT CHANGE - JOBS - (Voivode) + backpack_contents = list(/obj/item/vamp/keys/voivodate/master = 1, /obj/item/card/credit/elder = 1) // DARKPACK EDIT CHANGE - JOBS - (Voivode) + +/* +/datum/job/vampire/voivode/after_spawn(mob/living/spawned, client/player_client) + . = ..() + RegisterSignal(spawned, COMSIG_MOB_GHOSTIZED, PROC_REF(on_mob_ghost)) + var/datum/splat/our_splat = get_kindred_splat(spawned) + var/clan_id = our_splat.clan.id + allowed_clans -= clan_id + +/datum/job/vampire/voivode/proc/on_mob_ghost(mob/living/despawning) + SIGNAL_HANDLER + var/datum/splat/our_splat = get_kindred_splat(spawned) + var/clan_id = our_splat.clan.id + allowed_clans += clan_id +*/ diff --git a/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm b/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm index e34781ae02e9..c053956977af 100644 --- a/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm +++ b/modular_darkpack/modules/jobs/code/tzimisce/zadruga.dm @@ -1,6 +1,6 @@ /datum/job/vampire/zadruga title = JOB_ZADRUGA - faction = FACTION_SABBAT + faction = FACTION_VOIVODATE total_positions = 2 spawn_positions = 2 supervisors = " the Laws of Hospitality" diff --git a/modular_darkpack/modules/matrix/code/job.dm b/modular_darkpack/modules/matrix/code/job.dm index ece34c3d22a4..b629020ecdef 100644 --- a/modular_darkpack/modules/matrix/code/job.dm +++ b/modular_darkpack/modules/matrix/code/job.dm @@ -7,13 +7,35 @@ job_debug("Freeing role: [job_datum.title]") job_datum.current_positions = max(0, job_datum.current_positions - 1) - - //Getting it from prefs is untrustworthy as they could have unlocked there sheet. (even before the move to splats) +// APOC EDIT CHANGE START + //Getting it from prefs is untrustworthy as they could have unlocked there sheet. (even before the move to splats) // //But getting it from spalts is impercise as those can change. //What to do with you. - /* - var/datum/species/player_species = despawning_mob.dna?.species - var/player_species_id = player_species?.id - if(job_datum.splat_slots[player_species_id] >= 0) - job_datum.splat_slots[player_species_id] = job_datum.splat_slots[player_species_id] + 1 - */ + var/splat_pref = despawning_mob.client.prefs.read_preference(/datum/preference/choiced/splats) + var/datum/splat/vampire/kindred/clan_pref = get_kindred_splat(despawning_mob) + var/datum/splat/werewolf/tribe_pref = get_werewolf_splat(despawning_mob) + var/player_splat_id + var/player_clan_id + var/player_tribe_id + + if(ispath(splat_pref)) + var/datum/splat/player_splat = GLOB.splat_prototypes[splat_pref] + player_splat_id = player_splat.id + else + player_splat_id = splat_pref + + if(clan_pref) // APOC EDIT ADD START + player_clan_id = clan_pref.clan.id + else if(tribe_pref) + player_tribe_id = tribe_pref.name + + if(job_datum.splat_slots) + if(job_datum.splat_slots[player_splat_id] >= 0) + job_datum.splat_slots[player_splat_id] = job_datum.splat_slots[player_splat_id] + 1 + if(job_datum.clan_slots) + if(job_datum.clan_slots[player_clan_id] >= 0) + job_datum.clan_slots[player_clan_id] = job_datum.clan_slots[player_clan_id] + 1 + if(job_datum.tribe_slots) + if(job_datum.tribe_slots[player_tribe_id] >= 0) + job_datum.tribe_slots[player_tribe_id] = job_datum.tribe_slots[player_tribe_id] + 1 +// APOC EDIT CHANGE END diff --git a/modular_darkpack/modules/npc/code/nonhuman/hostile/szlachta.dm b/modular_darkpack/modules/npc/code/nonhuman/hostile/szlachta.dm index bf3a58cf5142..09bc62dc6874 100644 --- a/modular_darkpack/modules/npc/code/nonhuman/hostile/szlachta.dm +++ b/modular_darkpack/modules/npc/code/nonhuman/hostile/szlachta.dm @@ -21,7 +21,7 @@ attack_verb_simple = "bite" attack_sound = 'sound/items/weapons/bite.ogg' speak_emote = list("gnashes") - faction = list(FACTION_SABBAT, VAMPIRE_CLAN_TZIMISCE) + faction = list(FACTION_VOIVODATE, VAMPIRE_CLAN_TZIMISCE) pressure_resistance = 200 bloodquality = BLOOD_QUALITY_LOW bloodpool = 2 diff --git a/modular_darkpack/modules/phones/code/phone_subtypes.dm b/modular_darkpack/modules/phones/code/phone_subtypes.dm index ee4c4bdb4616..f7f752ddf1a8 100644 --- a/modular_darkpack/modules/phones/code/phone_subtypes.dm +++ b/modular_darkpack/modules/phones/code/phone_subtypes.dm @@ -1,13 +1,13 @@ /obj/item/smartphone/prince contact_networks_pre_init = list( alist(NETWORK_ID = MILLENIUM_TOWER_NETWORK, OUR_ROLE = "C.E.O.", USE_JOB_TITLE = FALSE) - , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "TransAmerica Corporation C.E.O.", USE_JOB_TITLE = FALSE) + , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Millenium Group C.E.O.", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/seneschal contact_networks_pre_init = list( alist(NETWORK_ID = MILLENIUM_TOWER_NETWORK, OUR_ROLE = "C.O.O.", USE_JOB_TITLE = FALSE) - , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "TransAmerica Corporation C.O.O", USE_JOB_TITLE = FALSE) + , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Millenium Group C.O.O", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/sheriff @@ -37,7 +37,7 @@ /obj/item/smartphone/ventrue_primo important_contact_of = VAMPIRE_CLAN_VENTRUE contact_networks_pre_init = list( - alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Crown Blue Jazz Club Owner", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Management", USE_JOB_TITLE = FALSE) ) // TOREADOR @@ -45,7 +45,7 @@ /obj/item/smartphone/toreador_primo important_contact_of = VAMPIRE_CLAN_TOREADOR contact_networks_pre_init = list( - alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = (PRIMARY_NIGHTCLUB_COMPANY + " Night Club Owner"), USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = (PRIMARY_NIGHTCLUB_COMPANY + "Sunday Friend"), USE_JOB_TITLE = FALSE) ) // NOSFERATU @@ -53,7 +53,7 @@ /obj/item/smartphone/nosferatu_primo important_contact_of = VAMPIRE_CLAN_NOSFERATU contact_networks_pre_init = list( - alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Utility Administrator", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Administrator", USE_JOB_TITLE = FALSE) ) // MALKAVIAN @@ -61,7 +61,15 @@ /obj/item/smartphone/malkavian_primo important_contact_of = VAMPIRE_CLAN_MALKAVIAN contact_networks_pre_init = list( - alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Hospital Administrator", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Contact", USE_JOB_TITLE = FALSE) + ) + +// DUSKBORN + +/obj/item/smartphone/duskborn_primo + important_contact_of = VAMPIRE_CLAN_CAITIFF + contact_networks_pre_init = list( + alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Outreach", USE_JOB_TITLE = FALSE) ) // LASOMBRA @@ -69,13 +77,13 @@ /obj/item/smartphone/lasombra_primo important_contact_of = VAMPIRE_CLAN_LASOMBRA contact_networks_pre_init = list( - alist(NETWORK_ID = LASOMBRA_NETWORK, OUR_ROLE = "Church Administrator", USE_JOB_TITLE = FALSE) - , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Church Administrator", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = LASOMBRA_NETWORK, OUR_ROLE = "Open Shoulder", USE_JOB_TITLE = FALSE) + , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Open Shoulder", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/lasombra_caretaker contact_networks_pre_init = list( - alist(NETWORK_ID = LASOMBRA_NETWORK, OUR_ROLE = "Church Caretaker", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = LASOMBRA_NETWORK, OUR_ROLE = "Caretaker", USE_JOB_TITLE = FALSE) ) // BANU HAQIM @@ -83,7 +91,7 @@ /obj/item/smartphone/banu_primo important_contact_of = VAMPIRE_CLAN_BANU_HAQIM contact_networks_pre_init = list( - alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "SFPD Civilian Consultant", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Head of the Household", USE_JOB_TITLE = FALSE) ) // TREMERE @@ -152,34 +160,34 @@ /obj/item/smartphone/baron contact_networks_pre_init = list( - alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Club Manager", USE_JOB_TITLE = FALSE) - , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Anarchy Rose Club Manager", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Dragonsbreath Manager", USE_JOB_TITLE = FALSE) + , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Dragonsbreath Smokeshop Manager", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/emissary contact_networks_pre_init = list( - alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Club Representative", USE_JOB_TITLE = FALSE) - , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Anarchy Rose Club Representative", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Dragonsbreath HR", USE_JOB_TITLE = FALSE) + , alist(NETWORK_ID = VAMPIRE_LEADER_NETWORK, OUR_ROLE = "Dragonsbreath Smokeshop HR", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/bruiser contact_networks_pre_init = list( - alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Club Bouncer", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Dragonsbreath Security", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/sweeper contact_networks_pre_init = list( - alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Club Bartender", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Dragonsbreath Shift Lead", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/liaison contact_networks_pre_init = list( - alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Club Promotor", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "TELL A CODER! - Liason", USE_JOB_TITLE = FALSE) ) /obj/item/smartphone/tapster contact_networks_pre_init = list( - alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Club Bartender", USE_JOB_TITLE = FALSE) + alist(NETWORK_ID = ANARCH_NETWORK, OUR_ROLE = "Dragonsbreath Employee", USE_JOB_TITLE = FALSE) ) // SUPPLY diff --git a/modular_zapoc/modules/items/code/keys.dm b/modular_zapoc/modules/items/code/keys.dm index 78a5f588852b..5dd723462a21 100644 --- a/modular_zapoc/modules/items/code/keys.dm +++ b/modular_zapoc/modules/items/code/keys.dm @@ -5,7 +5,8 @@ #define LOCKACCESS_OCEAN "ocean" #define LOCKACCESS_VOIVODATE "voivodate_citizen" -#define LOCKACCESS_VOIVODATE_MASTER "seer_voivodate" +#define LOCKACCESS_VOIVODATE_ADVANCED "seer_voivodate" +#define LOCKACCESS_VOIVODATE_MASTER "voivodate_master" /obj/item/vamp/keys/veterinarian name = "veterinarian keys" @@ -69,15 +70,25 @@ /obj/effect/mapping_helpers/door/access/voivodate lock_id = LOCKACCESS_VOIVODATE +/obj/item/vamp/keys/voivodate/advanced + name = "Estate security keys" + accesslocks = list( + LOCKACCESS_VOIVODATE, + LOCKACCESS_VOIVODATE_ADVANCED + ) + +/obj/effect/mapping_helpers/door/access/voivodate/advanced + lock_id = LOCKACCESS_VOIVODATE_ADVANCED /obj/item/vamp/keys/voivodate/master name = "Estate master keys" accesslocks = list( + LOCKACCESS_VOIVODATE_ADVANCED, LOCKACCESS_VOIVODATE_MASTER, LOCKACCESS_VOIVODATE ) -/obj/effect/mapping_helpers/door/access/voivodate_master +/obj/effect/mapping_helpers/door/access/voivodate/master lock_id = LOCKACCESS_VOIVODATE_MASTER @@ -98,4 +109,5 @@ #undef LOCKACCESS_OCEAN #undef LOCKACCESS_VOIVODATE +#undef LOCKACCESS_VOIVODATE_ADVANCED #undef LOCKACCESS_VOIVODATE_MASTER diff --git a/modular_zapoc/modules/jobs/code/voivode.dm b/modular_zapoc/modules/jobs/code/voivode.dm index 6aa21eed36e2..6e568599d1fd 100644 --- a/modular_zapoc/modules/jobs/code/voivode.dm +++ b/modular_zapoc/modules/jobs/code/voivode.dm @@ -1,6 +1,6 @@ /datum/job/vampire/voivodate_citizen title = JOB_VOIVODATE_CITIZEN - faction = FACTION_SABBAT + faction = FACTION_VOIVODATE total_positions = 5 spawn_positions = 5 supervisors = " the Laws of Hospitality" @@ -43,10 +43,13 @@ config_tag = "BOGATYR_CAPTAIN" description = "Captain of the Bogatyri, protectors of the Seer's Voivodate. You lead them in the protection of your family and the Voivode-in-Waiting who sleeps in the basement. Serve the Voivodes, and enforce the Hospitality on your family's lands." + exp_requirements = 2000 + exp_required_type_department = EXP_TYPE_MANOR display_order = JOB_DISPLAY_ORDER_BOGATYR_CAPTAIN - known_contacts = list("Prince", "Baron", "Sheriff", "Emissary", "Seneschal", "Zadruga", "Bogatyr") + known_contacts = list("Voivode", "Zadruga", "Bogatyr", "Bogatyr Captain") /datum/outfit/job/vampire/bogatyr/captain name = "Bogatyr Captain" jobtype = /datum/job/vampire/bogatyr/captain // id = /obj/item/card/id/bogatyr/captain + backpack_contents = list(/obj/item/vamp/keys/voivodate/master = 1, /obj/item/card/credit=1) diff --git a/tgstation.dme b/tgstation.dme index 85db9eee6203..282ada2952fb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7608,6 +7608,7 @@ #include "modular_darkpack\modules\jobs\code\camarilla\sheriff.dm" #include "modular_darkpack\modules\jobs\code\camarilla\tower_employee.dm" #include "modular_darkpack\modules\jobs\code\camarilla\primogens\banu_haqim.dm" +#include "modular_darkpack\modules\jobs\code\camarilla\primogens\duskborn.dm" #include "modular_darkpack\modules\jobs\code\camarilla\primogens\lasombra.dm" #include "modular_darkpack\modules\jobs\code\camarilla\primogens\malkavian.dm" #include "modular_darkpack\modules\jobs\code\camarilla\primogens\nosferatu.dm"