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

code/__DEFINES/citadel_defines.dm

@@ -101,6 +101,7 @@
 #define NO_AUTO_WAG			(1<<12)
 #define GENITAL_EXAMINE		(1<<13)
 #define VORE_EXAMINE		(1<<14)
+#define TRASH_FORCEFEED		(1<<15)
 #define TOGGLES_CITADEL 0
 
 //belly sound pref things

code/__DEFINES/construction.dm

@@ -81,7 +81,6 @@
 #define CAT_AMMO	"Ammunition"
 #define CAT_PARTS	"Weapon Parts"
 #define CAT_ROBOT	"Robots"
-#define CAT_MISC	"Misc"
 #define CAT_MISCELLANEOUS	"Miscellaneous"
 #define CAT_TOOL	"Tools & Storage"
 #define CAT_FURNITURE	"Furniture"

code/__DEFINES/inventory.dm

@@ -159,6 +159,18 @@
 #define TINT_DARKENED 2			//Threshold of tint level to apply weld mask overlay
 #define TINT_BLIND 3			//Threshold of tint level to obscure vision fully
 
+// defines for AFK theft
+/// How many messages you can remember while logged out before you stop remembering new ones
+#define AFK_THEFT_MAX_MESSAGES 10
+/// If someone logs back in and there are entries older than this, just tell them they can't remember who it was or when
+#define AFK_THEFT_FORGET_DETAILS_TIME 5 MINUTES
+/// The index of the entry in 'afk_thefts' with the person's visible name at the time
+#define AFK_THEFT_NAME 1
+/// The index of the entry in 'afk_thefts' with the text
+#define AFK_THEFT_MESSAGE 2
+/// The index of the entry in 'afk_thefts' with the time it happened
+#define AFK_THEFT_TIME 3
+
 //Allowed equipment lists for security vests and hardsuits.
 
 GLOBAL_LIST_INIT(advanced_hardsuit_allowed, typecacheof(list(

code/__DEFINES/maths.dm

@@ -4,6 +4,8 @@
 
 #define NUM_E 2.71828183
 
+#define SQRT_2 1.414214
+
 #define PI						3.1416
 #define INFINITY				1e31	//closer then enough
 

code/__DEFINES/traits.dm

@@ -221,6 +221,7 @@
 #define TRAIT_LIVING_NO_DENSITY			"living_no_density"
 /// forces us to not render our overlays
 #define TRAIT_HUMAN_NO_RENDER			"human_no_render"
+#define TRAIT_TRASHCAN					"trashcan"
 
 // 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)

code/__DEFINES/voreconstants.dm

@@ -8,17 +8,22 @@
 #define DM_UNABSORB "Un-absorb"
 
 #define DIGESTABLE 		(1<<0)
-#define SHOW_VORE_PREFS (1<<1)
-#define DEVOURABLE		(1<<2)
-#define FEEDING			(1<<3)
-#define NO_VORE			(1<<4)
-#define OPEN_PANEL		(1<<5)
-#define ABSORBED		(1<<6)
-#define VORE_INIT		(1<<7)
-#define VOREPREF_INIT	(1<<8)
-#define LICKABLE		(1<<9)
+#define DEVOURABLE		(1<<1)
+#define FEEDING			(1<<2)
+#define NO_VORE			(1<<3)
+#define ABSORBED		(1<<4)
+#define VORE_INIT		(1<<5)
+#define VOREPREF_INIT	(1<<6)
+#define LICKABLE		(1<<7)
+/// Can be smelled?
+#define SMELLABLE		(1<<8)
+/// Can get absorbed?
+#define ABSORBABLE		(1<<9)
+/// Can get simplemob vored?
+#define MOBVORE			(1<<10)
 
-#define MAX_VORE_FLAG	(1<<10)-1 // change this whenever you add a vore flag, must be largest vore flag*2-1
+/// Change this whenever you add a vore flag, must be largest vore flag*2-1
+#define MAX_VORE_FLAG	(1<<11)-1
 
 #define isbelly(A) istype(A, /obj/belly)