diff --git a/modular_darkpack/modules/powers/code/discipline/necromancy.dm b/modular_darkpack/modules/powers/code/discipline/necromancy.dm index 456e545db5b8..88a8bc05bbc1 100644 --- a/modular_darkpack/modules/powers/code/discipline/necromancy.dm +++ b/modular_darkpack/modules/powers/code/discipline/necromancy.dm @@ -9,8 +9,6 @@ /datum/discipline/necromancy/post_gain() . = ..() - - owner.add_faction(VAMPIRE_CLAN_GIOVANNI) var/datum/action/ritual_drawing/necromancy/ritualist = new() ritualist.Grant(owner) ritualist.level = level diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/creatures.dm b/modular_darkpack/modules/powers/code/discipline/obtenebration/creatures.dm similarity index 86% rename from modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/creatures.dm rename to modular_darkpack/modules/powers/code/discipline/obtenebration/creatures.dm index d03a82a7e2ff..2823dd3912b8 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/creatures.dm +++ b/modular_darkpack/modules/powers/code/discipline/obtenebration/creatures.dm @@ -1,3 +1,4 @@ +// Dubiously deprecated as i think we replaced them with /mob/living/basic/shadow_guard /mob/living/basic/lasombra name = "shadow abomination" desc = "A ferocious, fang-bearing creature that resembles a spider." @@ -23,6 +24,7 @@ bloodpool = 0 maxbloodpool = 0 bloodquality = BLOOD_QUALITY_LOW + ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile /mob/living/basic/lasombra/better icon_state = "shadow2" diff --git a/modular_darkpack/modules/powers/code/discipline/obtenebration.dm b/modular_darkpack/modules/powers/code/discipline/obtenebration/obtenebration.dm similarity index 99% rename from modular_darkpack/modules/powers/code/discipline/obtenebration.dm rename to modular_darkpack/modules/powers/code/discipline/obtenebration/obtenebration.dm index 4775ac7de560..1045c42b6f41 100644 --- a/modular_darkpack/modules/powers/code/discipline/obtenebration.dm +++ b/modular_darkpack/modules/powers/code/discipline/obtenebration/obtenebration.dm @@ -112,7 +112,7 @@ var/list/active_tentacles = list() -/datum/discipline_power/obtenebration/arms_of_the_abyss/activate(var/atom/target) +/datum/discipline_power/obtenebration/arms_of_the_abyss/activate(atom/target) . = ..() var/turf/target_turf = get_turf(target) var/dice = (owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_OCCULT)) @@ -343,7 +343,7 @@ var/datum/discipline_power/obtenebration/arms_of_the_abyss/abyss_power = vampire?.get_discipline_power(/datum/discipline_power/obtenebration/arms_of_the_abyss) var/tentacles = 0 - for(var/mob/living/basic/abyss_tentacle/T in abyss_power.active_tentacles) + for(var/mob/living/basic/abyss_tentacle/T in abyss_power?.active_tentacles) if(T && !QDELETED(T)) var/was_passive = (T.aggro_mode == "Passive") T.aggro_mode = select diff --git a/modular_darkpack/modules/powers/code/discipline/thaumaturgy/path_of_blood.dm b/modular_darkpack/modules/powers/code/discipline/thaumaturgy/path_of_blood.dm index 3ddee2454d34..1a13712c2eba 100644 --- a/modular_darkpack/modules/powers/code/discipline/thaumaturgy/path_of_blood.dm +++ b/modular_darkpack/modules/powers/code/discipline/thaumaturgy/path_of_blood.dm @@ -7,7 +7,6 @@ /datum/discipline/thaumaturgy/post_gain() . = ..() - owner.add_faction(VAMPIRE_CLAN_TREMERE) var/datum/action/ritual_drawing/thaumaturgy/thaumaturgy = new() thaumaturgy.Grant(owner) thaumaturgy.level = level diff --git a/modular_darkpack/modules/powers/code/discipline/vicissitude/vicissitude.dm b/modular_darkpack/modules/powers/code/discipline/vicissitude/vicissitude.dm index 403d8d8a1806..80887a24685b 100644 --- a/modular_darkpack/modules/powers/code/discipline/vicissitude/vicissitude.dm +++ b/modular_darkpack/modules/powers/code/discipline/vicissitude/vicissitude.dm @@ -5,10 +5,6 @@ clan_restricted = TRUE power_type = /datum/discipline_power/vicissitude -/datum/discipline/vicissitude/post_gain() - . = ..() - owner.faction |= VAMPIRE_CLAN_TZIMISCE - /datum/discipline_power/vicissitude name = "Vicissitude power name" desc = "Vicissitude power description" diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/__vampire_clan.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/__vampire_clan.dm index f9c166327e0e..fd51558eeb6e 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/__vampire_clan.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/__vampire_clan.dm @@ -83,6 +83,9 @@ if(ispath(discipline, /datum/discipline)) vampire.give_st_power(discipline, 5) + // Mostly for summons to not kill you. + vampire.add_faction(id) + /** * Undoes the effects of on_gain to more or less * remove the effects of gaining the Clan. By default, @@ -111,6 +114,8 @@ vampire.remove_overlay(equipped_accessory) */ + vampire.remove_faction(id) + /** * Applies Clan-specific effects when the * mob that has the Clan logs into their mob diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/baali/baali.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/baali/baali.dm index 254e75e1a62f..873e15d1cb43 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/baali/baali.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/baali/baali.dm @@ -22,9 +22,6 @@ /datum/subsplat/vampire_clan/baali/on_gain(mob/living/carbon/human/H) . = ..() - - H.add_faction(VAMPIRE_CLAN_BAALI) - H.AddElement(/datum/element/holy_weakness) H.gain_trauma(new /datum/brain_trauma/mild/phobia/religion, TRAUMA_RESILIENCE_ABSOLUTE) diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm index 0b4de0e48d55..9885adcd9808 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm @@ -18,12 +18,6 @@ enlightenment = TRUE clan_keys = /obj/item/vamp/keys/lasombra -/datum/subsplat/vampire_clan/lasombra/on_gain(mob/living/carbon/human/H) - . = ..() - - H.vis_flags |= VIS_HIDE - H.add_faction(VAMPIRE_CLAN_LASOMBRA) - // Not TTRPG accurate and is pending a rework to use real rolls after #633 /proc/scramble_lasombra_message(message, mob/living/lasombra) var/static/list/zalgo_letters = list( diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/tzimisce/creatures.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/tzimisce/creatures.dm index 7e2f2193cde1..d9559c9f0368 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/tzimisce/creatures.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/tzimisce/creatures.dm @@ -26,6 +26,7 @@ bloodquality = BLOOD_QUALITY_LOW bloodpool = 2 maxbloodpool = 2 + ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile_obstacles /mob/living/basic/szlachta/fister name = "fister" diff --git a/tgstation.dme b/tgstation.dme index 16f285eae546..b5a67b0d2422 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7402,7 +7402,6 @@ #include "modular_darkpack\modules\powers\code\discipline\animalism.dm" #include "modular_darkpack\modules\powers\code\discipline\dementation.dm" #include "modular_darkpack\modules\powers\code\discipline\necromancy.dm" -#include "modular_darkpack\modules\powers\code\discipline\obtenebration.dm" #include "modular_darkpack\modules\powers\code\discipline\serpentis.dm" #include "modular_darkpack\modules\powers\code\discipline\torpor.dm" #include "modular_darkpack\modules\powers\code\discipline\auspex\aura_component.dm" @@ -7426,6 +7425,8 @@ #include "modular_darkpack\modules\powers\code\discipline\fortitude\fortitude_status_effect.dm" #include "modular_darkpack\modules\powers\code\discipline\obfuscate\obfuscate.dm" #include "modular_darkpack\modules\powers\code\discipline\obfuscate\obfuscate_helpers.dm" +#include "modular_darkpack\modules\powers\code\discipline\obtenebration\creatures.dm" +#include "modular_darkpack\modules\powers\code\discipline\obtenebration\obtenebration.dm" #include "modular_darkpack\modules\powers\code\discipline\potence\potence.dm" #include "modular_darkpack\modules\powers\code\discipline\potence\potence_status_effect.dm" #include "modular_darkpack\modules\powers\code\discipline\presence\presence.dm" @@ -7627,7 +7628,6 @@ #include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\baali\baali.dm" #include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\baali\holy_weakness.dm" #include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\kiasyd\kiasyd.dm" -#include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\lasombra\creatures.dm" #include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\lasombra\lasombra.dm" #include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\malkavian\malkavian.dm" #include "modular_darkpack\modules\vampire_the_masquerade\code\vampire_clan\clans\tzimisce\crafting_recipes.dm"