Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ecb5d66
so it begins
Potatocrip Jul 31, 2026
3b0266e
hmmmm not yet plus it doesnt work anyways
Potatocrip Aug 2, 2026
9b53887
Merge branch 'ApocryphaXIII:master' into sisyphean-ananasi
Potatocrip Aug 11, 2026
b654b60
Update vamp_bite.dm
Potatocrip Aug 11, 2026
3b0c14f
Merge branch 'sisyphean-ananasi' of https://github.com/Potatocrip/Apo…
Potatocrip Aug 11, 2026
21d7fac
Update ananasi.dm
Potatocrip Aug 11, 2026
bdb84e1
oh my god bruh
Potatocrip Aug 12, 2026
4cc4fc1
stolen moments
Potatocrip Aug 12, 2026
0a53ff0
placeholder sprites n rage
Potatocrip Aug 12, 2026
09bd81d
hghghgh
Potatocrip Aug 12, 2026
46f11cb
gift stuff
Potatocrip Aug 12, 2026
9425c81
the dehowlening
Potatocrip Aug 12, 2026
8afa9ff
no passive healing
Potatocrip Aug 13, 2026
bb69605
better shifting
Potatocrip Aug 13, 2026
64d68cf
perk desc
Potatocrip Aug 13, 2026
674bf54
oops
Potatocrip Aug 13, 2026
9b90adb
better kiss
Potatocrip Aug 13, 2026
45c4946
im jobbing
Potatocrip Aug 14, 2026
6667a43
this is jobshit
Potatocrip Aug 14, 2026
82051a2
fur colors
Potatocrip Aug 14, 2026
c4d862f
cabals
Potatocrip Aug 20, 2026
8653bd2
Merge branch 'master' into sisyphean-ananasi
Potatocrip Aug 20, 2026
b27e848
Merge branch 'sisyphean-ananasi' of https://github.com/Potatocrip/Apo…
Potatocrip Aug 20, 2026
d8fdb68
aspect examine text
Potatocrip Aug 22, 2026
87ac7a2
alter mood
Potatocrip Aug 22, 2026
e8febf9
cabal gifts pt1
Potatocrip Aug 22, 2026
66a7ad7
Merge branch 'ApocryphaXIII:master' into sisyphean-ananasi
Potatocrip Aug 22, 2026
a6e165f
Merge branch 'sisyphean-ananasi' of https://github.com/Potatocrip/Apo…
Potatocrip Aug 22, 2026
f00f12f
oops lmao
Potatocrip Aug 23, 2026
bf555dc
more gift icon
Potatocrip Aug 25, 2026
70ca77d
tribe defines n gift sound
Potatocrip Aug 26, 2026
53351f1
tribe traits and wyrmling kinship
Potatocrip Aug 26, 2026
9c6a112
groom gift
Potatocrip Aug 26, 2026
a7ce0b6
blood of pain and beneath notice gifts
Potatocrip Aug 26, 2026
1fb6542
better beneath notice
Potatocrip Aug 27, 2026
94ba7b7
cabal icons and descriptions
Potatocrip Aug 27, 2026
954ea5a
stam check pass sound
Potatocrip Aug 27, 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
12 changes: 12 additions & 0 deletions code/__DEFINES/~darkpack/fera/fera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
#define BREED_CORAX_HOMID "Corax Homid"
#define BREED_CORVID "Corvid"

#define BREED_ANANASI_HOMID "Ananasi Homid"
#define BREED_ARACHNID "Arachnid"

#define FEATURE_FUR_COLOR "fera_fur"

// fera will likely have a seperate list of colors but uses the same feature or var as other fera
Expand All @@ -37,5 +40,14 @@ GLOBAL_LIST_INIT(corax_fur_colors, list(
"gray" = "gray",
))

GLOBAL_LIST_INIT(ananasi_fur_colors, list(
"black" = "black",
"blue" = "blue",
"red" = "red",
"white" = "white",
"ginger" = "ginger",
"brown" = "brown",
))

#define STATUS_EFFECT_DELIRIUM /datum/status_effect/delirium
#define STATUS_EFFECT_SILVER_BULLET_STACKS /datum/status_effect/stacking/silver_bullets
16 changes: 13 additions & 3 deletions code/__DEFINES/~darkpack/fera/werewolf_tribe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,18 @@
#define TRIBE_STARGAZERS "Stargazers"
#define TRIBE_BLACK_SPIRAL_DANCERS "Black Spiral Dancers"

#define TRIBE_SECEAN "Secean"
#define TRIBE_PLICARE "Plicare"
#define TRIBE_GADERIN "Gaderin"
#define TRIBE_AGERE "Agere"
#define TRIBE_ANOMIA "Anomia"
#define TRIBE_MALUM "Malum"
#define TRIBE_KAR "Kar"
#define TRIBE_AMARI_ALIQUID "Amari Aliquid"
#define TRIBE_CHYMOS "Chymos"

#define TRIBE_LIST_ALL list(TRIBE_RONIN, TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_BLACK_SPIRAL_DANCERS)
#define TRIBE_LIST_GAIA list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS)
#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS)
#define TRIBE_LIST_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS)
#define TRIBE_LIST_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS)
#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS, TRIBE_KAR, TRIBE_AMARI_ALIQUID, TRIBE_CHYMOS)
#define TRIBE_LIST_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SECEAN, TRIBE_PLICARE, TRIBE_GADERIN)
#define TRIBE_LIST_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_AGERE, TRIBE_ANOMIA, TRIBE_MALUM)
5 changes: 3 additions & 2 deletions code/__DEFINES/~darkpack/signals_kindred.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// This is the new signals file for every signal vampire related in WOD13
// New signals related to vampires and things vampires do should be defined here

///called in bloodsucking.dm at the end of /mob/living/carbon/human/proc/drinksomeblood
// WAS called in bloodsucking.dm at the end of /mob/living/carbon/human/proc/drinksomeblood, now
// handled by a trait check. this could still be useful for other things though so keeping this
#define COMSIG_MOB_VAMPIRE_SUCKED "mob_vampire_sucked"
///vampire suck resisted
#define COMPONENT_RESIST_VAMPIRE_KISS (1<<0)
// #define COMPONENT_RESIST_VAMPIRE_KISS (1<<0)

///baali demons have touched the target, time to apply the effect from daimonion 4
#define COMSIG_BAALI_DEMON_REACHED_TARGET "baali_demon_reached_target"
3 changes: 2 additions & 1 deletion code/__DEFINES/~darkpack/splats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//#define SPLAT_FERA "splat_fera"
#define SPLAT_GAROU "splat_garou"
#define SPLAT_CORAX "splat_corax"
#define SPLAT_SHIFTERS list(SPLAT_GAROU, SPLAT_CORAX)
#define SPLAT_ANANASI "splat_ananasi"
#define SPLAT_SHIFTERS list(SPLAT_GAROU, SPLAT_CORAX, SPLAT_ANANASI)

#define SPLAT_PRIO_HALFSPLAT 100
#define SPLAT_PRIO_SPLAT 200
Expand Down
10 changes: 10 additions & 0 deletions code/__DEFINES/~darkpack/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_SCARRING_RESISTANT "scarring_resistant"// Temporal scars wont save
/// Stepping on glass shards immunity. Currently used for a couple Garou forms but could be used elsewhere.
#define TRAIT_HARDENED_SOLES "hardened_soles"
// Splats that resist the affects of The Kiss
#define TRAIT_RESISTS_KISS "resists_kiss"


// Allows the user to pass through doors
Expand Down Expand Up @@ -161,6 +163,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_JAMMING_WEAPONS "jamming_weapons"
#define TRAIT_NATURAL "natural"
#define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
// Fera with no passive healing
#define TRAIT_NO_PASSIVE_HEALING "no_passive_healing"
// Wyrmling Kinship gift, per Changing Breeds - Ananasi Gifts - Hatar
#define TRAIT_WYRMLING_KINSHIP "wyrmling_kinship"
// Prevents bloodying, made for Groom gift, per Changing Breeds - Ananasi Gifts - Tenere
#define TRAIT_ALWAYS_CLEAN "always_clean"
// Blood Of Pain gift, per Changing Breeds - Ananasi Gifts - Hatar
#define TRAIT_BLOOD_OF_PAIN "blood_of_pain"

/// Mob has had atleast one tooth yanked out while having no method of regenerating it.
#define TRAIT_TOOTH_PULLED "tooth_pulled"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/~darkpack/traits/sources.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

#define GIFT_TRAIT "gift"

/// Trait given by a fera's Tribe
#define TRIBE_TRAIT "tribe"

#define STAKE_TRAIT "stake"
#define DAMAGE_TRAIT "damage"

Expand Down
5 changes: 5 additions & 0 deletions code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -693,12 +693,14 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
"TRAIT_ALWAYS_CLEAN" = TRAIT_ALWAYS_CLEAN, // DARKPACK EDIT ADD - ANANASI
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BANNED_TRANSFORMATION" = TRAIT_BANNED_TRANSFORMATION, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_BEACON_OF_THE_UNHOLY" = TRAIT_BEACON_OF_THE_UNHOLY, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
"TRAIT_BLOOD_OF_PAIN" = TRAIT_BLOOD_OF_PAIN, // DARKPACK EDIT ADD - ANANASI
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
"TRAIT_BOND_WITHIN_THE_MOUNTAIN" = TRAIT_BOND_WITHIN_THE_MOUNTAIN, // DARKPACK EDIT ADD - POWERS - (Visceratika)
Expand Down Expand Up @@ -761,6 +763,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NO_CUFF" = TRAIT_NO_CUFF, // DARKPACK EDIT ADD
"TRAIT_NO_EYE_CONTACT" = TRAIT_NO_EYE_CONTACT, // DARKPACK EDIT ADD
"TRAIT_NO_LYING_ANGLE" = TRAIT_NO_LYING_ANGLE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_NO_PASSIVE_HEALING" = TRAIT_NO_PASSIVE_HEALING, // DARKPACK EDIT ADD - WEREWOLF - (Ananasi)
"TRAIT_OBFUSCATED" = TRAIT_OBFUSCATED, // DARKPACK EDIT ADD
"TRAIT_ORGANOVORE" = TRAIT_ORGANOVORE, // DARKPACK EDIT ADD - Nagaraja
"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
Expand All @@ -773,6 +776,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_RAZOR_CLAWS" = TRAIT_RAZOR_CLAWS, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_REJECTED_BY_TECHNOLOGY" = TRAIT_REJECTED_BY_TECHNOLOGY, // DARKPACK EDIT ADD
"TRAIT_REPELLED_BY_HOLINESS" = TRAIT_REPELLED_BY_HOLINESS, // DARKPACK EDIT ADD
"TRAIT_RESISTS_KISS" = TRAIT_RESISTS_KISS, // DARKPACK EDIT ADD
"TRAIT_RUBICON" = TRAIT_RUBICON, // DARKPACK EDIT ADD
"TRAIT_SANGUINE_INCONGRUITY" = TRAIT_SANGUINE_INCONGRUITY, // DARKPACK EDIT ADD - Giovanni Quirk
"TRAIT_SCARRING_RESISTANT" = TRAIT_SCARRING_RESISTANT, // DARKPACK EDIT ADD
Expand Down Expand Up @@ -808,6 +812,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_WEAK_DELIRIUM" = TRAIT_WEAK_DELIRIUM, // DARKPACK EDIT ADD - WEREWOLF - (corax)
"TRAIT_WEAK_TO_DOMINATE" = TRAIT_WEAK_TO_DOMINATE, // DARKPACK EDIT ADD - POWERS - (Dominate)
"TRAIT_WEAK_WILLED" = TRAIT_WEAK_WILLED, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_WYRMLING_KINSHIP" = TRAIT_WYRMLING_KINSHIP, // DARKPACK EDIT ADD - ANANASI
"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_WYRMTAINTED_SPRITE" = TRAIT_WYRMTAINTED_SPRITE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BRASSKNUCKLES" = TRAIT_BRASSKNUCKLES, // DARKPACK EDIT ADD - CLOTHES
Expand Down
4 changes: 4 additions & 0 deletions code/_globalvars/traits/admin_tooling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,13 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
"TRAIT_ALWAYS_CLEAN" = TRAIT_ALWAYS_CLEAN, // DARKPACK EDIT ADD - ANANASI
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BANNED_TRANSFORMATION" = TRAIT_BANNED_TRANSFORMATION, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_BEACON_OF_THE_UNHOLY" = TRAIT_BEACON_OF_THE_UNHOLY, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
"TRAIT_BLOOD_OF_PAIN" = TRAIT_BLOOD_OF_PAIN, // DARKPACK EDIT ADD - ANANASI
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
"TRAIT_CALM_HEART" = TRAIT_CALM_HEART, // DARKPACK EDIT ADD - MERITS_FLAWS
Expand Down Expand Up @@ -426,6 +428,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_NO_CUFF" = TRAIT_NO_CUFF, // DARKPACK EDIT ADD
"TRAIT_NO_EYE_CONTACT" = TRAIT_NO_EYE_CONTACT, // DARKPACK EDIT ADD
"TRAIT_NO_LYING_ANGLE" = TRAIT_NO_LYING_ANGLE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_NO_PASSIVE_HEALING" = TRAIT_NO_PASSIVE_HEALING, // DARKPACK EDIT ADD - WEREWOLF - (Ananasi)
"TRAIT_OBFUSCATED" = TRAIT_OBFUSCATED, // DARKPACK EDIT ADD
"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
"TRAIT_PALE_AURA" = TRAIT_PALE_AURA, // DARKPACK EDIT ADD - MERITS_FLAWS
Expand Down Expand Up @@ -464,6 +467,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_WEAK_DELIRIUM" = TRAIT_WEAK_DELIRIUM, // DARKPACK EDIT ADD - WEREWOLF - (corax)
"TRAIT_WEAK_TO_DOMINATE" = TRAIT_WEAK_TO_DOMINATE, // DARKPACK EDIT ADD - POWERS - (Dominate)
"TRAIT_WEAK_WILLED" = TRAIT_WEAK_WILLED, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_WYRMLING_KINSHIP" = TRAIT_WYRMLING_KINSHIP, // DARKPACK EDIT ADD - ANANASI
"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_WYRMTAINTED_SPRITE" = TRAIT_WYRMTAINTED_SPRITE, // DARKPACK EDIT ADD - WEREWOLF
),
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/bloodysoles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
return

/// The character is agile enough to not mess their clothing and hands just from one blood splatter at floor
if(HAS_TRAIT(wielder, TRAIT_LIGHT_STEP))
if(HAS_TRAIT(wielder, TRAIT_LIGHT_STEP) || HAS_TRAIT(wielder, TRAIT_ALWAYS_CLEAN)) // APOC EDIT CHANGE - (#139 Ananasi)
return

// Don't share from other feetprints, not super realistic but I think it ruins the effect a bit
Expand Down
4 changes: 4 additions & 0 deletions code/modules/forensics/forensics_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@
)
if(QDELING(src))
return FALSE
if(HAS_TRAIT(src, TRAIT_ALWAYS_CLEAN)) // APOC EDIT CHANGE - (#139 Ananasi)
return FALSE

if(!length(blood_DNA_to_add))
return FALSE
Expand Down Expand Up @@ -237,6 +239,8 @@
/mob/living/add_blood_DNA(list/blood_DNA_to_add, list/datum/disease/diseases)
if(QDELING(src))
return FALSE
if(HAS_TRAIT(src, TRAIT_ALWAYS_CLEAN)) // APOC EDIT CHANGE - (#139 Ananasi)
return FALSE
if(!length(blood_DNA_to_add))
return FALSE
if(isnull(forensics))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -596,3 +596,9 @@
AddElement(/datum/element/pet_bonus, "chitter")
AddElement(/datum/element/ai_retaliate)
ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)

// Ananasi Subtype
/mob/living/basic/spider/giant/arachnid
name = "spider"
desc = "Furry and black, it makes you shudder to look at it."
speak_emote = list("hiss")
1 change: 1 addition & 0 deletions config/darkpack_config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ ROUNDSTART_SPLATS splat_ghoul
ROUNDSTART_SPLATS splat_kinfolk
ROUNDSTART_SPLATS splat_garou
ROUNDSTART_SPLATS splat_corax
ROUNDSTART_SPLATS splat_ananasi

## If dead people and ghosts can LOOC to people who are alive.
DISABLE_GHOST_LOOC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
TRAIT_NOBREATH,
TRAIT_TOXIMMUNE,
TRAIT_NOCRITDAMAGE,
TRAIT_FAKEDEATH
TRAIT_FAKEDEATH,
TRAIT_RESISTS_KISS
)
//mutantbrain = /obj/item/organ/brain/vampire //to prevent brain transplant surgery
//mutanteyes = /obj/item/organ/eyes/night_vision/zombie
Expand All @@ -34,18 +35,7 @@
C.maxHealth = 300 //tanky
C.health = 300

//zombies resist vampire bites better than mortals
RegisterSignal(C, COMSIG_MOB_VAMPIRE_SUCKED, PROC_REF(on_zombie_bitten))
ADD_TRAIT(C, TRAIT_MASQUERADE_VIOLATING_FACE, "zombie")

/datum/species/zombie/proc/on_zombie_bitten(datum/source, mob/living/carbon/being_bitten)
SIGNAL_HANDLER

return COMPONENT_RESIST_VAMPIRE_KISS

/datum/species/zombie/on_species_loss(mob/living/carbon/human/human, datum/species/new_species, pref_load)
. = ..()
UnregisterSignal(human, COMSIG_MOB_VAMPIRE_SUCKED)
*/

#undef REGENERATION_DELAY
13 changes: 12 additions & 1 deletion modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

if(!do_after(src, 3 SECONDS, target = drunk_from, timed_action_flags = NONE, show_progress = FALSE))
remove_drinking_overlay(drunk_from)
if(!(SEND_SIGNAL(drunk_from, COMSIG_MOB_VAMPIRE_SUCKED, drunk_from) & COMPONENT_RESIST_VAMPIRE_KISS))
if(get_kindred_splat(src) && !HAS_TRAIT(src, TRAIT_PAINFUL_VAMPIRE_KISS) && !HAS_TRAIT(drunk_from, TRAIT_RESISTS_KISS))
drunk_from.apply_status_effect(/datum/status_effect/kissed)
return

Expand Down Expand Up @@ -74,6 +74,17 @@
remove_drinking_overlay(drunk_from)
return

if(get_ananasi_splat(drunk_from))
to_chat(src, span_userdanger("Something is WRONG with [drunk_from]'s blood!"))
visible_message(span_danger("[src] throws up!"), span_userdanger("You throw up!"))
playsound(get_turf(src), 'modular_darkpack/modules/deprecated/sounds/vomit.ogg', 75, TRUE)
if(isturf(loc))
add_splatter_floor(loc)
remove_drinking_overlay(drunk_from)
if(HAS_TRAIT(drunk_from, TRAIT_BLOOD_OF_PAIN))
apply_status_effect(/datum/status_effect/blood_of_pain)
return

if(get_kindred_splat(drunk_from))
to_chat(src, span_userdanger("[drunk_from]'s blood tastes HEAVENLY..."))
adjust_brute_loss(-25, TRUE)
Expand Down
11 changes: 9 additions & 2 deletions modular_darkpack/modules/blood_drinking/code/vamp_bite.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
if(grab_state > GRAB_PASSIVE)
if(isliving(pulling))
var/mob/living/bit_living = pulling
if(!get_vampire_splat(src))
if(!get_vampire_splat(src) && !get_ananasi_splat(src))
SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75))
to_chat(src, span_warning("You're not desperate enough to try <i>that</i>."))
return
if(get_ananasi_splat(src))
if(get_kindred_splat(bit_living))
SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75))
to_chat(src, span_warning("This <b>BLOOD</b> is toxic to you!"))
return
// Allow ghouls to steal viate?
if(get_ghoul_splat(src))
if(!get_kindred_splat(bit_living))
Expand Down Expand Up @@ -71,7 +76,9 @@

if(get_kindred_splat(src))
bit_living.emote("groan")
else if(get_ghoul_splat(src))
if(get_ghoul_splat(src))
bit_living.emote("scream")
if(get_ananasi_splat(src))
bit_living.emote("scream")

if(ishuman(bit_living))
Expand Down
3 changes: 2 additions & 1 deletion modular_darkpack/modules/jobs/code/anarchs/bruiser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@

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_HEALER_SALUBRI, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL)
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_ANANASI)
splat_slots = list(SPLAT_ANANASI = 1)
maximal_generation = 9
maximum_immortal_age = 200
description = "You are the enforcer of the Anarchs. The baron is always in need of muscle power. Enforce the Traditions - in the anarch way."
Expand Down
4 changes: 2 additions & 2 deletions modular_darkpack/modules/jobs/code/anarchs/tapster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
*/

known_contacts = list("Baron", "Bouncer", "Emissary", "Sweeper")
allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL)
splat_slots = list(SPLAT_NONE = 2, SPLAT_GHOUL = 2)
allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_ANANASI)
splat_slots = list(SPLAT_NONE = 2, SPLAT_GHOUL = 2, SPLAT_ANANASI = 1)
description = "You are an employee of the local smoke shop. Serve the eclectic clients that pass through, and try not to ask too many questions." // APOC EDIT CHANGE - JOBS
minimum_masquerade = 0

Expand Down
3 changes: 2 additions & 1 deletion modular_darkpack/modules/jobs/code/camarilla/hound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
maximal_generation = 9
maximum_immortal_age = 200
minimum_masquerade = 3
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL)
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_ANANASI)
allowed_clans = list(VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, 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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
splat_slots = list(SPLAT_ANANASI = 1)

known_contacts = list("Prince", "Sheriff")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
maximal_generation = 9
maximum_immortal_age = 200
known_contacts = list("Prince", "Sheriff", "Seneschal")
allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINDRED)
allowed_splats = list(SPLAT_NONE, SPLAT_GHOUL, SPLAT_KINDRED, SPLAT_ANANASI)
allowed_clans = list(VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, 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_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_NAGARAJA)
splat_slots = list(SPLAT_ANANASI = 1)
description = "You work directly for the Millenium Tower and its administrative staff in a variety of ways, you may even be a personal retainer of one of the top three, to the point that any oddities that you may see over night or hear are either things you are already aware or you simply laugh them off and try not to think about it."
minimum_masquerade = 4

Expand Down
1 change: 0 additions & 1 deletion modular_darkpack/modules/jobs/code/clinic/doctor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
description = "Help your fellow kindred in all matters medicine related. Sell blood. Keep your human colleagues ignorant."
maximal_generation = 9
maximum_immortal_age = 200
allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE)
allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_VENTRUE_ANTITRIBU, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_DOMINATE_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BANU_HAQIM_VIZIER, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TLACIQUE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_NAGARAJA)
known_contacts = list("Clinic Director")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"Club Attendant"
)

allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE)

maximal_generation = 9
maximum_immortal_age = 200
description = "Offer strip club services. Some of your clientele may be... Unusual, but you are either addicted to vampire bites, or bribed to listen little and say even less."
Expand Down
Loading
Loading