Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

code/__DEFINES/dye_keys.dm

@@ -4,6 +4,7 @@
 #define DYE_REGISTRY_SNEAKERS "sneakers"
 #define DYE_REGISTRY_FANNYPACK "fannypack"
 #define DYE_REGISTRY_BEDSHEET "bedsheet"
+#define DYE_REGISTRY_DOUBLE_BEDSHEET "double_bedsheet"
 #define DYE_LAWYER_SPECIAL "lawyer_special"
 
 #define DYE_RED "red"

code/__DEFINES/mapexporting.dm

@@ -0,0 +1,14 @@
+//Bits to save
+#define SAVE_OBJECTS (1 << 1)		//Save objects?
+#define SAVE_MOBS (1 << 2)			//Save Mobs?
+#define SAVE_TURFS (1 << 3)			//Save turfs?
+#define SAVE_AREAS (1 << 4)			//Save areas?
+#define SAVE_SPACE (1 << 5)			//Save space areas? (If not they will be saved as NOOP)
+#define SAVE_OBJECT_PROPERTIES (1 << 6)	//Save custom properties of objects (obj.on_object_saved() output)
+
+#define SAVE_ALL SAVE_OBJECTS | SAVE_MOBS | SAVE_TURFS | SAVE_AREAS | SAVE_SPACE | SAVE_OBJECT_PROPERTIES
+
+//Ignore turf if it contains
+#define SAVE_SHUTTLEAREA_DONTCARE 0
+#define SAVE_SHUTTLEAREA_IGNORE 1
+#define SAVE_SHUTTLEAREA_ONLY 2

code/__DEFINES/maps.dm

@@ -43,6 +43,8 @@ require only minor tweaks.
 #define ZTRAIT_ASHSTORM "Weather_Ashstorm"
 #define ZTRAIT_ACIDRAIN "Weather_Acidrain"
 #define ZTRAIT_VOIDSTORM "Weather_Voidstorm"
+#define ZTRAIT_ICESTORM "Weather_Icestorm"
+#define ZTRAIT_LONGRAIN "Weather_Longrain"
 
 // number - bombcap is multiplied by this before being applied to bombs
 #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"

code/__DEFINES/reagents.dm

@@ -72,6 +72,12 @@
 #define REAGENT_FORCEONNEW			(1<<5)  //Forces a on_new() call without a data overhead
 #define REAGENT_SNEAKYNAME          (1<<6)  //When inverted, the inverted chem uses the name of the original chem
 #define REAGENT_SPLITRETAINVOL      (1<<7)  //Retains initial volume of chem when splitting
+#define REAGENT_ORGANIC_PROCESS		(1<<8)	//Can be processed by organic carbons - will otherwise slowly dissipate
+#define REAGENT_ROBOTIC_PROCESS		(1<<9)	//Can be processed by robotic carbons - will otherwise slowly dissipate
+
+#define REAGENT_ALL_PROCESS (REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS)	//expand this if you for some reason add more process flags
+
+#define INVALID_REAGENT_DISSIPATION 1		//How much of a reagent is removed per reagent tick if invalid processing-flag wise
 
 //Chemical reaction flags, for determining reaction specialties
 #define REACTION_CLEAR_IMPURE       (1<<0)  //Convert into impure/pure on reaction completion

code/__DEFINES/traits.dm

@@ -222,6 +222,8 @@
 /// forces us to not render our overlays
 #define TRAIT_HUMAN_NO_RENDER			"human_no_render"
 #define TRAIT_TRASHCAN					"trashcan"
+///Used for fireman carry to have mobe not be dropped when passing by a prone individual.
+#define TRAIT_BEING_CARRIED "being_carried"	
 
 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)