Skip to content

Commit

Permalink
Fey Shenanigans
Browse files Browse the repository at this point in the history
Most likely think to break is the mage trait.
Adds 'infusion' to the Enchanter mage class.
It begins.

- Druid loadout has been mogged heavily to move them away from glorified mage farmers.

small changes such as loadouts for the Dwarf Artificers and some scomstones for other roles that needed them from roundstart.
  • Loading branch information
Murderfoxen committed Dec 3, 2024
1 parent 3a89210 commit 72d7807
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/invisibility)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/featherfall)


if("Spellblade")
H.set_blindness(0)
to_chat(H, span_warning("Unlike most of your kind, you weave the arts of the blade and magick into a dance."))
Expand Down Expand Up @@ -149,6 +150,7 @@
pants = /obj/item/clothing/under/roguetown/tights/black
shoes = /obj/item/clothing/shoes/roguetown/shalal
neck = /obj/item/clothing/neck/roguetown/psicross/eora
ADD_TRAIT(H, TRAIT_ARTIFICER, TRAIT_GENERIC)
if(classchoice == "Arcanist")
head = /obj/item/clothing/head/roguetown/roguehood/shalal
r_hand = /obj/item/scrying
Expand Down
14 changes: 7 additions & 7 deletions code/modules/jobs/job_types/roguetown/church/druid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@
/datum/outfit/job/roguetown/druid/pre_equip(mob/living/carbon/human/H)
..()
shoes = /obj/item/clothing/shoes/roguetown/boots/forestershoes
shirt = /obj/item/clothing/suit/roguetown/armor/gambeson
pants = /obj/item/clothing/under/roguetown/loincloth/brown
belt = /obj/item/storage/belt/rogue/leather/rope
belt = /obj/item/storage/belt/rogue/leather
beltl = /obj/item/rogueweapon/sickle
beltr = /obj/item/flashlight/flare/torch/lantern
backl = /obj/item/storage/backpack/rogue/satchel
backr = /obj/item/rogueweapon/woodstaff/wise
head = /obj/item/clothing/head/roguetown/helmet/foresterhelmet
neck = /obj/item/clothing/neck/roguetown/psicross/dendor
gloves = /obj/item/clothing/gloves/roguetown/forestergauntlets
cloak = /obj/item/clothing/cloak/raincloak/furcloak/brown
cloak = /obj/item/clothing/cloak/raincloak/green
cloak = /obj/item/clothing/cloak/templar/dendor
armor = /obj/item/clothing/suit/roguetown/armor/leather/hide
backpack_contents = list(
/obj/item/seeds/wheat = 1,
/obj/item/seeds/apple = 1,
/obj/item/seeds/shroom = 1,
/obj/item/seeds/sweetleaf = 1,
/obj/item/rogueweapon/huntingknife/stoneknife = 1,
/obj/item/rogueweapon/whip = 1,
/obj/item/reagent_containers/glass/bottle/rogue/antipoisonpot = 1,
/obj/item/reagent_containers/glass/bottle/rogue/majorhealthpot = 1,
)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE)
H.mind.adjust_skillrank_up_to(/datum/skill/combat/whipsflails, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/roguetown/garrison/bogguard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
flag = BOGGUARD
department_flag = GARRISON
faction = "Station"
total_positions = 6
spawn_positions = 6
total_positions = 10
spawn_positions = 10
selection_color = JCOLOR_SOLDIER
allowed_sexes = list(MALE, FEMALE)
allowed_races = RACES_ALL_KINDSPLUS
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/nobility/judge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
outfit = /datum/outfit/job/roguetown/judge

give_bank_account = 1500
min_pq = 15
min_pq = 50
max_pq = null

cmode_music = 'sound/music/combat_judge.ogg'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/peasants/cook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
spawn_positions = 1

allowed_races = RACES_ALL_KINDSPLUS
tutorial = "Working closely with the barkeep who owns Skull Crack Inn, the cook should focus on cooking food for all the hungry mouths of Roguetown."
tutorial = "Working closely with the barkeep who owns Sylver Dragonne Inn, the cook should focus on cooking food for all the hungry mouths of Roguetown."

outfit = /datum/outfit/job/roguetown/cook
display_order = JDO_COOK
Expand Down
14 changes: 7 additions & 7 deletions code/modules/jobs/job_types/roguetown/viking/highking.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@

/datum/outfit/job/roguetown/highking/pre_equip(mob/living/carbon/human/H)
..()
head = /obj/item/clothing/head/roguetown/helmet/vikinghelmet
head = /obj/item/clothing/head/roguetown/helmet/heavy/dwarfhelm
backr = /obj/item/storage/backpack/rogue/satchel
beltl = /obj/item/rogueweapon/huntingknife/idagger/steel
r_hand = /obj/item/rogueweapon/stoneaxe/battle
beltl = /obj/item/rogueweapon/stoneaxe/battle
r_hand = /obj/item/rogueweapon/pick/steel
shirt = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk
pants = /obj/item/clothing/under/roguetown/platelegs
gloves = /obj/item/clothing/gloves/roguetown/plate
gloves = /obj/item/clothing/gloves/roguetown/dwarfgauntlets
belt = /obj/item/storage/belt/rogue/leather
neck = /obj/item/storage/belt/rogue/pouch/coins/rich
armor = /obj/item/clothing/suit/roguetown/armor/plate
shoes = /obj/item/storage/belt/rogue/leather
cloak = /obj/item/clothing/cloak/raincloak/furcloak
armor = /obj/item/clothing/suit/roguetown/armor/plate/dwarffull
shoes = /obj/item/clothing/shoes/roguetown/boots/dwarfboots
cloak = /obj/item/clothing/cloak/templar/malum
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_ARTIFICER, TRAIT_GENERIC)
Expand Down
4 changes: 3 additions & 1 deletion code/modules/jobs/job_types/roguetown/yeomen/barkeep.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
outfit = /datum/outfit/job/roguetown/barkeep
display_order = JDO_BARKEEP
give_bank_account = 500
min_pq = 0
min_pq = 5
max_pq = null

/datum/outfit/job/roguetown/barkeep/pre_equip(mob/living/carbon/human/H)
Expand Down Expand Up @@ -45,6 +45,7 @@
beltl = /obj/item/storage/belt/rogue/pouch/coins/rich
neck = /obj/item/storage/keyring/innkeep
cloak = /obj/item/clothing/cloak/apron/waist
id = /obj/item/scomstone
H.change_stat("intelligence", 2)
H.change_stat("strength", 2)
H.change_stat("endurance", 1)
Expand All @@ -55,6 +56,7 @@
neck = /obj/item/storage/belt/rogue/pouch/coins/rich
belt = /obj/item/storage/belt/rogue/leather/rope
beltl = /obj/item/storage/keyring/innkeep
id = /obj/item/scomstone
H.change_stat("intelligence", 2)
H.change_stat("strength", 2)
H.change_stat("endurance", 1)
Expand Down

0 comments on commit 72d7807

Please sign in to comment.