Merge branch 'master' into dropship_rotation_sprites

# Conflicts:
#	code/game/machinery/doors/door.dm
#	code/game/machinery/doors/multi_tile.dm
#	maps/shuttles/dropship_alamo.dmm
#	maps/shuttles/dropship_normandy.dmm

.vscode/settings.json

@@ -9,7 +9,7 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,

code/__DEFINES/__game.dm

@@ -103,7 +103,7 @@ block( \
 #define SOUND_MIDI (1<<1)
 #define SOUND_AMBIENCE (1<<2)
 #define SOUND_LOBBY (1<<3)
-#define SOUND_INTERNET (1<<4)
+#define SOUND_INTERNET (1<<4) // Unused currently. Kept for default prefs compat only
 #define SOUND_REBOOT (1<<5)
 #define SOUND_ADMIN_MEME (1<<6)
 #define SOUND_ADMIN_ATMOSPHERIC (1<<7)
@@ -124,6 +124,7 @@ block( \
 #define CHAT_FFATTACKLOGS (1<<11)
 #define CHAT_GHOSTHIVEMIND (1<<12)
 #define CHAT_NICHELOGS (1<<13)
+#define CHAT_LISTENINGBUG (1<<14)
 
 //toggles_ghost
 #define GHOST_HEALTH_SCAN  (1<<0)
@@ -151,6 +152,7 @@ block( \
 //toggles_admin
 /// Splits admin tabs in Statpanel
 #define SPLIT_ADMIN_TABS (1<<0)
+#define ADMIN_STEALTHMODE (1<<1)
 
 //=================================================
 
@@ -391,6 +393,7 @@ block( \
 #define FIRE_MISSION_WEAPON_REMOVED 8
 #define FIRE_MISSION_WEAPON_UNUSABLE 16
 #define FIRE_MISSION_WEAPON_OUT_OF_AMMO 32
+#define FIRE_MISSION_BAD_DIRECTION 64
 #define FIRE_MISSION_NOT_EXECUTABLE -1
 
 //Defines for firemission state

code/__DEFINES/_math.dm

@@ -9,23 +9,6 @@
 #define CARDINAL_DIRS list(1,2,4,8)
 #define CARDINAL_ALL_DIRS list(1,2,4,5,6,8,9,10)
 
-//some colors
-#define COLOR_RED "#FF0000"
-#define COLOR_GREEN "#00FF00"
-#define COLOR_BLUE "#0000FF"
-#define COLOR_CYAN "#00FFFF"
-#define COLOR_PINK "#FF00FF"
-#define COLOR_YELLOW "#FFFF00"
-#define COLOR_ORANGE "#FF9900"
-#define COLOR_WHITE "#FFFFFF"
-#define COLOR_BLACK "#000000"
-#define COLOR_OIL "#030303"
-
-//Grass Colors
-#define COLOR_G_ICE "#C7EDDE" //faded cyan
-#define COLOR_G_DES "#FF7C1C" //bright orange
-#define COLOR_G_JUNG "#64AA6E" //faded green
-
 #define LEFT 1
 #define RIGHT 2
 
@@ -49,3 +32,6 @@
 
 /// Gets the sign of x, returns -1 if negative, 0 if 0, 1 if positive
 #define SIGN(x) ( ((x) > 0) - ((x) < 0) )
+
+/// Performs a linear interpolation between a and b. Note that amount=0 returns a, amount=1 returns b, and amount=0.5 returns the mean of a and b.
+#define LERP(a, b, amount) ( amount ? ((a) + ((b) - (a)) * (amount)) : a )

code/__DEFINES/access.dm

@@ -152,6 +152,8 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 /// Ancients only
 #define ACCESS_YAUTJA_ANCIENT 392
 
+/// Anything in a tutorial sequence that shouldn't be accessed
+#define ACCESS_TUTORIAL_LOCKED 998
 ///Temporary, just so I can flag places I need to change
 #define ACCESS_COME_BACK_TO_ME 999
 

code/__DEFINES/admin.dm

@@ -22,7 +22,7 @@
 #define NOTE_SYNTHETIC 4
 #define NOTE_YAUTJA 5
 ///Note categories in text form, in order of their numerical #defines.
-var/global/list/note_categories = list("Admin", "Merit", "Commanding Officer", "Synthetic", "Yautja")
+GLOBAL_LIST_INIT(note_categories, list("Admin", "Merit", "Commanding Officer", "Synthetic", "Yautja"))
 
 #define ADMIN_FLW(user) "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];adminplayerobservefollow=[REF(user)]'>FLW</a>)"
 #define ADMIN_PP(user) "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];adminplayeropts=[REF(user)]'>PP</a>)"

code/__DEFINES/alerts.dm

@@ -0,0 +1,7 @@
+#define ALERT_BUCKLED "buckled"
+#define ALERT_HANDCUFFED "handcuffed"
+#define ALERT_LEGCUFFED "legcuffed"
+#define ALERT_FLOORED "floored"
+#define ALERT_INCAPACITATED "incapacitated"
+#define ALERT_KNOCKEDOUT "knockedout"
+#define ALERT_IMMOBILIZED "immobilized"

code/__DEFINES/assert.dm

@@ -0,0 +1,13 @@
+#undef ASSERT
+
+/// Override BYOND's native ASSERT to optionally specify a message
+#define ASSERT(condition, message...) \
+	if (!(condition)) { \
+		CRASH(assertion_message(__FILE__, __LINE__, #condition, ##message)) \
+	}
+
+/proc/assertion_message(file, line, condition, message)
+	if (!isnull(message))
+		message = " - [message]"
+
+	return "[file]:[line]:Assertion failed: [condition][message]"

code/__DEFINES/atmospherics.dm

@@ -23,6 +23,8 @@
 
 #define T0C 273.15 // 0degC
 #define T20C 293.15 // 20degC
+#define T90C 363.15 // 90degC
+#define T120C 393.15 // 120degC
 #define TCMB 2.7 // -270.3degC
 #define ICE_COLONY_TEMPERATURE 223 //-50degC
 #define SOROKYNE_TEMPERATURE 223 // Same as Ice for now
@@ -35,9 +37,6 @@
 #define GAS_TYPE_PHORON "phoron"
 #define GAS_TYPE_CO2 "carbon dioxyde"
 
-/// This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage
-var/MAX_EXPLOSION_RANGE = 14
-
 /// Used in /obj/structure/pipes/vents/proc/create_gas
 #define VENT_GAS_SMOKE "Smoke"
 #define VENT_GAS_CN20 "CN20 Nerve Gas"

code/__DEFINES/chat.dm

@@ -6,6 +6,7 @@
 #define MESSAGE_TYPE_SYSTEM "system"
 #define MESSAGE_TYPE_LOCALCHAT "localchat"
 #define MESSAGE_TYPE_RADIO "radio"
+#define MESSAGE_TYPE_HIVEMIND "hivemind"
 #define MESSAGE_TYPE_INFO "info"
 #define MESSAGE_TYPE_WARNING "warning"
 #define MESSAGE_TYPE_DEADCHAT "deadchat"

code/__DEFINES/clans.dm

@@ -49,26 +49,6 @@
 /// Scales with clan size
 #define CLAN_LIMIT_SIZE 2
 
-var/global/list/datum/yautja_rank/clan_ranks = list(
-	CLAN_RANK_UNBLOODED = new /datum/yautja_rank/unblooded(),
-	CLAN_RANK_YOUNG = new /datum/yautja_rank/young(),
-	CLAN_RANK_BLOODED = new /datum/yautja_rank/blooded(),
-	CLAN_RANK_ELITE = new /datum/yautja_rank/elite(),
-	CLAN_RANK_ELDER = new /datum/yautja_rank/elder(),
-	CLAN_RANK_LEADER = new /datum/yautja_rank/leader(),
-	CLAN_RANK_ADMIN = new /datum/yautja_rank/ancient()
-)
-
-var/global/list/clan_ranks_ordered = list(
-	CLAN_RANK_UNBLOODED = CLAN_RANK_UNBLOODED_INT,
-	CLAN_RANK_YOUNG = CLAN_RANK_YOUNG_INT,
-	CLAN_RANK_BLOODED = CLAN_RANK_BLOODED_INT,
-	CLAN_RANK_ELITE = CLAN_RANK_ELITE_INT,
-	CLAN_RANK_ELDER = CLAN_RANK_ELDER_INT,
-	CLAN_RANK_LEADER = CLAN_RANK_LEADER_INT,
-	CLAN_RANK_ADMIN = CLAN_RANK_ADMIN_INT
-)
-
 #define CLAN_HREF "clan_href"
 #define CLAN_TARGET_HREF "clan_target_href"