Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b037dee
beginning
chazzyjazzy Feb 20, 2026
a235b94
soundfile
chazzyjazzy Feb 20, 2026
9764f54
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Feb 20, 2026
588d8f1
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Feb 20, 2026
dfb5939
more copypaste
chazzyjazzy Feb 21, 2026
1d19bd1
big commit
chazzyjazzy Feb 21, 2026
645f725
now time to rewrite daim 5
chazzyjazzy Feb 21, 2026
405facd
time to test
chazzyjazzy Feb 21, 2026
09f20b0
metal pipe sound
chazzyjazzy Feb 21, 2026
6318ac6
she works
chazzyjazzy Feb 22, 2026
b62a366
delete commented out oldcode
chazzyjazzy Feb 22, 2026
4c76d3a
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Feb 22, 2026
50255f7
sounds
chazzyjazzy Feb 22, 2026
6687bb9
here we go
chazzyjazzy Feb 22, 2026
ba8541a
linebreaks and other cleanup
chazzyjazzy Feb 22, 2026
f6883c8
Merge branch 'master' into onion
chazzyjazzy Feb 22, 2026
a8598f8
move that up
chazzyjazzy Feb 22, 2026
f758cdb
pointless commit bc hotspot hard del
chazzyjazzy Feb 22, 2026
fd764bf
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Feb 25, 2026
99c9794
Update modular_darkpack/modules/powers/code/discipline/daimonion/daim…
chazzyjazzy Feb 25, 2026
5b86f9e
Merge branch 'onion' of https://github.com/chazzyjazzy/SecondCity int…
chazzyjazzy Feb 25, 2026
d925564
blah
chazzyjazzy Mar 12, 2026
d6da2fb
starting this
chazzyjazzy Mar 12, 2026
d7aec83
blah
chazzyjazzy Mar 12, 2026
3d6a3e4
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Mar 12, 2026
6d5ab74
bvv
chazzyjazzy Mar 12, 2026
df75429
naga
chazzyjazzy Mar 12, 2026
f270946
salubri
chazzyjazzy Mar 12, 2026
883191b
dg
chazzyjazzy Mar 12, 2026
47d15ae
ok
chazzyjazzy Mar 12, 2026
f5bb52a
bali
chazzyjazzy Mar 13, 2026
2f09c95
compile
chazzyjazzy Mar 14, 2026
9190411
dfsagsgew
chazzyjazzy Mar 14, 2026
3229ee1
grammar
chazzyjazzy Mar 14, 2026
ee32028
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Mar 14, 2026
720a0de
gfndfghdtrhe
chazzyjazzy Mar 14, 2026
fbb115d
Merge branch 'master' into onion
chazzyjazzy Mar 17, 2026
fd25bc8
ok letsb test
chazzyjazzy Mar 19, 2026
d99a115
demon
chazzyjazzy Mar 19, 2026
3b6d44d
Merge branch 'master' into onion
chazzyjazzy Mar 19, 2026
277ee63
Update modular_darkpack/modules/powers/code/discipline/__discipline.dm
chazzyjazzy Mar 25, 2026
e7db011
Update modular_darkpack/modules/vampire_the_masquerade/code/vampire_c…
chazzyjazzy Mar 25, 2026
78a28b6
review
chazzyjazzy Mar 25, 2026
68604ae
Merge remote-tracking branch 'upstream/master' into onion
chazzyjazzy Mar 25, 2026
58653ef
Merge branch 'onion' of https://github.com/chazzyjazzy/SecondCity int…
chazzyjazzy Mar 25, 2026
b7dee17
signature_discipline goodbye
chazzyjazzy Mar 25, 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
3 changes: 3 additions & 0 deletions code/__DEFINES/~darkpack/signals_kindred.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
#define COMSIG_MOB_VAMPIRE_SUCKED "mob_vampire_sucked"
///vampire suck resisted
#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"
7 changes: 7 additions & 0 deletions code/__DEFINES/~darkpack/status_effects_debuffs.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@

#define STATUS_EFFECT_AWE /datum/status_effect/awe

/// daimoinon 5 (condemnation) baali curses
#define STATUS_EFFECT_LYING_WEAKNESS /datum/status_effect/condemnation/lying_weakness
#define STATUS_EFFECT_PHYSICAL_WEAKNESS /datum/status_effect/condemnation/physical_weakness
#define STATUS_EFFECT_MENTAL_WEAKNESS /datum/status_effect/condemnation/mental_weakness
#define STATUS_EFFECT_OFFSPRING_WEAKNESS /datum/status_effect/condemnation/offspring_weakness
#define STATUS_EFFECT_SUCCESS_WEAKNESS /datum/status_effect/condemnation/success_weakness

#define STATUS_EFFECT_PUTREFACTION /datum/status_effect/putrefaction
#define STATUS_EFFECT_PUTREFACTIONTWO /datum/status_effect/putrefaction/two
#define STATUS_EFFECT_PUTREFACTIONTHREE /datum/status_effect/putrefaction/three
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
var/mob/living/carbon/human/owner
///If this Discipline has been assigned before and post_gain effects have already been applied.
var/post_gain_applied
/// Signature clan that "owns" the discipline.
var/signature_clan

//TODO: rework this and set_level to use proper loadouts instead of a default set every time
/datum/discipline/New(level)
Expand Down
186 changes: 0 additions & 186 deletions modular_darkpack/modules/powers/code/discipline/daimonion.dm

This file was deleted.

Loading
Loading