Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions code/modules/clothing/armor/regenerating.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,6 @@
max_integrity = 300
repair_time = 20 SECONDS

/obj/item/clothing/armor/regenerating/skin/disciple/sunlord
name = "The golden tan"
desc = "The sun's powerful light has infused my skin with an armor-like denseness."
3 changes: 3 additions & 0 deletions code/modules/clothing/head/hood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
salvage_amount = 1
salvage_result = /obj/item/natural/cloth

/obj/item/clothing/head/roguehood/sundweller
color = CLOTHING_MUSTARD_YELLOW

/obj/item/clothing/head/roguehood/colored
misc_flags = CRAFTING_TEST_EXCLUDE

Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/shirts/robe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/obj/item/clothing/shirt/robe/colored
misc_flags = CRAFTING_TEST_EXCLUDE

/obj/item/clothing/shirt/robe/colored/sundweller
color = CLOTHING_MUSTARD_YELLOW

/obj/item/clothing/shirt/robe/colored/linen
color = CLOTHING_LINEN

Expand Down
40 changes: 14 additions & 26 deletions code/modules/jobs/job_types/peasants/beggar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
/datum/attribute/skill/misc/lockpicking = list(10, 40),
/datum/attribute/skill/combat/wrestling = list(10, 20),
/datum/attribute/skill/combat/unarmed = list(10, 20),
/datum/attribute/skill/combat/swords = list(10, 20),
/datum/attribute/skill/combat/axesmaces = list(10, 20),
/datum/attribute/skill/craft/alchemy = list(10, 20),
)
raw_attribute_list = list(
STAT_FORTUNE = 5, //You live a blessed existence
/datum/attribute/skill/misc/climbing = 50
STAT_FORTUNE = 3, //You live a blessed existence
/datum/attribute/skill/misc/climbing = 50,
/datum/attribute/skill/labor/farming = 20,
/datum/attribute/skill/craft/cooking = 10,
)

/datum/job/vagrant
Expand All @@ -22,8 +26,8 @@
display_order = JDO_VAGRANT
job_flags = (JOB_ANNOUNCE_ARRIVAL | JOB_EQUIP_RANK | JOB_NEW_PLAYER_JOINABLE)
faction = FACTION_TOWN
total_positions = 10
spawn_positions = 10
total_positions = 4
spawn_positions = 4
bypass_lastclass = TRUE
banned_leprosy = FALSE

Expand All @@ -32,9 +36,9 @@
outfit = /datum/outfit/vagrant
can_random = FALSE
can_have_apprentices = FALSE
can_be_apprentice = TRUE
can_be_apprentice = FALSE

cmode_music = 'sound/music/cmode/towner/CombatBeggar.ogg'
cmode_music = 'sound/music/cmode/antag/combat_cult.ogg'

attribute_sheet = /datum/attribute_holder/sheet/job/vagrant

Expand Down Expand Up @@ -62,23 +66,7 @@

/datum/outfit/vagrant/pre_equip(mob/living/carbon/human/H)
. = ..()
if(prob(20))
head = /obj/item/clothing/head/knitcap
if(prob(5))
beltr = /obj/item/reagent_containers/powder/moondust
if(prob(10))
beltl = /obj/item/clothing/face/cigarette/rollie/cannabis
if(prob(10))
cloak = /obj/item/clothing/cloak/raincloak/colored/brown
if(prob(10))
gloves = /obj/item/clothing/gloves/fingerless
if(prob(5))
r_hand = /obj/item/weapon/mace/woodclub

if(H.gender == FEMALE)
armor = /obj/item/clothing/shirt/rags
else
pants = /obj/item/clothing/pants/tights/colored/vagrant
shirt = /obj/item/clothing/shirt/undershirt/colored/vagrant

neck = /obj/item/storage/belt/pouch
head = /obj/item/clothing/head/roguehood/sundweller
armor = /obj/item/clothing/shirt/robe/colored/sundweller
belt = /obj/item/storage/belt/leather/rope
shoes = /obj/item/clothing/shoes/sandals
4 changes: 3 additions & 1 deletion code/modules/jobs/job_types/peasants/sunlord.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
EXP_TYPE_LEADERSHIP = 300
)

cmode_music = 'sound/music/cmode/towner/CombatBeggar.ogg'
cmode_music = 'sound/music/cmode/antag/combat_evilwizard.ogg'

attribute_sheet = /datum/attribute_holder/sheet/job/sunlord

Expand Down Expand Up @@ -83,7 +83,9 @@
. = ..()
cloak = /obj/item/clothing/cloak/heartfelt/shit
ring = /obj/item/clothing/ring/dragon_ring
neck = /obj/item/clothing/neck/amberamulet
head = /obj/item/clothing/head/priesthat/sunlord
armor = /obj/item/clothing/armor/regenerating/skin/disciple/sunlord
belt = /obj/item/storage/belt/leather/rope
beltl = /obj/item/weapon/sword/stone
beltr = /obj/item/weapon/sword/stone
Expand Down
Loading