save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00
parent 164db7ae9b c84a8cc9e1
commit 2e6b034493
39 changed files with 11 additions and 588 deletions
@@ -10,19 +10,6 @@

 //mob disabilities stat

-<<<<<<< HEAD
-#define BLIND 		1
-#define MUTE		2
-#define DEAF		4
-#define NEARSIGHT	8
-#define FAT			32
-#define HUSK		64
-#define NOCLONE		128
-#define CLUMSY		256
-#define DUMB        512
-#define MONKEYLIKE  1024 //sets IsAdvancedToolUser to FALSE
-#define PACIFISM 	2048
-=======
 #define DISABILITY_BLIND 		"blind"
 #define DISABILITY_MUTE			"mute"
 #define DISABILITY_DEAF			"deaf"
@@ -45,7 +32,6 @@
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define TRAUMA_DISABILITY "trauma"
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind

 // bitflags for machine stat variable
 #define BROKEN		1