Merge remote-tracking branch 'origin/master' into rustsql

code/__DEFINES/antagonists.dm

@@ -69,6 +69,9 @@
 #define LINGBLOOD_EXPLOSION_THRESHOLD (LINGBLOOD_DETECTION_THRESHOLD * LINGBLOOD_EXPLOSION_MULT) //Hey, important to note here: the explosion threshold is explicitly more than, rather than more than or equal to. This stops a single loud ability from triggering the explosion threshold.
 
 ///Heretics --
+GLOBAL_LIST_EMPTY(living_heart_cache)	//A list of all living hearts in existance, for us to iterate through.
+
+
 #define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic))
 #define IS_HERETIC_MONSTER(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic_monster))
 

code/__DEFINES/dcs/signals.dm

@@ -290,7 +290,7 @@
 
 #define COMSIG_LIVING_ACTIVE_BLOCK_START "active_block_start"			//from base of mob/living/keybind_start_active_blocking(): (obj/item/blocking_item, list/backup_items)
 	#define COMPONENT_PREVENT_BLOCK_START 1
-#define COMSIG_LIVING_ACTIVE_PARRY_START "active_parry_start"			//from base of mob/living/initiate_parry_sequence(): (parrying_method, datum/parrying_item_mob_or_art, list/backup_items)
+#define COMSIG_LIVING_ACTIVE_PARRY_START "active_parry_start"			//from base of mob/living/initiate_parry_sequence(): (parrying_method, datum/parrying_item_mob_or_art, list/backup_items, list/override)
 	#define COMPONENT_PREVENT_PARRY_START 1
 
 //ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS!
@@ -541,6 +541,9 @@
 #define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt"					//from turf AltClickOn(): (/mob)
 #define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl"				//from monkey CtrlClickOn(): (/mob)
 
+// /datum/element/ventcrawling signals
+#define COMSIG_HANDLE_VENTCRAWL "handle_ventcrawl"							//when atom with ventcrawling element attempts to ventcrawl
+#define COMSIG_CHECK_VENTCRAWL "check_ventcrawl"							//to check an atom's ventcrawling element tier (if applicable)
 // twitch plays
 /// Returns direction: (wipe_votes)
 #define COMSIG_TWITCH_PLAYS_MOVEMENT_DATA "twitch_plays_movement_data"

code/__DEFINES/language.dm

@@ -24,3 +24,4 @@
 #define LANGUAGE_STONER			"stoner"
 #define LANGUAGE_VASSAL			"vassal"
 #define LANGUAGE_VOICECHANGE	"voicechange"
+#define LANGUAGE_MULTILINGUAL	"multilingual"

code/__DEFINES/loadout.dm

@@ -72,9 +72,11 @@
 #define LOADOUT_LIMBS		 		list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
 
 //loadout saving/loading specific defines
-#define MAXIMUM_LOADOUT_SAVES	5
-#define LOADOUT_ITEM			"loadout_item"
-#define LOADOUT_COLOR			"loadout_color"
+#define MAXIMUM_LOADOUT_SAVES		5
+#define LOADOUT_ITEM				"loadout_item"
+#define LOADOUT_COLOR				"loadout_color"
+#define LOADOUT_CUSTOM_NAME			"loadout_custom_name"
+#define LOADOUT_CUSTOM_DESCRIPTION	"loadout_custom_description"
 
 //loadout item flags
 #define LOADOUT_CAN_NAME					(1<<0) //renaming items

code/__DEFINES/robots.dm

@@ -69,8 +69,8 @@
 //Checks to determine borg availability depending on the server's config. These are defines in the interest of reducing copypasta
 #define BORG_SEC_AVAILABLE (!CONFIG_GET(flag/disable_secborg) && GLOB.security_level >= CONFIG_GET(number/minimum_secborg_alert))
 
-//silicon_priviledges flags
-#define PRIVILEDGES_SILICON	(1<<0)
-#define PRIVILEDGES_PAI		(1<<1)
-#define PRIVILEDGES_BOT		(1<<2)
-#define PRIVILEDGES_DRONE	(1<<3)
+//silicon_privileges flags
+#define PRIVILEGES_SILICON	(1<<0)
+#define PRIVILEGES_PAI		(1<<1)
+#define PRIVILEGES_BOT		(1<<2)
+#define PRIVILEGES_DRONE	(1<<3)

code/__DEFINES/subsystems.dm

@@ -204,7 +204,7 @@
 ///Compile all the overlays for an atom from the cache lists
 // |= on overlays is not actually guaranteed to not add same appearances but we're optimistically using it anyway.
 #define COMPILE_OVERLAYS(A)\
-	if (TRUE) {\
+	do {\
 		var/list/ad = A.add_overlays;\
 		var/list/rm = A.remove_overlays;\
 		if(LAZYLEN(rm)){\
@@ -216,7 +216,7 @@
 			ad.Cut();\
 		}\
 		A.flags_1 &= ~OVERLAY_QUEUED_1;\
-	}
+	} while(FALSE)
 
 
 /**

code/__DEFINES/traits.dm

@@ -197,6 +197,7 @@
 #define TRAIT_EMPATH			"empath"
 #define TRAIT_FRIENDLY			"friendly"
 #define TRAIT_SNOB				"snob"
+#define TRAIT_MULTILINGUAL		"multilingual"
 #define TRAIT_CULT_EYES 		"cult_eyes"
 #define TRAIT_AUTO_CATCH_ITEM	"auto_catch_item"
 #define TRAIT_CLOWN_MENTALITY	"clown_mentality" // The future is now, clownman.
@@ -253,6 +254,7 @@
 
 // item traits
 #define TRAIT_NODROP            "nodrop"
+#define TRAIT_SPOOKY_THROW      "spooky_throw"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"