Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553

[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-15 10:22:59 -04:00
parent 4cb81d7535 f4753de219
commit b6f69c88ea
24 changed files with 269 additions and 241 deletions
@@ -20,6 +20,7 @@
 #define TOXLOSS 4
 #define OXYLOSS 8
 #define SHAME 16
+#define MANUAL_SUICIDE 32	//suicide_act will do the actual killing.

 //Citadel code
 #define AROUSAL	32