From 99a173b187be808b3f54e0ddebd1d170494c6c2c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 15:54:52 -0600 Subject: [PATCH] Update stat.dm --- code/__DEFINES/stat.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 86f14f8ec0..a23f050c13 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -18,14 +18,9 @@ #define HUSK 64 #define NOCLONE 128 #define CLUMSY 256 -<<<<<<< HEAD -#define DUMB 512 -#define MONKEYLIKE 1024 //sets IsAdvancedToolUser to FALSE -======= #define DUMB 512 #define MONKEYLIKE 1024 //sets IsAdvancedToolUser to FALSE #define PACIFISM 2048 ->>>>>>> b5d9845... [Ready]Brain Trauma additions (#33405) // bitflags for machine stat variable #define BROKEN 1