Merge remote-tracking branch 'upstream/dev' into zm_2023

code/__defines/MC.dm

@@ -27,7 +27,7 @@ if (Datum.is_processing) {\
 		PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on [#Processor]."); \
 	}\
 } else {\
-	Datum.is_processing = #Processor;\
+	Datum.is_processing = Processor._internal_name;\
 	Processor.processing += Datum;\
 }
 
@@ -125,6 +125,9 @@ if(Datum.is_processing) {\
 	NEW_SS_GLOBAL(SS##X);\
 	PreInit();\
 }\
+/datum/controller/subsystem/##X{\
+	_internal_name = "SS" + #X;\
+}\
 /datum/controller/subsystem/##X
 
 #define PROCESSING_SUBSYSTEM_DEF(X) var/global/datum/controller/subsystem/processing/##X/SS##X;\
@@ -137,4 +140,5 @@ if(Datum.is_processing) {\
 		processing = SS##X.processing; \
 	}\
 }\
-/datum/controller/subsystem/processing/##X
+/datum/controller/subsystem/processing/##X/_internal_name = "SS" + #X;\
+/datum/controller/subsystem/processing/##X

code/__defines/_byond_version_compat.dm

@@ -0,0 +1,47 @@
+#define REQUIRED_DM_VERSION 514
+
+#if DM_VERSION < REQUIRED_DM_VERSION
+#warn Nebula is not tested on BYOND versions older than 514. The code may not compile, and if it does compile it may have severe problems.
+#endif
+
+// 515 split call for external libraries into call_ext
+#if DM_VERSION < 515
+#define LIBCALL call
+#else
+#define LIBCALL call_ext
+#endif
+
+// So we want to have compile time guarantees these methods exist on local type, unfortunately 515 killed the .proc/procname and .verb/verbname syntax so we have to use nameof()
+// For the record: GLOBAL_VERB_REF would be useless as verbs can't be global.
+
+#if DM_VERSION < 515
+
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
+#define PROC_REF(X) (.proc/##X)
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (.verb/##X)
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
+#define TYPE_PROC_REF(TYPE, X) (##TYPE.proc/##X)
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (##TYPE.verb/##X)
+
+/// Call by name proc reference, checks if the proc is an existing global proc
+#define GLOBAL_PROC_REF(X) (/proc/##X)
+
+#else
+
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
+#define PROC_REF(X) (nameof(.proc/##X))
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (nameof(.verb/##X))
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
+#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X))
+
+/// Call by name proc reference, checks if the proc is an existing global proc
+#define GLOBAL_PROC_REF(X) (/proc/##X)
+
+#endif

code/__defines/_compile_options.dm

@@ -1,9 +1,3 @@
 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
 // 1 will enable set background. 0 will disable set background.
 #define BACKGROUND_ENABLED 0
-
-#define REQUIRED_DM_VERSION 514
-
-#if DM_VERSION < REQUIRED_DM_VERSION
-#warn Nebula is not tested on BYOND versions older than 514. The code may not compile, and if it does compile it may have severe problems.
-#endif

code/__defines/aspects.dm

@@ -51,4 +51,19 @@
 	model = MODEL_PATH;                                                                                    \
 	parent = /decl/aspect/prosthetic_limb/right_leg;                                                       \
 	aspect_cost = COST;                                                                                    \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/head/##MODEL_ID {                                                             \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/head;                                                            \
+	aspect_cost = COST * 0.5;                                                                              \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/chest/##MODEL_ID {                                                            \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/chest;                                                           \
+	aspect_cost = COST * 0.5;                                                                              \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/groin/##MODEL_ID {                                                            \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/groin;                                                           \
+	aspect_cost = COST * 0.5;                                                                              \
 }

code/__defines/chemistry.dm

@@ -62,9 +62,12 @@
 #define MAT_SOLVENT_MODERATE 2
 #define MAT_SOLVENT_STRONG   3
 
-#define DIRTINESS_STERILE -2
-#define DIRTINESS_CLEAN   -1
-#define DIRTINESS_NEUTRAL  0
+#define DIRTINESS_DECONTAMINATE -3
+#define DIRTINESS_STERILE       -2
+#define DIRTINESS_CLEAN         -1
+#define DIRTINESS_NEUTRAL        0
 
 #define DEFAULT_GAS_ACCELERANT /decl/material/gas/hydrogen
 #define DEFAULT_GAS_OXIDIZER   /decl/material/gas/oxygen
+
+#define CHEM_REACTION_FLAG_OVERFLOW_CONTAINER BITFLAG(0)

code/__defines/colors.dm

@@ -39,6 +39,7 @@
 #define COLOR_GREEN_GRAY       "#8daf6a"
 #define COLOR_DARK_GREEN_GRAY  "#54654c"
 #define COLOR_BLUE_GRAY        "#6a97b0"
+#define COLOR_MID_BLUE_GRAY    "#666699"
 #define COLOR_DARK_BLUE_GRAY   "#3e4855"
 #define COLOR_SURGERY_BLUE     "#e0f2f6"
 #define COLOR_SUN              "#ec8b2f"
@@ -92,6 +93,12 @@
 #define COLOR_CRYSTAL          "#00c8a5"
 #define COLOR_ASTEROID_ROCK    "#735555"
 #define COLOR_DIAMOND          "#d8d4ea"
+#define COLOR_BLOOD_RED        "#990000"
+#define COLOR_PALE_GOLD        "#cc9900"
+#define COLOR_ROYAL_BLUE       "#0033ff"
+#define COLOR_VERDANT_GREEN    "#287d00"
+#define COLOR_SCIENCE_PURPLE   "#6633cc"
+
 
 #define PIPE_COLOR_GREY        "#808080"
 #define PIPE_COLOR_RED         "#ff0000"

code/__defines/credits.dm

@@ -0,0 +1,4 @@
+#define CREDIT_ROLL_SPEED 185
+#define CREDIT_SPAWN_SPEED 20
+#define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size)
+#define CREDIT_EASE_DURATION 22

code/__defines/damage.dm

@@ -0,0 +1,2 @@
+///The decimal precision for health values. Health will be rounded against this value.
+#define HEALTH_ROUNDING 0.01

code/__defines/fires.dm

@@ -0,0 +1,4 @@
+#define FUEL_VALUE_RETARDANT -1
+#define FUEL_VALUE_NONE       0
+#define FUEL_VALUE_ACCELERANT 1
+#define FUEL_VALUE_VOLATILE   2