Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
38b9c5a
blank disciplines
XeonMations Nov 24, 2025
3f09f37
raaahhhh
XeonMations Nov 24, 2025
af9d51a
AAAAAAAAAA
XeonMations Nov 24, 2025
ffc4773
viscissitude 1 alpha
XeonMations Nov 24, 2025
934681a
Update basic_shapeshifting.dm
XeonMations Nov 24, 2025
85c596a
finally
XeonMations Nov 24, 2025
b458c16
wow
XeonMations Nov 24, 2025
0d33333
Update basic_shapeshifting.dm
XeonMations Nov 25, 2025
c06eee2
Merge branch 'master' into viscissitude
XeonMations Nov 25, 2025
e862ca3
RAHHHHHHHHHH
XeonMations Nov 26, 2025
7e041bf
rahhh
XeonMations Nov 26, 2025
6c70335
RAHHH
XeonMations Nov 26, 2025
b6984ae
Update vicissitude.dm
XeonMations Nov 27, 2025
3ea731e
Update vicissitude.dm
XeonMations Nov 27, 2025
5095905
Update vicissitude.dm
XeonMations Nov 27, 2025
2148527
awawa
XeonMations Nov 27, 2025
eab196b
Update vicissitude.dm
XeonMations Nov 27, 2025
bdb82f0
surgeries :3
XeonMations Nov 27, 2025
2888433
bugfix for surgeries
XeonMations Nov 27, 2025
6612dfe
moar bugfixes
XeonMations Nov 28, 2025
f709dff
awa
XeonMations Nov 28, 2025
244877a
visc 3 + sound changes
XeonMations Nov 28, 2025
9402897
Update vicissitude.dm
XeonMations Nov 28, 2025
eaa4faf
Merge branch 'master' into viscissitude
XeonMations Nov 28, 2025
230c242
Merge branch 'master' into viscissitude
XeonMations Nov 28, 2025
4312238
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Nov 28, 2025
079ff5c
Update discipline.dm
XeonMations Nov 28, 2025
8305bc4
Update vicissitude.dm
XeonMations Nov 28, 2025
f593062
Update flesh_items.dmi
XeonMations Nov 28, 2025
ed28ad9
Update shapeshifting.dm
XeonMations Nov 28, 2025
0bb79d4
Update vicissitude.dm
XeonMations Nov 28, 2025
976891f
awawa
XeonMations Nov 28, 2025
7c075ab
remove shapeshift spells
XeonMations Nov 29, 2025
66e92c6
zulo
XeonMations Nov 29, 2025
097ddf4
awawa
XeonMations Nov 29, 2025
1feb65e
awawa
XeonMations Dec 6, 2025
1a611aa
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Dec 9, 2025
b5eb9ea
Merge branch 'master' into viscissitude
XeonMations Dec 10, 2025
5f8a6e6
Merge branch 'master' into viscissitude
XeonMations Dec 12, 2025
9e00d0e
Merge branch 'master' into viscissitude
XeonMations Dec 15, 2025
a17bbfc
Merge branch 'master' into viscissitude
XeonMations Dec 18, 2025
2bb674c
Merge branch 'master' into viscissitude
XeonMations Dec 20, 2025
2b69ba5
Merge branch 'master' into viscissitude
XeonMations Dec 22, 2025
2ff4adb
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Jan 22, 2026
5512929
Update tgstation.dme
XeonMations Jan 22, 2026
00423a4
me when new surgery
XeonMations Jan 22, 2026
df75d6e
hm
XeonMations Jan 22, 2026
985aef5
awawa
XeonMations Jan 23, 2026
78fee25
Update operation_eye_color.dm
XeonMations Jan 23, 2026
6850bbc
Update crafting_recipes.dm
XeonMations Jan 23, 2026
cd96a70
Update needs_home_soil.dm
XeonMations Jan 23, 2026
6ededfc
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Jan 23, 2026
ed4624d
awaw
XeonMations Jan 23, 2026
bac5960
awaw
XeonMations Jan 23, 2026
2121350
aawa
XeonMations Jan 23, 2026
8b268d3
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Feb 8, 2026
9d531ed
Update vicissitude.dm
XeonMations Feb 8, 2026
00df41a
Update vicissitude.dm
XeonMations Feb 10, 2026
d982ed5
awawwawa
XeonMations Feb 10, 2026
2ff810b
rahhh
XeonMations Feb 10, 2026
789b1fd
Update vicissitude.dm
XeonMations Feb 10, 2026
0f186f0
Update vicissitude.dm
XeonMations Feb 10, 2026
939c9e6
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Feb 10, 2026
2dcee96
Update vicissitude.dm
XeonMations Feb 10, 2026
c479152
awawa
XeonMations Feb 10, 2026
c477e2c
awaw
XeonMations Feb 10, 2026
3beff39
Update zulo_forms.dmi
XeonMations Feb 10, 2026
5d3da2f
awaw
XeonMations Feb 10, 2026
873eeef
Update zulo_preferences.dm
XeonMations Feb 10, 2026
c64d6ef
Update zulo_preferences.dm
XeonMations Feb 10, 2026
926356c
Update zulo_preferences.dm
XeonMations Feb 10, 2026
b680bc8
Update vicissitude.dm
XeonMations Feb 10, 2026
9d53083
Update zulo.dm
XeonMations Feb 10, 2026
8d6491a
Update vicissitude.dm
XeonMations Feb 12, 2026
3dc5729
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Feb 12, 2026
aeff90f
Update shapeshifting.dm
XeonMations Feb 12, 2026
d69a2c8
awaw
XeonMations Feb 12, 2026
388a9f9
Update zulo_preferences.dm
XeonMations Feb 12, 2026
b7dd691
Update zulo_preferences.dm
XeonMations Feb 12, 2026
9d3f070
Update zulo_preferences.dm
XeonMations Feb 12, 2026
3cb6ea5
awaw
XeonMations Feb 12, 2026
f5e5912
Update zulo_preferences.dm
XeonMations Feb 12, 2026
86cc7f6
Update zulo.dm
XeonMations Feb 12, 2026
3366c12
Update zulo.dm
XeonMations Feb 12, 2026
8153cf7
Update zulo_preferences.dm
XeonMations Feb 12, 2026
84e9143
Update zulo_preferences.dm
XeonMations Feb 12, 2026
d0a38ba
Update zulo_preferences.dm
XeonMations Feb 12, 2026
5a442ff
Update zulo_preferences.dm
XeonMations Feb 12, 2026
0fea92e
Update zulo_preferences.dm
XeonMations Feb 12, 2026
71f62b3
awawawwa
XeonMations Feb 12, 2026
8ab39c8
finally works
XeonMations Feb 13, 2026
2d5b62a
awaww
XeonMations Feb 13, 2026
366468b
awaw
XeonMations Feb 19, 2026
56d00ce
Merge remote-tracking branch 'upstream/master' into viscissitude
XeonMations Feb 27, 2026
125185b
Update 64x64.dmi
XeonMations Feb 27, 2026
672c453
awwa
XeonMations Feb 27, 2026
14de538
awaw
XeonMations Feb 27, 2026
7063134
awaw
XeonMations Feb 27, 2026
53e9947
Update zulo_preferences.dm
XeonMations Feb 27, 2026
1791024
Update creatures.dm
XeonMations Feb 27, 2026
f7cc67d
Update __discipline_power.dm
XeonMations Feb 27, 2026
a339811
awawawawawawa
XeonMations Feb 27, 2026
27b0752
Update vicissitude.dm
XeonMations Feb 27, 2026
4042974
Update zulo.dm
XeonMations Feb 27, 2026
5fe1c75
Update zulo.dm
XeonMations Feb 27, 2026
80086d9
Update zulo.dm
XeonMations Feb 27, 2026
5f98e55
Update vicissitude.dm
XeonMations Feb 27, 2026
34d6e00
woaw
XeonMations Feb 27, 2026
f9872af
rahhh
XeonMations Feb 27, 2026
8e16a11
wdawawdwa
XeonMations Feb 27, 2026
00b7257
Update zulo.dm
XeonMations Feb 27, 2026
d846255
Update zulo.dm
XeonMations Feb 27, 2026
4d7b16b
Update vicissitude.dm
XeonMations Feb 27, 2026
e662133
awwawa
XeonMations Feb 27, 2026
06bc89a
RAHHHHHH
XeonMations Feb 27, 2026
b8fc7d5
Update blood_form.dm
XeonMations Feb 27, 2026
9bbf6bb
RAHHHH
XeonMations Feb 27, 2026
5b04137
Update discipline_actions.dm
XeonMations Feb 27, 2026
a93e7e0
Update blood_form.dm
XeonMations Feb 27, 2026
24382de
TODO: Brute immunity, Limb Regeneration
XeonMations Feb 27, 2026
543d2c2
Update surgery_tools.dm
XeonMations Feb 27, 2026
bda82b3
Update blood_form.dm
XeonMations Feb 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
8 changes: 0 additions & 8 deletions code/__DEFINES/~darkpack/dcs/power_signals.dm
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
/* Signals for the World of Darkness power system */
//Normal signals sent to the power and caster, _ON signals are sent to target

//can_activate() signals
///from datum/discipline_power/can_activate(): (datum/discipline_power/power, atom/target)
#define COMSIG_POWER_TRY_ACTIVATE "power_try_activate"
///from datum/discipline_power/can_activate(): (datum/discipline_power/power)
#define COMSIG_POWER_TRY_ACTIVATE_ON "power_try_activate_on"
///Makes can_activate return false and prevent activation
#define POWER_PREVENT_ACTIVATE (1<<0)

//pre_activation() signals
///from datum/discipline_power/pre_activation(): (datum/discipline_power/power, atom/target)
#define COMSIG_POWER_PRE_ACTIVATION "power_pre_activation"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/~darkpack/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
// its called this because theres apparently already a defined quirk called 'hungry' which appears to lower your blood drawn from biting by half.
#define TRAIT_NEEDS_BLOOD "vampire_hungry"

// If the vampire can't perform mental abilities that require eye contact, as an example: dominate.
#define TRAIT_NO_EYE_CONTACT "no_eye_contact"

/// If the species has garou breeds to select.
#define TRAIT_WTA_GAROU_BREED "wta_garou_breeds"
// if the species has garou tribes to select.
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_MASQUERADE_VIOLATING_EYES" = TRAIT_MASQUERADE_VIOLATING_EYES, // DARKPACK EDIT ADD
"TRAIT_MASQUERADE_VIOLATING_FACE" = TRAIT_MASQUERADE_VIOLATING_FACE, // DARKPACK EDIT ADD
"TRAIT_NEEDS_BLOOD" = TRAIT_NEEDS_BLOOD, //DARKPACK EDIT ADD - Hunger and Frenzy
"TRAIT_NO_EYE_CONTACT" = TRAIT_NO_EYE_CONTACT, // DARKPACK EDIT ADD
"TRAIT_ORGANOVORE" = TRAIT_ORGANOVORE, // DARKPACK EDIT ADD - Nagaraja
"TRAIT_SANGUINE_INCONGRUITY" = TRAIT_SANGUINE_INCONGRUITY, // DARKPACK EDIT ADD - Giovanni Quirk
"TRAIT_MONSTROUS" = TRAIT_MONSTROUS, // DARKPACK EDIT ADD - MERITS/FLAWS
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/admin_tooling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_MASQUERADE_VIOLATING_FACE" = TRAIT_MASQUERADE_VIOLATING_FACE, // DARKPACK EDIT ADD
"TRAIT_NEEDS_BLOOD" = TRAIT_NEEDS_BLOOD, //DARKPACK EDIT ADD - Hunger and Frenzy
"TRAIT_NON_INT" = TRAIT_NON_INT, // 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_OBFUSCATED" = TRAIT_OBFUSCATED, // DARKPACK EDIT ADD
"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
Expand Down
5 changes: 1 addition & 4 deletions code/datums/components/crafting/crafting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -467,12 +467,9 @@
if (recipe.category == CAT_CULT && !IS_CULTIST(user)) // Skip blood cult recipes if not cultist
return FALSE
// DARKPACK EDIT ADD - START
if (recipe.category == CAT_TZIMISCE) // TODO: [Disciplines] Uncomment when viscissitude is a thing.
return FALSE
/* DARKPACK TODO: Vicissitude
if (recipe.category == CAT_TZIMISCE)
var/mob/living/living_user = astype(user)
return living_user?.get_discipline(/datum/discipline/vicissitude)
*/
// DARKPACK EDIT ADD - END
return recipe.is_recipe_available(user) // DARKPACK EDIT CHANGE

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
desc = "Apply plastic to a patient's face to to allow for greater customization in following plastic surgery."
implements = list(
/obj/item/stack/sheet/plastic = 1,
/obj/item/stack/sheet/human_flesh = 1, // DARKPACK EDIT ADD
)
time = 4.8 SECONDS
operation_flags = OPERATION_MORBID | OPERATION_LOCKED | OPERATION_NO_PATIENT_REQUIRED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@
to_chat(owner, span_warning("The implant doesn't respond. It seems to be broken..."))
return

// DARKPACK EDIT START
var/datum/component/two_handed/two_handed = GetComponent(/datum/component/two_handed)
if(two_handed)
return
// DARKPACK EDIT END
if(!active_item || (active_item in src))
active_item = null
if(contents.len == 1)
Expand Down
16 changes: 0 additions & 16 deletions modular_darkpack/modules/clothes/code/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -371,22 +371,6 @@
desc = "True power lies not in wealth, but in the things it affords you."
icon_state = "strauss_coat"

/obj/item/clothing/suit/vampire/trench/tzi
name = "fleshcoat"
desc = "HUMAN LEATHER JACKET."
icon_state = "trench_tzi"
armor_type = /datum/armor/fleshcoat
clothing_traits = list(TRAIT_UNMASQUERADE)

/datum/armor/fleshcoat
melee = 50
bullet = 50
laser = 10
energy = 10
bomb = 25
acid = 10
wound = 50

/obj/item/clothing/suit/vampire/trench/voivode
name = "regal coat"
desc = "A beautiful jacket. Whoever owns this must be important."
Expand Down
Binary file modified modular_darkpack/modules/deprecated/icons/64x64.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/deprecated/icons/icons.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/deprecated/icons/onfloor.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/deprecated/icons/props.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
maxHealth = 1500
health = 1500

guaranteed_butcher_results = list(/obj/item/stack/human_flesh = 20)
guaranteed_butcher_results = list(/obj/item/stack/sheet/human_flesh = 20)

combat_mode = TRUE
melee_damage_type = AGGRAVATED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
maxHealth = 575
health = 575

butcher_results = list(/obj/item/stack/human_flesh = 10)
butcher_results = list(/obj/item/stack/sheet/human_flesh = 10)

combat_mode = TRUE
melee_damage_lower = 35
Expand Down
Loading
Loading