Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311

code/__DEFINES/stat.dm

@@ -32,6 +32,7 @@
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define TRAUMA_DISABILITY "trauma"
+#define CHEMICAL_DISABILITY "chemical"
 
 // bitflags for machine stat variable
 #define BROKEN		1

code/__DEFINES/status_effects.dm

@@ -64,6 +64,8 @@
 
 #define STATUS_EFFECT_KINDLE /datum/status_effect/kindle //A knockdown reduced by 1 second for every 3 points of damage the target takes.
 
+#define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute.
+
 /////////////
 // NEUTRAL //
 /////////////

code/__DEFINES/turf_flags.dm

@@ -0,0 +1,3 @@
+#define CHANGETURF_DEFER_CHANGE		1
+#define CHANGETURF_IGNORE_AIR		2
+#define CHANGETURF_FORCEOP			4