Skip to content

Re-Adds Obeah (And Valeren because Nimi) #686

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

Open
XeonMations wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Re-Adds Obeah (And Valeren because Nimi) #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0a8eac7
obeah 1
XeonMations Feb 19, 2026
b8e6ffe
obeah 2
XeonMations Feb 19, 2026
00f5134
Update obeah.dm
XeonMations Feb 19, 2026
849ae0b
Update obeah.dm
XeonMations Feb 19, 2026
65ea60b
Update obeah.dm
XeonMations Feb 19, 2026
d536cf4
DISCIPLINE_TRAIT(type)
XeonMations Feb 21, 2026
20888d9
obeah 2
XeonMations Feb 21, 2026
ddfbb86
Update obeah.dm
XeonMations Feb 21, 2026
345cb8d
Merge remote-tracking branch 'upstream/master' into obeah
XeonMations Mar 21, 2026
f953eaf
Update obeah.dm
XeonMations Mar 21, 2026
dcd1b82
VAMPIRE_CLAN_WARRIOR_SALUBRI
XeonMations Mar 21, 2026
a44c33f
valeren
buffyuwu Mar 21, 2026
768096c
Update valeren.dm
buffyuwu Mar 21, 2026
49e971d
fixes
buffyuwu Mar 21, 2026
521acbd
Update obeah.dm
XeonMations Mar 21, 2026
5a71784
Update valeren.dm
buffyuwu Mar 21, 2026
b79005c
Merge branch 'obeah' of https://github.com/XeonMations/ThirdCity into…
buffyuwu Mar 21, 2026
e55299d
fix uni_icons for clans
XeonMations Mar 21, 2026
e5636b0
Merge branch 'obeah' of https://github.com/XeonMations/ThirdCity into…
XeonMations Mar 21, 2026
40afd79
RAHHHH
XeonMations Mar 21, 2026
6967bd6
armor of caine's fury
buffyuwu Mar 22, 2026
dce0047
Merge branch 'obeah' of https://github.com/XeonMations/ThirdCity into…
buffyuwu Mar 22, 2026
8f4a6e1
floating blood halos arent subtle
buffyuwu Mar 22, 2026
e30590b
signals > armor datums
buffyuwu Mar 23, 2026
847f62a
Update valeren.dm
buffyuwu Mar 23, 2026
9a947ed
Merge branch 'master' into obeah
buffyuwu Mar 23, 2026
ed18951
oops
buffyuwu Mar 23, 2026
e03d7d3
Merge branch 'obeah' of https://github.com/XeonMations/ThirdCity into…
buffyuwu Mar 23, 2026
f5045d7
shepherd's watch
XeonMations Mar 24, 2026
47809ac
Update obeah.dm
XeonMations Mar 24, 2026
2c4ddc9
what IS a radius?
XeonMations Mar 24, 2026
660d037
xeon and their consequences
buffyuwu Mar 24, 2026
e13896b
obeah, valeren
buffyuwu Mar 24, 2026
61826e8
rahahha
XeonMations Mar 24, 2026
b227e52
Update obeah.dm
XeonMations Mar 24, 2026
e1baaf5
Update aoe_monitor.dm
XeonMations Mar 24, 2026
75b4492
Update aoe_monitor.dm
XeonMations Mar 24, 2026
bc08768
awa
XeonMations Mar 24, 2026
85bd40a
Update obeah.dm
XeonMations Mar 24, 2026
7effcba
Merge branch 'master' into obeah
XeonMations Mar 24, 2026
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
2 changes: 2 additions & 0 deletions code/__DEFINES/~darkpack/traits/macros.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// Trait applied by element
#define DISCIPLINE_TRAIT(source) "discipline_trait_[source]"
1 change: 0 additions & 1 deletion code/__DEFINES/~darkpack/traits/sources.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

/// Trait given by a vampire's Clan
#define CLAN_TRAIT "clan"
#define DISCIPLINE_TRAIT "discipline"

#define GIFT_TRAIT "gift"

Expand Down
5 changes: 3 additions & 2 deletions code/__DEFINES/~darkpack/vampire_clan.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
#define VAMPIRE_CLAN_NAGARAJA "nagaraja"
#define VAMPIRE_CLAN_NOSFERATU "nosferatu"
#define VAMPIRE_CLAN_OLD_CLAN_TZIMISCE "old_clan_tzimisce"
#define VAMPIRE_CLAN_SALUBRI "salubri"
#define VAMPIRE_CLAN_HEALER_SALUBRI "healer_salubri"
#define VAMPIRE_CLAN_WARRIOR_SALUBRI "warrior_salubri"
#define VAMPIRE_CLAN_SETITE "setite"
#define VAMPIRE_CLAN_TOREADOR "toreador"
#define VAMPIRE_CLAN_TREMERE "tremere"
Expand All @@ -26,4 +27,4 @@
#define VAMPIRE_CLAN_HARBINGER "harbinger_of_skulls"

//all of the playable clans
#define VAMPIRE_CLAN_ALL list(VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_NAGARAJA, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_OLD_CLAN_TZIMISCE, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_HARBINGER)
#define VAMPIRE_CLAN_ALL list(VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_NAGARAJA, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_OLD_CLAN_TZIMISCE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_HARBINGER)
Binary file removed modular_darkpack/modules/deprecated/icons/UI/actions.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_darkpack/modules/jobs/code/anarchs/bruiser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
)

known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper")
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_splats = list(SPLAT_KINDRED)
description = "You are the enforcer of the Anarchs. The baron is always in need of muscle power. Enforce the Traditions - in the anarch way."
minimal_masquerade = 2
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/jobs/code/anarchs/emissary.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)

known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper", "Prince", "Sheriff")
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_splats = list(SPLAT_KINDRED)
description = "You are a diplomat for the anarchs. Make deals, keep the peace, all through words, not violence. But the latter may come to pass if the former fails."
minimal_masquerade = 2
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/jobs/code/anarchs/sweeper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)

known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper")
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_splats = list(SPLAT_KINDRED)
description = "You are the observer of the anarchs. You watch out for any new kindred, suspicious individuals, and any new rumors near the anarch turf, and then report it to your anarchs."
minimal_masquerade = 2
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/jobs/code/clinic/director.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

description = "Keep Saint John's clinic up and running. Collect blood by helping mortals at the Clinic."
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA)

/datum/outfit/job/vampire/clinic_director
name = "Clinic Director"
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/jobs/code/clinic/doctor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

description = "Help your fellow kindred in all matters medicine related. Sell blood. Keep your human colleagues ignorant."
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA)
known_contacts = list("Clinic Director")

alt_titles = list(
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/powers/code/discipline/__discipline.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
///Text description of this Discipline.
var/desc = "Discipline description"
///Icon file for this Discipline
var/icon = 'modular_darkpack/modules/deprecated/icons/UI/actions.dmi'
var/icon = 'modular_darkpack/modules/powers/icons/actions.dmi'
///Icon state for this Discipline
var/icon_state
///If this Discipline is unique to a certain Clan.
Expand Down
7 changes: 6 additions & 1 deletion modular_darkpack/modules/powers/code/discipline/__discipline_power.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
to_chat(owner, span_warning("[src] is still on cooldown for [DisplayTimeText(get_cooldown())]!"))
return FALSE

if(!check_discipline_flags(alert))
return FALSE
return TRUE

/datum/discipline_power/proc/check_discipline_flags(alert = FALSE)
//status checks
if ((check_flags & DISC_CHECK_TORPORED) && HAS_TRAIT(owner, TRAIT_TORPOR))
if (alert)
Expand Down Expand Up @@ -719,7 +724,7 @@
/datum/discipline_power/proc/clear_duration_timer(to_clear = 1)
if(duration_override)
return

if (toggled && (duration_length == 0))
return

Expand Down
14 changes: 7 additions & 7 deletions modular_darkpack/modules/powers/code/discipline/auspex/auspex.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@

if(SENSE_VISION in output_senses)
owner.client?.view_size?.setTo(2) // This increases the view size of the player by 2 tiles in each direction. I dont know why it's called Set if it Adds.
ADD_TRAIT(owner, TRAIT_REFLECTIVE_EYES, DISCIPLINE_TRAIT)
ADD_TRAIT(owner, TRAIT_REFLECTIVE_EYES, DISCIPLINE_TRAIT(type))
var/obj/item/organ/eyes/kindred_eyes = owner.get_organ_slot(ORGAN_SLOT_EYES)
if(kindred_eyes)
kindred_eyes.flash_protect = max(kindred_eyes.flash_protect += -2, FLASH_PROTECTION_HYPER_SENSITIVE)
if(SENSE_HEARING in output_senses)
ADD_TRAIT(owner, TRAIT_GOOD_HEARING, DISCIPLINE_TRAIT)
ADD_TRAIT(owner, TRAIT_GOOD_HEARING, DISCIPLINE_TRAIT(type))
var/obj/item/organ/ears/kindred_ears = owner.get_organ_slot(ORGAN_SLOT_EARS)
kindred_ears.damage_multiplier = kindred_ears.damage_multiplier + 1
if(SENSE_SMELL in output_senses)
owner.dna?.add_mutation(/datum/mutation/olfaction, DISCIPLINE_TRAIT)
owner.dna?.add_mutation(/datum/mutation/olfaction, DISCIPLINE_TRAIT(type))
if(SENSE_TASTE in output_senses)
ADD_TRAIT(owner, TRAIT_REAGENT_SCANNER, DISCIPLINE_TRAIT)
ADD_TRAIT(owner, TRAIT_REAGENT_SCANNER, DISCIPLINE_TRAIT(type))
if(SENSE_TOUCH in output_senses)
RegisterSignals(owner, list(COMSIG_CARBON_HELP_ACT, COMSIG_ON_CARBON_SLIP, COMSIG_LIVING_DISARM_HIT, COMSIG_LIVING_TRYING_TO_PULL), PROC_REF(on_touch))
owner.AddComponent(/datum/component/heartbeat_sensing, color_path = /datum/client_colour/psyker)
Expand All @@ -75,17 +75,17 @@
if(mutation)
owner.dna?.remove_mutation(mutation, mutation.sources)
// Hearing
REMOVE_TRAIT(owner, TRAIT_GOOD_HEARING, DISCIPLINE_TRAIT)
REMOVE_TRAIT(owner, TRAIT_GOOD_HEARING, DISCIPLINE_TRAIT(type))
var/obj/item/organ/ears/kindred_ears = owner.get_organ_slot(ORGAN_SLOT_EARS)
kindred_ears.damage_multiplier = initial(kindred_ears.damage_multiplier)
// Vision
owner.client?.view_size?.resetToDefault()
REMOVE_TRAIT(owner, TRAIT_REFLECTIVE_EYES, DISCIPLINE_TRAIT)
REMOVE_TRAIT(owner, TRAIT_REFLECTIVE_EYES, DISCIPLINE_TRAIT(type))
var/obj/item/organ/eyes/kindred_eyes = owner.get_organ_slot(ORGAN_SLOT_EYES)
if(kindred_eyes)
kindred_eyes.flash_protect = max(kindred_eyes.flash_protect += 2, FLASH_PROTECTION_NONE)
// Taste
REMOVE_TRAIT(owner, TRAIT_REAGENT_SCANNER, DISCIPLINE_TRAIT)
REMOVE_TRAIT(owner, TRAIT_REAGENT_SCANNER, DISCIPLINE_TRAIT(type))
// Touch
UnregisterSignal(owner, list(COMSIG_CARBON_HELP_ACT, COMSIG_ON_CARBON_SLIP, COMSIG_LIVING_DISARM_HIT, COMSIG_LIVING_TRYING_TO_PULL))
qdel(owner.GetComponent(/datum/component/heartbeat_sensing))
Expand Down
154 changes: 0 additions & 154 deletions modular_darkpack/modules/powers/code/discipline/healer_valeren.dm
View file
Open in desktop

This file was deleted.

Loading
Loading