Updating from Neb dev.

.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; }

code/__defines/items_clothing.dm

@@ -266,3 +266,10 @@ var/global/list/all_hand_slots = list(
 	BP_R_HAND_UPPER,
 	BP_MOUTH
 )
+
+/// If this item conflicts with a loadout item, simply delete it.
+#define LOADOUT_CONFLICT_DELETE 0
+/// If this item conflicts with a loadout item, place this item in storage.
+#define LOADOUT_CONFLICT_STORAGE 1
+/// If this item conflicts with a loadout item, place THE LOADOUT ITEM in storage.
+#define LOADOUT_CONFLICT_KEEP 2

code/__defines/lighting.dm

@@ -10,7 +10,8 @@
 #define LIGHTING_DARKNESS_ICON_STATE "black"	// icon_state used for lighting overlays with no luminosity.
 #define LIGHTING_TRANSPARENT_ICON_STATE "blank"
 
-#define LIGHTING_SOFT_THRESHOLD 0.001 // If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting overlays.
+// This is purely used as a threshold for 'is this turf probably dark' to avoid floating point nonsense.
+#define LIGHTING_SOFT_THRESHOLD 0.001
 #define LIGHTING_BLOCKED_FACTOR 0.5	// How much the range of a directional light will be reduced while facing a wall.
 
 // If defined, instant updates will be used whenever server load permits. Otherwise queued updates are always used.
@@ -20,6 +21,10 @@
 #define TURF_IS_DYNAMICALLY_LIT_UNSAFE(T) ((T:dynamic_lighting && T:loc:dynamic_lighting))
 #define TURF_IS_DYNAMICALLY_LIT(T) (isturf(T) && TURF_IS_DYNAMICALLY_LIT_UNSAFE(T))
 
+// Note: this does not imply the above, a turf can have ambient light without being dynamically lit.
+#define TURF_IS_AMBIENT_LIT_UNSAFE(T) (T:ambient_active)
+#define TURF_IS_AMBIENT_LIT(T) (isturf(T) && TURF_IS_AMBIENT_LIT_UNSAFE(T))
+
 // If I were you I'd leave this alone.
 #define LIGHTING_BASE_MATRIX \
 	list            \

code/__defines/lists.dm

@@ -4,7 +4,7 @@
 // All of these are null-safe, you can use them without knowing if the list var is initialized yet
 
 //Picks from the list, with some safeties, and returns the "default" arg if it fails
-#define DEFAULTPICK(L, default) ((istype(L, /list) && L:len) ? pick(L) : default)
+#define DEFAULTPICK(L, default) ((islist(L) && length(L)) ? pick(L) : default)
 //Supplies null as the default to DEFAULTPICK
 #define SAFEPICK(L) DEFAULTPICK(L, null)
 // Ensures L is initailized after this point

code/__defines/machinery.dm

@@ -4,9 +4,8 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 #define MEGAWATTS *1000000
 #define GIGAWATTS *1000000000
 
-#define MACHINERY_TICKRATE 2		// Tick rate for machinery in seconds. As it affects CELLRATE calculation it is kept as define here
-
-#define CELLRATE (1 / ( 3600 / MACHINERY_TICKRATE )) // Multiplier for charge units. Converts cell charge units(watthours) to joules. Takes into consideration that our machinery ticks once per two seconds.
+/// Multiplier for charge units. Converts cell charge units(watthours) to joules. Takes into consideration that our machinery ticks once per two seconds.
+#define CELLRATE (/datum/controller/subsystem/machines::wait / (1 HOUR))
 
 // Doors!
 #define DOOR_CRUSH_DAMAGE 40
@@ -44,7 +43,7 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 // Camera channels
 // Station channels
 #define CAMERA_CHANNEL_PUBLIC "Public"
-#define CAMERA_CAMERA_CHANNEL_ENGINEERING "Engineering"
+#define CAMERA_CHANNEL_ENGINEERING "Engineering"
 #define CAMERA_CHANNEL_MEDICAL "Medical"
 #define CAMERA_CHANNEL_RESEARCH "Research"
 #define CAMERA_CHANNEL_SECURITY "Security"

code/__defines/maths.dm

@@ -1,5 +1,5 @@
 // Macro functions.
-#define RAND_F(LOW, HIGH) (rand() * (HIGH - LOW) + LOW)
+#define RAND_F(LOW, HIGH) (rand() * ((HIGH) - (LOW)) + (LOW))
 
 // Float-aware floor and ceiling since round() will round upwards when given a second arg.
 #define NONUNIT_FLOOR(x, y)    (floor((x) / (y)) * (y))

code/__defines/misc.dm

@@ -383,10 +383,22 @@
 #define CRAYON_DRAW_ARROW    "arrow"
 
 // Enum for results of is_space_movement_permitted()
-#define SPACE_MOVE_SUPPORTED (-1)
-#define SPACE_MOVE_FORBIDDEN   0
-#define SPACE_MOVE_PERMITTED   1
+// Note that it may also return an instance of /atom/movable, which acts as SPACE_MOVE_SUPPORTED.
+#define SPACE_MOVE_SUPPORTED (-1) //! Mob should run space-slipping checks.
+#define SPACE_MOVE_FORBIDDEN   0  //! Mob should begin spacedrift.
+#define SPACE_MOVE_PERMITTED   1  //! Mob should stop/prevent spacedrift.
 
 // Default UI style applied to client prefs.
 #define DEFAULT_UI_STYLE /decl/ui_style/midnight
 
+// Indicates a modifier will never expire.
+#define MOB_MODIFIER_INDEFINITE (-1)
+
+// Indicators for attack checking proc.
+#define MM_ATTACK_TYPE_WEAPON      0
+#define MM_ATTACK_TYPE_THROWN      1
+#define MM_ATTACK_TYPE_PROJECTILE  2
+
+#define MM_ATTACK_RESULT_NONE      0
+#define MM_ATTACK_RESULT_DEFLECTED BITFLAG(0)
+#define MM_ATTACK_RESULT_BLOCKED   BITFLAG(1)

code/__defines/mob_status.dm

@@ -1,5 +1,5 @@
 #define PENDING_STATUS(MOB, COND)      (LAZYACCESS(MOB.pending_status_counters, COND) || LAZYACCESS(MOB.status_counters, COND))
 #define GET_STATUS(MOB, COND)          (LAZYACCESS(MOB.status_counters, COND))
 #define HAS_STATUS(MOB, COND)          (GET_STATUS(MOB, COND) > 0)
-#define ADJ_STATUS(MOB, COND, AMT)     (MOB.set_status(COND, PENDING_STATUS(MOB, COND) + AMT))
-#define SET_STATUS_MAX(MOB, COND, AMT) (MOB.set_status(COND, max(PENDING_STATUS(MOB, COND), AMT)))
+#define ADJ_STATUS(MOB, COND, AMT)     (MOB.set_status_condition(COND, PENDING_STATUS(MOB, COND) + AMT))
+#define SET_STATUS_MAX(MOB, COND, AMT) (MOB.set_status_condition(COND, max(PENDING_STATUS(MOB, COND), AMT)))

code/__defines/mobs.dm

@@ -3,7 +3,7 @@
 #define UNCONSCIOUS 1
 #define DEAD        2
 
-// Bitflags defining which status effects could be or are inflicted on a mob.
+// Bitflags defining which status conditions could be or are inflicted on a mob.
 #define CANSTUN      BITFLAG(0)
 #define CANWEAKEN    BITFLAG(1)
 #define CANPARALYSE  BITFLAG(2)
@@ -246,6 +246,10 @@
 #define DATA_BLOOD_DOSE_CHEM  /decl/reagent_data_field/blood_dose_chem
 #define DATA_BLOOD_HAS_OXY    /decl/reagent_data_field/blood_has_oxy
 
+// Misc general data.
+#define DATA_COOLDOWN_TIME    /decl/reagent_data_field/cooldown_time
+#define DATA_WATER_HOLINESS   /decl/reagent_data_field/holy
+
 //Used by show_message() and emotes
 #define VISIBLE_MESSAGE 1
 #define AUDIBLE_MESSAGE 2
@@ -270,25 +274,11 @@
 #define CORPSE_CAN_REENTER             BITFLAG(0)
 #define CORPSE_CAN_RESPAWN             BITFLAG(1)
 
-#define SPECIES_HUMAN            "Human"
-#define SPECIES_MONKEY           "Monkey"
-
 #define SURGERY_CLOSED 0
 #define SURGERY_OPEN 1
 #define SURGERY_RETRACTED 2
 #define SURGERY_ENCASED 3
 
-#define STASIS_MISC     "misc"
-#define STASIS_CRYOBAG  "cryobag"
-#define STASIS_COLD     "cold"
-
-#define AURA_CANCEL 1
-#define AURA_FALSE  2
-#define AURA_TYPE_BULLET "Bullet"
-#define AURA_TYPE_WEAPON "Weapon"
-#define AURA_TYPE_THROWN "Thrown"
-#define AURA_TYPE_LIFE   "Life"
-
 #define SPECIES_BLOOD_DEFAULT 560
 
 #define SLIME_EVOLUTION_THRESHOLD 15
@@ -357,7 +347,10 @@ var/global/list/dexterity_levels = list(
 #define MOB_ICON_HAS_GIB_STATE       BITFLAG(5)
 #define MOB_ICON_HAS_DUST_STATE      BITFLAG(6)
 #define MOB_ICON_HAS_PARALYZED_STATE BITFLAG(7)
+
+// Additional pronoun sets.
 #define NEUTER_ANIMATE "animate singular neutral"
+#define SECOND_PERSON_SINGULAR "second person singular"
 
 // Equipment Overlays Indices //
 #define HO_CONDITION_LAYER  1
@@ -387,7 +380,8 @@ var/global/list/dexterity_levels = list(
 #define HO_HANDCUFF_LAYER   25
 #define HO_INHAND_LAYER     26
 #define HO_FIRE_LAYER       27 //If you're on fire
-#define TOTAL_OVER_LAYERS   27
+#define HO_EFFECT_LAYER     28
+#define TOTAL_OVER_LAYERS   28
 //////////////////////////////////
 
 // Underlay defines; vestigal implementation currently.

code/__defines/observ.dm

@@ -1,4 +1 @@
-// This also works, and removes the need for the _REPEAT variant, but the linter hates it:
-//   #define RAISE_EVENT(OBS, args...) (GET_DECL(OBS))?.raise_event(args);
-#define RAISE_EVENT(OBS, args...) var/decl/observ/__event = GET_DECL(OBS); __event?.raise_event(args);
-#define RAISE_EVENT_REPEAT(OBS, args...) __event = GET_DECL(OBS); __event?.raise_event(args);
+#define RAISE_EVENT(OBS, args...) UNLINT((GET_DECL(OBS))?.raise_event(args));

code/__defines/reagent_data_fields.dm

@@ -62,3 +62,9 @@
 
 /decl/reagent_data_field/blood_has_oxy
 	uid = "rdf_blood_has_oxy"
+
+/decl/reagent_data_field/cooldown_time
+	uid = "rdf_cooldown_time"
+
+/decl/reagent_data_field/holy
+	uid = "rdf_water_holy"

code/__defines/subsystem-priority.dm

@@ -47,7 +47,6 @@
 #define SS_PRIORITY_PROCESSING    95  // Generic datum processor. Replaces objects processor.
 #define SS_PRIORITY_PLANTS        90  // Plant processing, slow ticks.
 #define SS_PRIORITY_VINES         50  // Spreading vine effects.
-#define SS_PRIORITY_PSYCHICS      45  // Psychic complexus processing.
 #define SS_PRIORITY_MOB_AI        45  // Mob AI logic; finding targets, attacking, etc.
 #define SS_PRIORITY_AUTO_MOVE     42  // Automated atom movement, fires much more frequently than MOB_AI.
 #define SS_PRIORITY_NANO          40  // Updates to nanoui uis.

code/__defines/xenoarcheaology.dm

@@ -1,16 +1,3 @@
 #define XENOFIND_APPLY_PREFIX BITFLAG(0)
 #define XENOFIND_APPLY_DECOR  BITFLAG(1)
 #define XENOFIND_REPLACE_ICON BITFLAG(2)
-
-#define EFFECT_TOUCH    0
-#define EFFECT_AURA     1
-#define EFFECT_PULSE    2
-#define MAX_EFFECT      2
-
-#define EFFECT_UNKNOWN  0
-#define EFFECT_ENERGY   1
-#define EFFECT_PSIONIC  2
-#define EFFECT_ELECTRO  3
-#define EFFECT_PARTICLE 4
-#define EFFECT_ORGANIC  5
-#define EFFECT_SYNTH    6

code/__globals.dm

@@ -1,6 +1,7 @@
 // Defined here due to being used immediately below.
 #define GET_DECL(D) (ispath(D, /decl) ? (decls_repository.fetched_decls[D] || decls_repository.get_decl(D)) : null)
 #define IMPLIED_DECL GET_DECL(__IMPLIED_TYPE__)
+#define RESOLVE_TO_DECL(D) (istype(D, /decl) ? D : GET_DECL(D))
 
 // Defined here due to compile order; overrides in macros make the compiler complain.
 /decl/global_vars

code/_global_vars/client.dm

@@ -1,6 +1,3 @@
-var/global/list/hotkey_keybinding_list_by_key = list()
-var/global/list/keybindings_by_name = list()
-
 // This is a mapping from JS keys to Byond - ref: https://keycode.info/
 var/global/list/_kbMap = list(
 	"UP" = "North",

code/_global_vars/configuration.dm

@@ -6,10 +6,6 @@ var/global/join_motd = null
 
 var/global/secret_force_mode = "secret"   // if this is anything but "secret", the secret rotation will forceably choose this mode.
 
-var/global/Debug2 = 0
-
-var/global/gravity_is_on = 1
-
 // Database connections. A connection is established on world creation.
 // Ideally, the connection dies when the server restarts (After feedback logging.).
 var/global/DBConnection/dbcon // General-purpose record database.

code/_global_vars/lists/flavor.dm

@@ -71,6 +71,8 @@ var/global/list/numbers_as_words = list("One", "Two", "Three", "Four",
 	"Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen",
 	"Eighteen", "Nineteen")
 
+// This is, for some reason, used exclusively for headphones, jukeboxes, and boomboxes.
+// It also seems to exist mostly for the purpose of allowing admins to upload their own songs to those at runtime?
 var/global/list/music_tracks = list(
 	"Beyond" = /decl/music_track/ambispace,
 	"Clouds of Fire" = /decl/music_track/clouds_of_fire,