Merge branch 'dev' of github.com:MistakeNot4892/Nebula into pyrelight

Author: MistakeNot4892

.gitattributes

@@ -12,6 +12,11 @@ html/changelog.html merge=union
 # Declare files that will always have CRLF line endings on checkout.
 *.dm text eol=crlf
 *.dmm text eol=crlf
+*.dme text eol=crlf
+*.py text eol=crlf
 *.txt text eol=crlf
 *.md text eol=crlf
-*.yml text eol=crlf
+*.yml text eol=crlf
+
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf

.github/workflows/test.yml

@@ -33,8 +33,8 @@ jobs:
       - name: Run Dreamchecker
         run: |
           set -o pipefail
-          ~/dreamchecker 2>&1 | tee ${GITHUB_WORKSPACE}/output-annotations.txt
           ./test/lint-all-modpacks.sh nebula.dme
+          ./test/lint-each-modpack.sh nebula.dme
       - name: Annotate Lints
         uses: yogstation13/DreamAnnotate@v2
         if: always()
@@ -67,7 +67,7 @@ jobs:
           fileName: "DMCompiler_linux-x64.tar.gz"
           extract: true
       - name: Run OpenDream
-        run: ./DMCompiler_linux-x64/DMCompiler nebula.dme --define=UNIT_TEST --suppress-unimplemented --skip-anything-typecheck --version=${BYOND_MAJOR}.${BYOND_MINOR} | bash test/annotate_od.sh
+        run: ./test/compile-od-all-modpacks.sh nebula.dme
   Code:
     runs-on: ubuntu-latest
     steps:

code/__defines/armor.dm

@@ -33,6 +33,7 @@
 #define  ARMOR_RAD_MINOR			10
 #define  ARMOR_RAD_SMALL			25
 #define  ARMOR_RAD_RESISTANT		40
+#define  ARMOR_RAD_LARGE			60
 #define  ARMOR_RAD_SHIELDED			100
 
 #define  ARMOR_BOMB_MINOR			10

code/__defines/items_clothing.dm

@@ -82,6 +82,7 @@
 #define slot_r_store_str     "slot_r_store"
 #define slot_s_store_str     "slot_s_store"
 #define slot_in_backpack_str "slot_in_backpack"
+#define slot_in_wallet_str   "slot_in_wallet"
 
 // Defined here for consistency, not actually used for slots, just for species clothing offsets.
 #define slot_undershirt_str  "slot_undershirt"

code/__defines/lists.dm

@@ -32,6 +32,14 @@
 // Reads L or an empty list if L is not a list.  Note: Does NOT assign, L may be an expression.
 #define SANITIZE_LIST(L) ( islist(L) ? L : list() )
 
+// The above but for alists. Prefixed with A_ because inserting "A" randomly in the name just made it confusing
+#define A_LAZYINITLIST(AL) if (!AL) { AL = alist(); }
+#define A_UNSETEMPTY(AL) if(!length(AL)) { AL = null; }
+#define A_LAZYREMOVE(AL, I) if(AL) { AL -= I; A_UNSETEMPTY(AL) }
+#define A_LAZYSET(AL, A, I) if(!AL) { AL = alist(); } AL[A] = I;
+#define A_LAZYCLEARLIST(AL) if(AL) { AL.Cut(); AL = null; }
+#define A_LAZYLEN(AL) length(AL)
+
 /// Passed into BINARY_INSERT to compare keys
 #define COMPARE_KEY __BIN_LIST[__BIN_MID]
 /// Passed into BINARY_INSERT to compare values

code/__defines/machinery.dm

@@ -42,28 +42,27 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 
 // Camera channels
 // Station channels
-#define CAMERA_CHANNEL_PUBLIC "Public"
-#define CAMERA_CHANNEL_ENGINEERING "Engineering"
-#define CAMERA_CHANNEL_MEDICAL "Medical"
-#define CAMERA_CHANNEL_RESEARCH "Research"
-#define CAMERA_CHANNEL_SECURITY "Security"
-
-#define CAMERA_CHANNEL_ROBOTS "Robots"
-#define CAMERA_CHANNEL_MINE "Mining"
-#define CAMERA_CHANNEL_SECRET "Secret"
+#define CAMERA_CHANNEL_PUBLIC              "Public"
+#define CAMERA_CHANNEL_ENGINEERING         "Engineering"
+#define CAMERA_CHANNEL_MEDICAL             "Medical"
+#define CAMERA_CHANNEL_RESEARCH            "Research"
+#define CAMERA_CHANNEL_SECURITY            "Security"
+#define CAMERA_CHANNEL_ROBOTS              "Robots"
+#define CAMERA_CHANNEL_MINE                "Mining"
+#define CAMERA_CHANNEL_SECRET              "Secret"
 
 // Non-station channels
-#define CAMERA_CHANNEL_CRESCENT "Crescent"
-#define CAMERA_CHANNEL_ERT "ZeEmergencyResponseTeam"
-#define CAMERA_CHANNEL_MERCENARY "MercurialNet"
-#define CAMERA_CHANNEL_TELEVISION "Television"
+#define CAMERA_CHANNEL_CRESCENT            "Crescent"
+#define CAMERA_CHANNEL_ERT                 "Emergency Response Team"
+#define CAMERA_CHANNEL_MERCENARY           "MercurialNet"
+#define CAMERA_CHANNEL_TELEVISION          "Television"
 
 // Alarm networks
-#define NETWORK_ALARM_ATMOS "Atmosphere Alarms"
+#define NETWORK_ALARM_ATMOS  "Atmosphere Alarms"
 #define NETWORK_ALARM_CAMERA "Camera Alarms"
-#define NETWORK_ALARM_FIRE "Fire Alarms"
+#define NETWORK_ALARM_FIRE   "Fire Alarms"
 #define NETWORK_ALARM_MOTION "Motion Alarms"
-#define NETWORK_ALARM_POWER "Power Alarms"
+#define NETWORK_ALARM_POWER  "Power Alarms"
 
 //singularity defines
 #define STAGE_ONE 	1

code/__defines/misc.dm

@@ -87,27 +87,28 @@
 #define EVENT_LEVEL_MAJOR    3
 
 //Area flags, possibly more to come
-#define AREA_FLAG_RAD_SHIELDED         BITFLAG(1)  // Shielded from radiation, clearly.
-#define AREA_FLAG_EXTERNAL             BITFLAG(2)  // External as in exposed to space, not outside in a nice, green, forest.
-#define AREA_FLAG_ION_SHIELDED         BITFLAG(3)  // Shielded from ionospheric anomalies.
-#define AREA_FLAG_IS_NOT_PERSISTENT    BITFLAG(4)  // SSpersistence will not track values from this area.
-#define AREA_FLAG_IS_BACKGROUND        BITFLAG(5)  // Blueprints can create areas on top of these areas. Cannot edit the name of or delete these areas.
-#define AREA_FLAG_MAINTENANCE          BITFLAG(6)  // Area is a maintenance area.
-#define AREA_FLAG_SHUTTLE              BITFLAG(7)  // Area is a shuttle area.
-#define AREA_FLAG_HALLWAY              BITFLAG(8)  // Area is a public hallway suitable for event selection
-#define AREA_FLAG_PRISON               BITFLAG(9)  // Area is a prison for the purposes of brigging objectives.
-#define AREA_FLAG_HOLY                 BITFLAG(10) // Area is holy for the purposes of marking turfs as cult-resistant.
-#define AREA_FLAG_SECURITY             BITFLAG(11) // Area is security for the purposes of newscaster init.
-#define AREA_FLAG_HIDE_FROM_HOLOMAP    BITFLAG(12) // if we shouldn't be drawn on station holomaps
+#define AREA_FLAG_RAD_SHIELDED            BITFLAG(1)  // Shielded from radiation, clearly.
+#define AREA_FLAG_EXTERNAL                BITFLAG(2)  // External as in exposed to space, not outside in a nice, green, forest.
+#define AREA_FLAG_ION_SHIELDED            BITFLAG(3)  // Shielded from ionospheric anomalies.
+#define AREA_FLAG_NO_LEGACY_PERSISTENCE   BITFLAG(4)  // SSpersistence will not track values from this area.
+#define AREA_FLAG_IS_BACKGROUND           BITFLAG(5)  // Blueprints can create areas on top of these areas. Cannot edit the name of or delete these areas.
+#define AREA_FLAG_MAINTENANCE             BITFLAG(6)  // Area is a maintenance area.
+#define AREA_FLAG_SHUTTLE                 BITFLAG(7)  // Area is a shuttle area.
+#define AREA_FLAG_HALLWAY                 BITFLAG(8)  // Area is a public hallway suitable for event selection
+#define AREA_FLAG_PRISON                  BITFLAG(9)  // Area is a prison for the purposes of brigging objectives.
+#define AREA_FLAG_HOLY                    BITFLAG(10) // Area is holy for the purposes of marking turfs as cult-resistant.
+#define AREA_FLAG_SECURITY                BITFLAG(11) // Area is security for the purposes of newscaster init.
+#define AREA_FLAG_HIDE_FROM_HOLOMAP       BITFLAG(12) // if we shouldn't be drawn on station holomaps
+#define AREA_FLAG_ALLOW_LEVEL_PERSISTENCE BITFLAG(13) // Whether or not this area should pass changed turfs to SSpersistence.
 
 //Map template flags
-#define TEMPLATE_FLAG_ALLOW_DUPLICATES   BITFLAG(0)  // Lets multiple copies of the template to be spawned
-#define TEMPLATE_FLAG_SPAWN_GUARANTEED   BITFLAG(1)  // Makes it ignore away site budget and just spawn (only for away sites)
-#define TEMPLATE_FLAG_CLEAR_CONTENTS     BITFLAG(2)  // if it should destroy objects it spawns on top of
-#define TEMPLATE_FLAG_NO_RUINS           BITFLAG(3)  // if it should forbid ruins from spawning on top of it
-#define TEMPLATE_FLAG_NO_RADS            BITFLAG(4)  // Removes all radiation from the template after spawning.
-#define TEMPLATE_FLAG_TEST_DUPLICATES    BITFLAG(5)  // Makes unit testing attempt to spawn mutliple copies of this template. Assumes unit testing is spawning at least one copy.
-#define TEMPLATE_FLAG_GENERIC_REPEATABLE BITFLAG(6) // Template can be picked repeatedly for the same level gen run.
+#define TEMPLATE_FLAG_ALLOW_DUPLICATES    BITFLAG(0)  // Lets multiple copies of the template to be spawned
+#define TEMPLATE_FLAG_SPAWN_GUARANTEED    BITFLAG(1)  // Makes it ignore away site budget and just spawn (only for away sites)
+#define TEMPLATE_FLAG_CLEAR_CONTENTS      BITFLAG(2)  // if it should destroy objects it spawns on top of
+#define TEMPLATE_FLAG_NO_RUINS            BITFLAG(3)  // if it should forbid ruins from spawning on top of it
+#define TEMPLATE_FLAG_NO_RADS             BITFLAG(4)  // Removes all radiation from the template after spawning.
+#define TEMPLATE_FLAG_TEST_DUPLICATES     BITFLAG(5)  // Makes unit testing attempt to spawn mutliple copies of this template. Assumes unit testing is spawning at least one copy.
+#define TEMPLATE_FLAG_GENERIC_REPEATABLE  BITFLAG(6) // Template can be picked repeatedly for the same level gen run.
 
 // Convoluted setup so defines can be supplied by Bay12 main server compile script.
 // Should still work fine for people jamming the icons into their repo.

code/__defines/mobs.dm

@@ -160,21 +160,6 @@
 // Robo Organs.
 #define BP_VOICE             "vocal synthesiser"
 
-//Augmetations
-#define BP_AUGMENT_R_ARM        "right arm augment"
-#define BP_AUGMENT_L_ARM        "left arm augment"
-#define BP_AUGMENT_R_HAND       "right hand augment"
-#define BP_AUGMENT_L_HAND       "left hand augment"
-#define BP_AUGMENT_R_LEG        "right leg augment"
-#define BP_AUGMENT_L_LEG        "left leg augment"
-#define BP_AUGMENT_CHEST_ARMOUR "chest armor augment"
-#define BP_AUGMENT_CHEST_ACTIVE "active chest augment"
-#define BP_AUGMENT_HEAD         "head augment"
-
-//Augment flags
-#define AUGMENTATION_MECHANIC 1
-#define AUGMENTATION_ORGANIC  2
-
 // Prosthetic helpers.
 #define BP_IS_PROSTHETIC(org) (!QDELETED(org) && (org.organ_properties & ORGAN_PROP_PROSTHETIC))
 #define BP_IS_ROBOTIC(org)    (!QDELETED(org) && (org.bodytype?.is_robotic))

code/__defines/persistence.dm

@@ -0,0 +1,5 @@
+// Handled elsewhere, do not let them load like vars.
+var/global/list/_forbid_field_load = list(
+	(nameof(/datum::type)) = TRUE,
+	(nameof(/atom::loc))  = TRUE
+)

code/__defines/serde.dm

@@ -0,0 +1,64 @@
+#define SERDE_HINT_FINISHED 1
+#define SERDE_HINT_POSTINIT 2
+
+#define SERDE_REAGENT_LIST "_reagent_list"
+#define SERDE_REAGENT_VOLUME "_reagent_volume"
+
+#define SERIALIZE_VALUE(V, T, VAL) .[nameof(T::V)] = VAL;
+#define SERIALIZE(V, T) SERIALIZE_VALUE(V, T, V)
+#define SERIALIZE_IF_MODIFIED(V, T) if(V != initial(V)) { SERIALIZE_VALUE(V, T, V) }
+#define SERIALIZE_TYPE_IF_MODIFIED(V, T) if(V != initial(V)) { SERIALIZE_VALUE(V, T, "[V]") }
+#define SERIALIZE_DECL_IF_MODIFIED(V, T) if((isnull(V) && !isnull(initial(V))) || ((istext(V) || istype(V, /decl) || ispath(V, /decl)) && !DECLS_ARE_EQUIVALENT(V, initial(V)))) { var/decl/__D = RESOLVE_TO_DECL(V); SERIALIZE_VALUE(V, T, __D?.uid) }
+#define SERIALIZE_DECL_LIST(V, T) if(islist(V)) { var/list/__decl_uids = list(); for(var/decl/__decl in V) { __decl_uids += __decl.uid }; SERIALIZE_VALUE(V, T, __decl_uids) }
+#define SERIALIZE_REAGENTS(V, T, I) if(istype(V, /datum/reagents)) {                                                       \
+	.[I + SERDE_REAGENT_VOLUME] = UNLINT(V.maximum_volume);                                                                \
+	if(UNLINT(V.total_volume)) {                                                                                           \
+		var/list/__compiled_reagents = list();                                                                             \
+		for(var/decl/material/R in UNLINT(V.liquid_volumes)) {                                                             \
+			__compiled_reagents[++__compiled_reagents.len] = list(R.uid, UNLINT(V.liquid_volumes[R]), (MAT_PHASE_LIQUID)); \
+		}                                                                                                                  \
+		for(var/decl/material/R in UNLINT(V.solid_volumes)) {                                                              \
+			__compiled_reagents[++__compiled_reagents.len] = list(R.uid, UNLINT(V.solid_volumes[R]), (MAT_PHASE_SOLID));   \
+		}                                                                                                                  \
+		.[I + SERDE_REAGENT_LIST] = __compiled_reagents;                                                                   \
+	} else {                                                                                                               \
+		.[I + SERDE_REAGENT_LIST] = list();                                                                                \
+	}                                                                                                                      \
+} else {                                                                                                                   \
+	.[I + SERDE_REAGENT_LIST]   = list();                                                                                  \
+	.[I + SERDE_REAGENT_VOLUME] = 0;                                                                                       \
+}
+
+#define DESERIALIZE_REAGENTS(V, I) if(((I + SERDE_REAGENT_LIST) in __deserialization_payload) && ((I + SERDE_REAGENT_VOLUME) in __deserialization_payload)) {         \
+	V = list((SERDE_REAGENT_VOLUME) = __deserialization_payload[I + SERDE_REAGENT_VOLUME], (SERDE_REAGENT_LIST) = __deserialization_payload[I + SERDE_REAGENT_LIST]); \
+}
+
+#define DESERIALIZE_DECL_TO_TYPE(V) if(istext(V) || ispath(V, /decl) || istype(V, /decl)) { var/decl/__D = RESOLVE_TO_DECL(V); V = __D?.type; } else { V = null; }
+#define DESERIALIZE_TYPE(V) if(istext(V)) { V = text2path(V); } else if(!ispath(V)) { V = null; }
+#define DESERIALIZE_DECL(V) if(istext(V) || ispath(V)) { V = RESOLVE_TO_DECL(V); } else { V = null; }
+
+// List cast is to avoid OpenDream complaining about V typically being typed as a reagents datum, but holding a list for serde.
+#define FINALIZE_REAGENTS_SERDE_BODY(V) try {                                                              \
+	if((SERDE_REAGENT_LIST in V) && (SERDE_REAGENT_VOLUME in V)) {                                         \
+		var/list/LV = V;                                                                                   \
+		var/__serde_volume = LV[SERDE_REAGENT_VOLUME];                                                     \
+		if(__serde_volume <= 0) {                                                                          \
+			V = null;                                                                                      \
+		} else {                                                                                           \
+			var/list/__serde_reagents = LV[SERDE_REAGENT_LIST];                                            \
+			V = new /datum/reagents(__serde_volume, src);                                                  \
+			for(var/list/entry in __serde_reagents) {                                                      \
+				V.add_reagent(RESOLVE_TO_DECL(entry[1]), entry[2], phase = entry[3], defer_update = TRUE); \
+			}                                                                                              \
+			V.handle_update();                                                                             \
+		}                                                                                                  \
+	} else {                                                                                               \
+		V = null;                                                                                          \
+	}                                                                                                      \
+} catch(var/exception/E) {                                                                                 \
+	log_error("Exception while finalizing reagents load for [type]: [EXCEPTION_TEXT(E)]");                 \
+	V = null;                                                                                              \
+}
+
+#define FINALIZE_REAGENTS_SERDE(V)            if(islist(V)) { FINALIZE_REAGENTS_SERDE_BODY(V); }
+#define FINALIZE_REAGENTS_SERDE_AND_RETURN(V) if(islist(V)) { FINALIZE_REAGENTS_SERDE_BODY(V); return; }