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

2020-12-13 02:34:57 -07:00
parent 61c08ba422 4b52e3c6a3
commit 5c830d4d44
35 changed files with 1937 additions and 1716 deletions
@@ -67,3 +67,13 @@
 #define LOADOUT_LIMB_AMPUTATED		"Amputated"

 #define LOADOUT_LIMBS		 		list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
+
+//loadout saving/loading specific defines
+#define MAXIMUM_LOADOUT_SAVES	5
+#define LOADOUT_ITEM			"loadout_item"
+#define LOADOUT_COLOR			"loadout_color"
+
+//loadout item flags
+#define LOADOUT_CAN_NAME					(1<<0) //renaming items
+#define LOADOUT_CAN_DESCRIPTION				(1<<1) //adding a custom description to items
+#define LOADOUT_CAN_COLOR_POLYCHROMIC		(1<<2)