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

code/__DEFINES/admin.dm

@@ -87,5 +87,5 @@
 #define MAX_KEYPRESS_COMMANDLENGTH 16
 ///Max amount of keypress messages per second over two seconds before client is autokicked
 #define MAX_KEYPRESS_AUTOKICK 100
-///Length of held key rolling buffer
-#define HELD_KEY_BUFFER_LENGTH 15
+///Length of max held keys
+#define MAX_HELD_KEYS 15

code/__DEFINES/reagents.dm

@@ -8,7 +8,7 @@
 #define REAGENT_PURITY_ACCURACY 0.001
 #define DEFAULT_SPECIFIC_HEAT 200
 
-// container_type defines
+//reagents_holder_flags defines
 #define INJECTABLE		(1<<0)	// Makes it possible to add reagents through droppers and syringes.
 #define DRAWABLE		(1<<1)	// Makes it possible to remove reagents through syringes.
 
@@ -29,6 +29,11 @@
 #define PATCH			4	// patches
 #define INJECT			5	// injection
 
+//container_flags
+#define PH_WEAK 		(1 << 0)
+#define TEMP_WEAK 		(1 << 1)
+#define APTFT_VERB		(1 << 2) //APTFT stands for "amount per transfer from this"
+#define APTFT_ALTCLICK	(1 << 3)
 
 //defines passed through to the on_reagent_change proc
 #define DEL_REAGENT		1	// reagent deleted (fully cleared)