diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 3b3736b4b5..6735ef95e9 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -40,3 +40,12 @@ #define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes #define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage + + +///////////// +// NEUTRAL // +///////////// + +#define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark + +#define STATUS_EFFECT_CRUSHERDAMAGETRACKING /datum/status_effect/crusher_damage //tracks total kinetic crusher damage on a target diff --git a/code/__DEFINES/status_effects.dm.rej b/code/__DEFINES/status_effects.dm.rej deleted file mode 100644 index b02f09d005..0000000000 --- a/code/__DEFINES/status_effects.dm.rej +++ /dev/null @@ -1,13 +0,0 @@ -diff a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm (rejected hunks) -@@ -42,3 +41,11 @@ - #define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes - - #define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage -+ -+///////////// -+// NEUTRAL // -+///////////// -+ -+#define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark -+ -+#define STATUS_EFFECT_CRUSHERDAMAGETRACKING /datum/status_effect/crusher_damage //tracks total kinetic crusher damage on a target