Merge remote-tracking branch 'citadel/master' into backend_sync

2021-04-28 22:34:17 -07:00
parent 78a9cdc5c6 0c803e0232
commit 4289b8be1e
46 changed files with 720 additions and 376 deletions
@@ -51,3 +51,4 @@
 #define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
 #define ORGAN_NO_DISMEMBERMENT	(1<<6)	//Immune to disembowelment.
 #define ORGAN_EDIBLE			(1<<7)	//is a snack? :D
+#define ORGAN_SYNTHETIC_EMP		(1<<6)	//Synthetic organ affected by an EMP. Deteriorates over time.