diff --git a/code/modules/clothing/rogueclothes/mask.dm b/code/modules/clothing/rogueclothes/mask.dm index 3090f36cfcf..6131358f3cb 100644 --- a/code/modules/clothing/rogueclothes/mask.dm +++ b/code/modules/clothing/rogueclothes/mask.dm @@ -109,6 +109,7 @@ name = "cursed mask" desc = "We are often criminals in the eyes of the earth, not only for having committed crimes, but because we know that crimes have been committed." ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT) + clothing_flags = null /obj/item/clothing/mask/rogue/facemask/prisoner/dropped(mob/living/carbon/human/user) . = ..() diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm index ef70bb4f139..027b22a5788 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm @@ -34,6 +34,9 @@ /datum/advclass/pilgrim whitelist_req = FALSE +/datum/advclass/pilgrim/rare + whitelist_req = TRUE + /datum/advclass/proc/equipme(mob/living/carbon/human/H) // input sleeps.... set waitfor = FALSE diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm index 07387638a4d..f1d12510f08 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm @@ -13,7 +13,7 @@ outfit = /datum/outfit/job/roguetown/adventurer/assassin category_tags = list(CTAG_PILGRIM) maximum_possible_slots = 2 - min_pq = 0 + min_pq = 5 pickprob = 100 /datum/outfit/job/roguetown/adventurer/assassin/pre_equip(mob/living/carbon/human/H) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm index 91f098afb41..f1018d32c09 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm @@ -12,7 +12,7 @@ "Aasimar" ) outfit = /datum/outfit/job/roguetown/adventurer/rogue - min_pq = 0 + min_pq = 3 category_tags = list(CTAG_ADVENTURER) /datum/outfit/job/roguetown/adventurer/rogue/pre_equip(mob/living/carbon/human/H) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm index a8f72f85f03..03ac130879f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm @@ -13,6 +13,7 @@ // allowed_patrons = list(/datum/patron/divine/dendor) this doesn't work so long its a subclass type. Besides its preferable to forceswitch as it does to make selection less clunky. cmode_music = 'sound/music/combat_dendor.ogg' maximum_possible_slots = 4 // to be lowered to 2? once testing is done + whitelist_req = TRUE /datum/outfit/job/roguetown/adventurer/briar/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm index eeda040129a..aaa07c7a007 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm @@ -15,6 +15,7 @@ outfit = /datum/outfit/job/roguetown/adventurer/noble category_tags = list(CTAG_PILGRIM, CTAG_TOWNER) maximum_possible_slots = 2 + whitelist_req = TRUE /datum/outfit/job/roguetown/adventurer/noble/pre_equip(mob/living/carbon/human/H)