Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992

[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
This commit is contained in:
LetterJay
2017-07-06 11:22:24 -05:00
committed by GitHub
24 changed files with 313 additions and 8 deletions
+1
View File
@@ -73,6 +73,7 @@
#define UI_DAMAGE_LAYER 18.2
#define BLIND_LAYER 18.3
#define CRIT_LAYER 18.4
#define CURSE_LAYER 18.5
#define HUD_PLANE 19
#define HUD_LAYER 19
+6
View File
@@ -51,6 +51,12 @@
#define DEVIL_BODYPART "devil"
/*see __DEFINES/inventory.dm for bodypart bitflag defines*/
//Health hud screws for carbon mobs
#define SCREWYHUD_NONE 0
#define SCREWYHUD_CRIT 1
#define SCREWYHUD_DEAD 2
#define SCREWYHUD_HEALTHY 3
//Nutrition levels for humans
#define NUTRITION_LEVEL_FAT 600
#define NUTRITION_LEVEL_FULL 550
+6
View File
@@ -54,6 +54,12 @@
#define STATUS_EFFECT_SAWBLEED /datum/status_effect/saw_bleed //if the bleed builds up enough, takes a ton of damage
#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured
#define CURSE_SPAWNING 2 //spawns creatures that attack the target only
#define CURSE_WASTING 4 //causes gradual damage
#define CURSE_GRASPING 8 //hands reach out from the sides of the screen, doing damage and stunning if they hit the target
/////////////
// NEUTRAL //
/////////////