Skip to content
Open
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
4 changes: 4 additions & 0 deletions code/modules/clothing/armor/regenerating.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
max_integrity = 300
repair_time = 20 SECONDS

/obj/item/clothing/armor/regenerating/skin/disciple/Initialize(mapload) // Disciples get passive regen from their armour since it's their primary lifeline.
. = ..()
enchant(/datum/enchantment/life_eternal)

/obj/item/clothing/armor/regenerating/skin/easttats
name = "bouhoi bujeog tattoos"
desc = "A mystic style of tattoos used to honor the kin that fell generations ago, a sign of companionship and secretive brotherhood. These are styled into the shape of clouds, created by a mystical ink which shifts and moves in ripples like a pond to harden where your skin is struck. Its movement causes you to shudder."
Expand Down
31 changes: 31 additions & 0 deletions code/modules/inquisitor_supplies/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -469,3 +469,34 @@
new /obj/item/clothing/shirt/dress/royal(src)
new /obj/item/clothing/wrists/royalsleeves(src)
new /obj/item/clothing/shirt/dress/royal/prince(src)


/datum/inqports/wardrobe/standarddisguise //basic, cheap disguises for when you are outlawed roundstart.
name = "Standard disguise set - contains cloak"
item_type = /obj/structure/closet/crate/chest/inqcrate/wardrobe/standarddisguise
marquescost = 2

/obj/structure/closet/crate/chest/inqcrate/wardrobe/standarddisguise/populate_contents()
new /obj/item/clothing/cloak/raincloak/colored/random(src)
new /obj/item/clothing/armor/gambeson(src)
new /obj/item/clothing/shirt/dress/gen/colored/random(src)
new /obj/item/clothing/shirt/undershirt(src)
new /obj/item/storage/backpack/satchel(src)
new /obj/item/clothing/shoes/simpleshoes(src)
new /obj/item/storage/belt/leather(src)


/datum/inqports/wardrobe/armoureddisguise // contains basic, nondescript armour.
name = "Medium armour disguise crate - no cloak, bad armour"
item_type = /obj/structure/closet/crate/chest/inqcrate/wardrobe/armoureddisguise
marquescost = 2 // the armour is objectively bad

/obj/structure/closet/crate/chest/inqcrate/wardrobe/armoureddisguise/populate_contents()
new /obj/item/clothing/head/helmet/ironpot(src)
new /obj/item/clothing/armor/cuirass/iron(src)
new /obj/item/clothing/armor/gambeson(src)
new /obj/item/clothing/shoes/boots/leather(src)
new /obj/item/clothing/neck/chaincoif/iron(src)
new /obj/item/clothing/gloves/leather(src)
new /obj/item/storage/backpack/satchel(src)
new /obj/item/storage/belt/leather(src)
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
STAT_ENDURANCE = 2,
STAT_CONSTITUTION = 3,
STAT_INTELLIGENCE = -2,
STAT_SPEED = -1,
/datum/attribute/skill/misc/athletics = 30,
/datum/attribute/skill/combat/unarmed = 30,
/datum/attribute/skill/combat/wrestling = 30,
Expand Down Expand Up @@ -82,7 +81,7 @@
/datum/outfit/disciple
name = "Disciple (Sacrestants)"
shoes = /obj/item/clothing/shoes/psydonboots
armor = /obj/item/clothing/armor/regenerating/skin/disciple
armor = /obj/item/clothing/armor/regenerating/skin/disciple // enchanted with "life eternal" for passive regen
backl = /obj/item/storage/backpack/satchel/otavan
belt = /obj/item/storage/belt/leather/rope/dark
pants = /obj/item/clothing/pants/tights/colored/black
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
STAT_STRENGTH = 2,
STAT_CONSTITUTION = 2,
STAT_ENDURANCE = 2,
STAT_SPEED = -1,
/datum/attribute/skill/combat/swords = 30,
/datum/attribute/skill/combat/axesmaces = 30,
/datum/attribute/skill/combat/whipsflails = 30,
Expand All @@ -29,7 +28,8 @@
attribute_sheet = /datum/attribute_holder/sheet/job/psydoniantemplar

traits = list(
TRAIT_HEAVYARMOR,
TRAIT_HEAVYARMOR, // they need both heavy and medium, using a baroque mix of both.
TRAIT_MEDIUMARMOR,
TRAIT_STEELHEARTED,
TRAIT_INQUISITION,
TRAIT_SILVER_BLESSED,
Expand Down Expand Up @@ -74,13 +74,13 @@
var/weapon_choice = spawned.select_equippable(player_client, weapons, message = "Choose your WEAPON.", title = "TAKE UP PSYDON'S ARMS.")
switch(weapon_choice)
if("Psydonic Longsword")
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/swords, 30, 30, TRUE)
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/swords, 40, 40, TRUE)
if("Psydonic War Axe", "Psydonic Mace", "Psydonic Poleaxe + Shortsword")
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/axesmaces, 30, 30, TRUE)
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/axesmaces, 40, 40, TRUE)
if("Psydonic Whip", "Psydonic Flail")
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/whipsflails, 30, 30, TRUE)
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/whipsflails, 40, 40, TRUE)
if("Psydonic Spear + Handmace")
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/polearms, 30, 30, TRUE)
spawned.clamped_adjust_skill_level(/datum/attribute/skill/combat/polearms, 40, 40, TRUE)

/datum/outfit/psydoniantemplar
name = "Psydonian Templar (Sacrestants)"
Expand All @@ -100,4 +100,5 @@
/obj/item/storage/keyring/inquisitor = 1,
/obj/item/paper/inqslip/arrival/ortho = 1,
/obj/item/collar_detonator = 1,
/obj/item/reagent_containers/glass/bottle/healthpot = 1,
)
Loading