Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad

code/__DEFINES/inventory.dm

@@ -130,33 +130,24 @@
 #define NECK		(1<<11)
 #define FULL_BODY	(~0)
 
+//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
+#define NORMAL_STYLE		0
+#define ALT_STYLE			1
+
 //flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
 #define NO_FEMALE_UNIFORM			0
 #define FEMALE_UNIFORM_FULL			1
 #define FEMALE_UNIFORM_TOP			2
 
-//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
-#define NORMAL_STYLE		0
-#define ALT_STYLE			1
-
-#define NORMAL_SUIT_STYLE		0
-#define DIGITIGRADE_SUIT_STYLE 	1
-
-//Tauric Specific suits
-#define NOT_TAURIC			0
-#define SNEK_TAURIC			1
-#define PAW_TAURIC			2
-#define HOOF_TAURIC			3
-
-//Helmets/masks for muzzles or beaks
-#define NORMAL_FACED		0
-#define	MUZZLE_FACED		1
-#define	BEAKED_FACED		2
-
-//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
-#define NO_MUTANTRACE_VARIATION		0
-#define MUTANTRACE_VARIATION		1
+//flags for outfits that have mutantrace variants: These are hard sprited too.
+#define STYLE_DIGITIGRADE		(1<<0) //jumpsuits, suits and shoes
+#define STYLE_MUZZLE			(1<<1) //hats or masks
+#define STYLE_SNEK_TAURIC		(1<<2) //taur-friendly suits
+#define STYLE_PAW_TAURIC		(1<<3)
+#define STYLE_HOOF_TAURIC		(1<<4)
+#define STYLE_ALL_TAURIC		(STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC)
 
+//digitigrade legs settings.
 #define NOT_DIGITIGRADE				0
 #define FULL_DIGITIGRADE			1
 #define SQUISHED_DIGITIGRADE		2

code/__DEFINES/subsystems.dm

@@ -47,6 +47,7 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.
 
+#define INIT_ORDER_FAIL2TOPIC		22
 #define INIT_ORDER_TITLE			20
 #define INIT_ORDER_GARBAGE			19
 #define INIT_ORDER_DBCORE			18