Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

[MIRROR] [Ready]Brain Trauma additions
This commit is contained in:
deathride58
2017-12-21 03:42:38 +00:00
committed by GitHub
29 changed files with 525 additions and 140 deletions
+1 -1
View File
@@ -495,7 +495,7 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define RIDING_OFFSET_ALL "ALL"
//text files
#define BRAIN_DAMAGE_FILE "brain_damage_lines.json"
#define BRAIN_DAMAGE_FILE "traumas.json"
//Fullscreen overlay resolution in tiles.
#define FULLSCREEN_OVERLAY_RESOLUTION_X 15
+2 -2
View File
@@ -52,8 +52,8 @@
/*see __DEFINES/inventory.dm for bodypart bitflag defines*/
//Brain Damage defines
#define BRAIN_DAMAGE_MILD 50
#define BRAIN_DAMAGE_SEVERE 120
#define BRAIN_DAMAGE_MILD 20
#define BRAIN_DAMAGE_SEVERE 100
#define BRAIN_DAMAGE_DEATH 200
#define BRAIN_TRAUMA_MILD /datum/brain_trauma/mild
+3 -2
View File
@@ -18,8 +18,9 @@
#define HUSK 64
#define NOCLONE 128
#define CLUMSY 256
#define DUMB 512
#define MONKEYLIKE 1024 //sets IsAdvancedToolUser to FALSE
#define DUMB 512
#define MONKEYLIKE 1024 //sets IsAdvancedToolUser to FALSE
#define PACIFISM 2048
// bitflags for machine stat variable
#define BROKEN 1