shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-27 20:55:08 -05:00
parent 499ef04593
commit c07034f45a
14 changed files with 350 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/status_effects.dm
-1
View File
@@ -30,7 +30,6 @@
// DEBUFFS //
/////////////
#define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark
#define STATUS_EFFECT_BELLIGERENT /datum/status_effect/belligerent //forces the affected to walk, doing damage if they try to run
#define STATUS_EFFECT_MANIAMOTOR /datum/status_effect/maniamotor //disrupts, damages, and confuses the affected as long as they're in range of the motor
code/__DEFINES/status_effects.dm.rej
+13
View File
@@ -0,0 +1,13 @@
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