Skip to content

nabegators #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Animusin merged 1 commit into from
Jan 19, 2025
Merged

nabegators #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/modules/clothing/rogueclothes/mask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
3 changes: 3 additions & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading