diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 1c7596651e3..7e51419afd3 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -38,7 +38,7 @@ #define JOB_DISPLAY_ORDER_BARKEEPER 19 #define JOB_DISPLAY_ORDER_EMISSARY 20 #define JOB_DISPLAY_ORDER_SWEEPER 21 -#define JOB_DISPLAY_ORDER_BRUISER 22 +#define JOB_DISPLAY_ORDER_ANARCH_MEMBER 22 #define JOB_DISPLAY_ORDER_DEALER 23 #define JOB_DISPLAY_ORDER_SUPPLY 24 #define JOB_DISPLAY_ORDER_REGENT 25 diff --git a/code/controllers/subsystem/job_scaling.dm b/code/controllers/subsystem/job_scaling.dm index 96449d4e1ed..4d405bb7c72 100644 --- a/code/controllers/subsystem/job_scaling.dm +++ b/code/controllers/subsystem/job_scaling.dm @@ -55,7 +55,7 @@ SUBSYSTEM_DEF(job_scaling) //vampire jobs scaling_rules["Hound"] = list(10, 30, 3) // 1 slot per 10 players over 30 players, up to 3 extra slots (10 max since 7 is the base) - scaling_rules["Bruiser"] = list(10, 30, 3) // 1 slot per 10 players over 30 players, up to 3 extra slots (10 max since 7 is the base) + scaling_rules["Anarch Member"] = list(10, 30, 3) // 1 slot per 10 players over 30 players, up to 3 extra slots (10 max since 7 is the base) message_admins("Job Scaling: Rules initialized") diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 12f7f19ced1..d2bd0c56a0d 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -26,8 +26,9 @@ GLOBAL_LIST_INIT(camarilla_council_positions, list( GLOBAL_LIST_INIT(anarch_positions, list( "Baron", "Emissary", + "Reeve", "Sweeper", - "Bruiser" + "Anarch Member" )) diff --git a/code/modules/vtmb/jobs/anarchs/bouncer.dm b/code/modules/vtmb/jobs/anarchs/bouncer.dm index 3adc068257d..e0458dbf2f0 100644 --- a/code/modules/vtmb/jobs/anarchs/bouncer.dm +++ b/code/modules/vtmb/jobs/anarchs/bouncer.dm @@ -1,6 +1,6 @@ -/datum/job/vamp/bruiser - title = "Bruiser" +/datum/job/vamp/anarch_member + title = "Anarch Member" department_head = list("Baron") faction = "Vampire" total_positions = 7 @@ -8,7 +8,7 @@ supervisors = "the Baron" selection_color = "#434343" - outfit = /datum/outfit/job/bruiser + outfit = /datum/outfit/job/anarch_member access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS) minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS) @@ -18,7 +18,7 @@ mind_traits = list(TRAIT_DONUT_LOVER) liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) - display_order = JOB_DISPLAY_ORDER_BRUISER + display_order = JOB_DISPLAY_ORDER_ANARCH_MEMBER known_contacts = list("Baron") allowed_bloodlines = list("Daughters of Cacophony", "True Brujah", "Brujah", "Nosferatu", "Gangrel", "Toreador", "Tremere", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Ventrue", "Lasombra", "Gargoyle", "Kiasyd", "Cappadocian", "Ministry") @@ -26,9 +26,9 @@ minimal_masquerade = 2 experience_addition = 15 -/datum/outfit/job/bruiser - name = "Bruiser" - jobtype = /datum/job/vamp/bruiser +/datum/outfit/job/anarch_member + name = "Anarch Member" + jobtype = /datum/job/vamp/anarch_member id = /obj/item/card/id/anarch uniform = /obj/item/clothing/under/vampire/bouncer @@ -40,6 +40,6 @@ backpack_contents = list(/obj/item/passport=1, /obj/item/cockclock=1, /obj/item/vampire_stake=3, /obj/item/flashlight=1, /obj/item/vamp/keys/hack=1, /obj/item/vamp/creditcard=1) -/obj/effect/landmark/start/bruiser - name = "Bruiser" +/obj/effect/landmark/start/anarch_member + name = "Anarch Member" icon_state = "Bouncer" diff --git a/code/modules/vtmb/jobs/anarchs/reeve.dm b/code/modules/vtmb/jobs/anarchs/reeve.dm new file mode 100644 index 00000000000..a21c1da98c1 --- /dev/null +++ b/code/modules/vtmb/jobs/anarchs/reeve.dm @@ -0,0 +1,43 @@ + +/datum/job/vamp/sweeper + title = "Sweeper" + department_head = list("Baron") + faction = "Vampire" + total_positions = 3 + spawn_positions = 3 + supervisors = "the Baron" + selection_color = "#434343" + + outfit = /datum/outfit/job/sweeper + + access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS) + minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS) + paycheck = PAYCHECK_EASY + paycheck_department = ACCOUNT_SRV + + mind_traits = list(TRAIT_DONUT_LOVER) + liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) + + display_order = JOB_DISPLAY_ORDER_SWEEPER + known_contacts = list("Baron") + allowed_bloodlines = list("Daughters of Cacophony", "True Brujah", "Brujah", "Nosferatu", "Gangrel", "Tremere", "Toreador", "Malkavian", "Banu Haqim", "Tzimisce", "Caitiff", "Ventrue", "Lasombra", "Gargoyle", "Kiasyd", "Cappadocian", "Ministry") + + v_duty = "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." + minimal_masquerade = 2 + experience_addition = 15 + +/datum/outfit/job/sweeper + name = "Sweeper" + jobtype = /datum/job/vamp/sweeper + + id = /obj/item/card/id/anarch + uniform = /obj/item/clothing/under/vampire/bouncer + suit = /obj/item/clothing/suit/vampire/jacket + shoes = /obj/item/clothing/shoes/vampire/jackboots + r_pocket = /obj/item/vamp/keys/anarch + l_pocket = /obj/item/vamp/phone/anarch + backpack_contents = list(/obj/item/passport=1, /obj/item/cockclock=1, /obj/item/flashlight=1, /obj/item/vamp/keys/hack=1, /obj/item/vamp/creditcard=1, /obj/item/binoculars = 1) + +/obj/effect/landmark/start/sweeper + name = "Sweeper" + icon_state = "Bouncer" diff --git a/config/jobs.txt b/config/jobs.txt index 7cd31492ff4..6f27150cd43 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -11,7 +11,7 @@ Citizen=-1,-1 Supply Technician=3,3 Dealer=1,1 -Bruiser=3,3 +Anarch Member=3,3 Barkeeper=1,1 Archivist=1,1 diff --git a/strings/tips.txt b/strings/tips.txt index 7bf984d7966..52bb966a81a 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -32,7 +32,7 @@ As a Doctor, your objectives are to heal Kine for proper feeding. You can also s As a Graveyard Keeper, your objectives are to protect City from a Shadowlands Masquerade breach. There is no more room in Hell, so walking dead are rising up. Kill 'em all... As a Stripper, you are free to do with the Strip Club as you wish. It is your domain - unless the Prince changes his mind. As a Baron, you lead the individualistic kindred of the city. You are still part of the Camarilla and are subject to it's laws. San Francisco is not an Anarch domain. -As a Bruiser, you hang out with the Baron and support him in his rebellious troublemaking. +As an Anarch, you hang out with the Baron and support him in his rebellious troublemaking. As a Dealer, you hold a powerful domain. You can make deals with whomever you want - but boons are always worth more than money. As a Supply Technician, you work for the dealer - who has graciously accepted you into his coterie. As a Chantry Regent, your objectives are to lead the Tremere of San Francisco and keep the Chantry secure, as well as hunt down any who would steal your clan's secrets. diff --git a/tgstation.dme b/tgstation.dme index 1ae420f64ff..299ff74c47c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3399,6 +3399,7 @@ #include "code\modules\vtmb\jobs\anarchs\baron.dm" #include "code\modules\vtmb\jobs\anarchs\bouncer.dm" #include "code\modules\vtmb\jobs\anarchs\emissary.dm" +#include "code\modules\vtmb\jobs\anarchs\reeve.dm" #include "code\modules\vtmb\jobs\anarchs\sweeper.dm" #include "code\modules\vtmb\magic\mysticism.dm" #include "code\modules\vtmb\magic\pyramid.dm"