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

Author: MistakeNot4892

.editorconfig

@@ -20,3 +20,8 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
+[*.txt]
+end_of_line = crlf
+
+[*.md]
+end_of_line = crlf

.gitattributes

@@ -12,3 +12,5 @@ html/changelog.html merge=union
 # Declare files that will always have CRLF line endings on checkout.
 *.dm text eol=crlf
 *.dmm text eol=crlf
+*.txt text eol=crlf
+*.md text eol=crlf

.github/workflows/test.yml

@@ -15,8 +15,8 @@ on:
 
 env:
   BYOND_MAJOR: "515"
-  BYOND_MINOR: "1643"
-  SPACEMAN_DMM_VERSION: suite-1.8
+  BYOND_MINOR: "1647"
+  SPACEMAN_DMM_VERSION: suite-1.9
 
 jobs:
   DreamChecker:
@@ -26,14 +26,15 @@ jobs:
       - name: Setup Cache
         uses: actions/cache@v3
         with:
-          path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
+          path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
       - name: Install Dreamchecker
         run:  scripts/install-spaceman-dmm.sh dreamchecker
       - name: Run Dreamchecker
         run: |
           set -o pipefail
           ~/dreamchecker 2>&1 | tee ${GITHUB_WORKSPACE}/output-annotations.txt
+          ./test/lint-all-modpacks.sh nebula.dme
       - name: Annotate Lints
         uses: yogstation13/DreamAnnotate@v2
         if: always()
@@ -74,7 +75,7 @@ jobs:
       - name: Setup Cache
         uses: actions/cache@v3
         with:
-          path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
+          path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install Dependencies
         run: sudo apt-get install -y uchardet
@@ -103,7 +104,7 @@ jobs:
       - name: Setup Cache
         uses: actions/cache@v3
         with:
-          path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
+          path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Run Tests
         env:

code/___opendream_linting.dm

@@ -1,6 +1,7 @@
 #ifdef OPENDREAM
 //1000-1999
-#pragma FileAlreadyIncluded error
+// FileAlreadyIncluded trips up on modpack DMEs
+#pragma FileAlreadyIncluded disabled
 #pragma MissingIncludedFile error
 #pragma MisplacedDirective error
 #pragma UndefineMissingDirective error

code/__defines/_planes+layers.dm

@@ -117,6 +117,7 @@ What is the naming convention for planes or layers?
 	#define TABLE_LAYER                 TURF_OVER_EDGE_LAYER + 0.20
 	#define BELOW_OBJ_LAYER             TURF_OVER_EDGE_LAYER + 0.21
 	#define STRUCTURE_LAYER             TURF_OVER_EDGE_LAYER + 0.22
+	#define ABOVE_STRUCTURE_LAYER       TURF_OVER_EDGE_LAYER + 0.23
 	// OBJ_LAYER                        3
 	#define ABOVE_OBJ_LAYER             3.01
 	#define CLOSED_DOOR_LAYER           3.02

code/__defines/backgrounds.dm

@@ -5,3 +5,15 @@
 #define BACKGROUND_FLAG_LOCATION    BITFLAG(4)
 #define BACKGROUND_FLAG_RESIDENCE   BITFLAG(5)
 #define BACKGROUND_FLAG_HOMEWORLD   BITFLAG(6)
+
+#ifdef UNIT_TEST
+var/global/list/all_background_flags = list(
+	"BACKGROUND_FLAG_NAMING"      = (BACKGROUND_FLAG_NAMING),
+	"BACKGROUND_FLAG_CITIZENSHIP" = (BACKGROUND_FLAG_CITIZENSHIP),
+	"BACKGROUND_FLAG_IDEOLOGY"    = (BACKGROUND_FLAG_IDEOLOGY),
+	"BACKGROUND_FLAG_RELIGION"    = (BACKGROUND_FLAG_RELIGION),
+	"BACKGROUND_FLAG_LOCATION"    = (BACKGROUND_FLAG_LOCATION),
+	"BACKGROUND_FLAG_RESIDENCE"   = (BACKGROUND_FLAG_RESIDENCE),
+	"BACKGROUND_FLAG_HOMEWORLD"   = (BACKGROUND_FLAG_HOMEWORLD)
+)
+#endif

code/__defines/chemistry.dm

@@ -81,12 +81,12 @@
 #define REAGENT_LIST(R) (R.reagents?.get_reagents() || "No reagent holder")
 
 #define REAGENTS_FREE_SPACE(R) (R?.maximum_volume - R?.total_volume)
-#define REAGENT_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_volumes && REAGENT_HOLDER.reagent_volumes[REAGENT_TYPE])
+#define REAGENT_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_volumes && REAGENT_HOLDER.reagent_volumes[RESOLVE_TO_DECL(REAGENT_TYPE)])
+#define LIQUID_VOLUME(REAGENT_HOLDER,  REAGENT_TYPE) (REAGENT_HOLDER?.liquid_volumes  && REAGENT_HOLDER.liquid_volumes[RESOLVE_TO_DECL(REAGENT_TYPE)])
+#define SOLID_VOLUME(REAGENT_HOLDER,   REAGENT_TYPE) (REAGENT_HOLDER?.solid_volumes   && REAGENT_HOLDER.solid_volumes[RESOLVE_TO_DECL(REAGENT_TYPE)])
+#define REAGENT_DATA(REAGENT_HOLDER,   REAGENT_TYPE) (REAGENT_HOLDER?.reagent_data    && REAGENT_HOLDER.reagent_data[RESOLVE_TO_DECL(REAGENT_TYPE)])
 
-#define LIQUID_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.liquid_volumes && REAGENT_HOLDER.liquid_volumes[REAGENT_TYPE])
-#define SOLID_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.solid_volumes && REAGENT_HOLDER.solid_volumes[REAGENT_TYPE])
-
-#define REAGENT_DATA(REAGENT_HOLDER, REAGENT_TYPE)   (REAGENT_HOLDER?.reagent_data    && REAGENT_HOLDER.reagent_data[REAGENT_TYPE])
+#define CHEM_DOSE(M, R) LAZYACCESS(M._chem_doses, RESOLVE_TO_DECL(R))
 
 #define MAT_SOLVENT_NONE        0
 #define MAT_SOLVENT_MILD        1

code/__defines/colors.dm

@@ -236,3 +236,5 @@ var/global/list/telecomms_colours = list(
 #define COLOR_DARKMODE_TEXT "#a4bad6"
 
 #define COLORED_SQUARE(COLOR) "<span style='font-face: fixedsys; font-size: 14px; background-color: [COLOR]; color: [COLOR]'>___</span>"
+
+#define hsv(args...) rgb(args, space = COLORSPACE_HSV)

code/__defines/fluids.dm

@@ -40,11 +40,11 @@ if(!QDELETED(TURF) && TURF._fluid_turf_is_active) {                           \
 #define UPDATE_FLUID_BLOCKED_DIRS(TURF)                                       \
 if(isnull(TURF.fluid_blocked_dirs)) {                                         \
 	TURF.fluid_blocked_dirs = 0;                                              \
-	for(var/obj/structure/window/W in TURF) {                                 \
-		if(W.density) TURF.fluid_blocked_dirs |= W.dir;                       \
+	for(var/obj/structure/window/window in TURF) {                            \
+		if(window.density) TURF.fluid_blocked_dirs |= window.dir;             \
 	}                                                                         \
-	for(var/obj/machinery/door/window/D in TURF) {                            \
-		if(D.density) TURF.fluid_blocked_dirs |= D.dir;                       \
+	for(var/obj/machinery/door/window/windoor in TURF) {                      \
+		if(windoor.density) TURF.fluid_blocked_dirs |= windoor.dir;           \
 	}                                                                         \
 }
 

code/__defines/hud.dm

@@ -24,6 +24,7 @@
 #define HUD_FIRE         /decl/hud_element/fire
 #define HUD_CHARGE       /decl/hud_element/charge
 #define HUD_ROBOT_MODULE /decl/hud_element/module_selection
+#define HUD_MODIFIERS    /decl/hud_element/modifiers
 
 #define GET_HUD_ALERT(M, A)        ((istype(M?.hud_used, /datum/hud) && (A in M.hud_used.alerts)) ? M.hud_used.alerts[A] : 0)
 #define CLEAR_HUD_ALERTS(M)        if(istype(M?.hud_used, /datum/hud) && M.hud_used.alerts)                    { M.hud_used.alerts = null; }