Upstream merge

.github/workflows/changelog_generation.yml

@@ -11,13 +11,13 @@ jobs:
     if: github.repository == 'NebulaSS13/Nebula' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Otherwise, we will fail to push refs
           ref: dev
           token: ${{ secrets.BOT_TOKEN }}
       - name: Python setup
-        uses: actions/setup-python@3105fb18c05ddd93efea5f9e0bef7a03a6e9e7df
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/generate_documentation.yml

@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     concurrency: gen-docs
     steps:
-      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      - uses: actions/checkout@v3
       - name: Setup Cache
-        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
+        uses: actions/cache@v3
         with:
           path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -28,7 +28,7 @@ jobs:
           ~/dmdoc
           touch dmdoc/.nojekyll
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@da91e735be5cabb471a4b8afe367d10606da4683
+        uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages-dmdoc

.github/workflows/make_changelogs.yml

@@ -12,11 +12,11 @@ jobs:
     if: github.repository == 'NebulaSS13/Nebula' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v3
         with:
           fetch-depth: 25
       - name: Python setup
-        uses: actions/setup-python@3105fb18c05ddd93efea5f9e0bef7a03a6e9e7df
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/test.yml

@@ -22,9 +22,9 @@ jobs:
   DreamChecker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      - uses: actions/checkout@v3
       - name: Setup Cache
-        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
+        uses: actions/cache@v3
         with:
           path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -35,7 +35,7 @@ jobs:
           set -o pipefail
           ~/dreamchecker 2>&1 | tee ${GITHUB_WORKSPACE}/output-annotations.txt
       - name: Annotate Lints
-        uses: yogstation13/DreamAnnotate@34029606cd7c22a08a589e084f860c1cc287363c
+        uses: yogstation13/DreamAnnotate@v2
         if: always()
         with:
           outputFile: output-annotations.txt
@@ -53,9 +53,9 @@ jobs:
   Code:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      - uses: actions/checkout@v3
       - name: Setup Cache
-        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
+        uses: actions/cache@v3
         with:
           path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -82,9 +82,9 @@ jobs:
       matrix:
         map_path: [example, tradeship, nexus, exodus, ministation, away_sites_testing, modpack_testing, outreach, kleibkhar]
     steps:
-      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      - uses: actions/checkout@v3
       - name: Setup Cache
-        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
+        uses: actions/cache@v3
         with:
           path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}

code/__datastructures/priority_queue.dm

@@ -1,63 +1,68 @@
+/// An automatically ordered list, using the cmp proc to weight the list items
+/datum/priority_queue
+	/// The actual queue
+	var/list/L
+	/// The weight function used to order the queue
+	var/cmp
 
-//////////////////////
-//PriorityQueue object
-//////////////////////
-
-//an ordered list, using the cmp proc to weight the list elements
-/PriorityQueue
-	var/list/L //the actual queue
-	var/cmp //the weight function used to order the queue
-
-/PriorityQueue/New(compare)
+/// Takes a proc `comparer` that will be used to compare the items inserted
+/// * Param `comparer` take two arguments and return the difference in their weight
+/// * For example: /proc/CompareItems(atom/A, atom/B) return A.size - B.size
+/datum/priority_queue/New(comparer)
 	L = new()
-	cmp = compare
+	cmp = comparer
 
-/PriorityQueue/proc/IsEmpty()
+/// * Returns: `TRUE` if the queue is empty, otherwise `FALSE`
+/datum/priority_queue/proc/IsEmpty()
 	return !L.len
 
-//add an element in the list,
-//immediatly ordering it to its position using dichotomic search
-/PriorityQueue/proc/Enqueue(atom/A)
-	ADD_SORTED(L, A, cmp)
+/// Add an `item` to the list, immediatly ordering it to its position using dichotomic search
+/datum/priority_queue/proc/Enqueue(item)
+	ADD_SORTED(L, item, cmp)
 
-//removes and returns the first element in the queue
-/PriorityQueue/proc/Dequeue()
+/// Removes and returns the first item in the queue
+/// * Returns: The first `item` in the queue, otherwise `FALSE`
+/datum/priority_queue/proc/Dequeue()
 	if(!L.len)
-		return 0
+		return FALSE
 	. = L[1]
 
 	Remove(.)
 
-//removes an element
-/PriorityQueue/proc/Remove(atom/A)
-	. = L.Remove(A)
+/// Removes an `item` from the list
+/// * Returns: `TRUE` if succesfully removed, otherwise `FALSE`
+/datum/priority_queue/proc/Remove(item)
+	. = L.Remove(item)
 
-//returns a copy of the elements list
-/PriorityQueue/proc/List()
+/// * Returns: A copy of the item list
+/datum/priority_queue/proc/List()
 	. = L.Copy()
 
-//return the position of an element or 0 if not found
-/PriorityQueue/proc/Seek(atom/A)
-	. = L.Find(A)
+/// Finds an `item` in the list
+/// * Returns: The position of the `item`, or `0` if not found
+/datum/priority_queue/proc/Seek(item)
+	. = L.Find(item)
 
-//return the element at the i_th position
-/PriorityQueue/proc/Get(i)
-	if(i > L.len || i < 1)
+/// Gets the item at the positon `index`
+/// * Returns: The `item` at the index, or `0` if outside the range of the queue
+/datum/priority_queue/proc/Get(index)
+	if(index > L.len || index < 1)
 		return 0
-	return L[i]
+	return L[index]
 
-//return the length of the queue
-/PriorityQueue/proc/Length()
+/// * Returns: The length of the queue
+/datum/priority_queue/proc/Length()
 	. = L.len
 
-//replace the passed element at it's right position using the cmp proc
-/PriorityQueue/proc/ReSort(atom/A)
-	var/i = Seek(A)
+/// Resorts the `item` to it's correct position in the queue.
+/// * For example: The queue is sorted based on weight and atom A changes weight after being added
+/datum/priority_queue/proc/ReSort(item)
+	var/i = Seek(item)
 	if(i == 0)
 		return
 	while(i < L.len && call(cmp)(L[i],L[i+1]) > 0)
 		L.Swap(i,i+1)
 		i++
-	while(i > 1 && call(cmp)(L[i],L[i-1]) <= 0) //last inserted element being first in case of ties (optimization)
+	while(i > 1 && call(cmp)(L[i],L[i-1]) <= 0) // Last inserted element being first in case of ties (optimization)
 		L.Swap(i,i-1)
 		i--

code/__defines/atmos.dm

@@ -21,7 +21,7 @@
 #define SOUND_MINIMUM_PRESSURE 10
 
 #define PRESSURE_DAMAGE_COEFFICIENT 4   // The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE.
-#define    MAX_HIGH_PRESSURE_DAMAGE 4   // This used to be 20... I got this much random rage for some retarded decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :(
+#define    MAX_HIGH_PRESSURE_DAMAGE 4   // Caps the amount of pressure damage taken in one tick from a high pressure area.
 #define         LOW_PRESSURE_DAMAGE 0.6 // The amount of damage someone takes when in a low pressure area. (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
 
 #define MINIMUM_PRESSURE_DIFFERENCE_TO_SUSPEND (MINIMUM_AIR_TO_SUSPEND*R_IDEAL_GAS_EQUATION*T20C)/CELL_VOLUME			// Minimum pressure difference between zones to suspend

code/__defines/flags.dm

@@ -53,7 +53,7 @@ The latter will result in a linter warning and will not work correctly.
 // Movable-level flags (/atom/movable/movable_flags)
 #define MOVABLE_FLAG_PROXMOVE             BITFLAG(0) // Does this object require proximity checking in Enter()?
 #define MOVABLE_FLAG_Z_INTERACT           BITFLAG(1) // Should attackby and attack_hand be relayed through ladders and open spaces?
-#define MOVABLE_FLAG_EFFECTMOVE           BITFLAG(2) // Is this an effect that should move?
+#define MOVABLE_FLAG_ALWAYS_SHUTTLEMOVE   BITFLAG(2) // Is this an effect that should move?
 #define MOVABLE_FLAG_DEL_SHUTTLE          BITFLAG(3) // Shuttle transistion will delete this.
 #define MOVABLE_FLAG_WHEELED              BITFLAG(4) // Movable has reduced stamina cost/speed reduction when pulled.
 

code/__defines/holomap.dm

@@ -0,0 +1,37 @@
+//
+// Constants and standard colors for the holomap
+//
+
+#define HOLOMAP_ICON 'icons/480x480.dmi' // Icon file to start with when drawing holomaps (to get a 480x480 canvas).
+#define HOLOMAP_ICON_SIZE 480 // Pixel width & height of the holomap icon.  Used for auto-centering etc.
+#define HOLOMAP_MARGIN 100 // minimum marging on sides when combining maps
+#define UI_HOLOMAP "CENTER-7, CENTER-7" // Screen location of the holomap "hud"
+
+// Holomap colors
+#define COLOR_HOLOMAP_OBSTACLE "#ffffffdd"	// Color of walls and barriers
+#define COLOR_HOLOMAP_PATH     "#66666699"	// Color of floors
+#define COLOR_HOLOMAP_HOLOFIER "#79ff79"	// Whole map is multiplied by this to give it a green holoish look
+
+#define HOLOMAP_AREACOLOR_BASE        "#ffffffff"
+#define HOLOMAP_AREACOLOR_COMMAND     "#386d8099"
+#define HOLOMAP_AREACOLOR_SECURITY    "#ae121299"
+#define HOLOMAP_AREACOLOR_MEDICAL     "#ffffffa5"
+#define HOLOMAP_AREACOLOR_SCIENCE     "#f45dff99"
+#define HOLOMAP_AREACOLOR_EXPLORATION "#a154a699"
+#define HOLOMAP_AREACOLOR_ENGINEERING "#f1c23199"
+#define HOLOMAP_AREACOLOR_CARGO       "#e06f0099"
+#define HOLOMAP_AREACOLOR_HALLWAYS    "#ffffff66"
+#define HOLOMAP_AREACOLOR_AIRLOCK     "#0000ffcc"
+#define HOLOMAP_AREACOLOR_ESCAPE      "#ff0000cc"
+#define HOLOMAP_AREACOLOR_CREW        "#5bc1c199"
+#define HOLOMAP_AREACOLOR_MAINTENANCE "#9c895066"
+// If someone can come up with a non-conflicting color for the lifts, please update this.
+#define HOLOMAP_AREACOLOR_LIFTS       null
+
+// Handy defines to lookup the pixel offsets for holomap
+// Currently set to 0, left here in case of need for per map offsets
+#define HOLOMAP_PIXEL_OFFSET_X (0)
+#define HOLOMAP_PIXEL_OFFSET_Y (0)
+
+#define HOLOMAP_LEGEND_X 96
+#define HOLOMAP_LEGEND_Y 156

code/__defines/items_clothing.dm

@@ -27,13 +27,14 @@
 #define HIDETAIL           BITFLAG(4)
 
 // WARNING: The following flags apply only to the helmets and masks!
-#define HIDEMASK           BITFLAG(0)
-#define HIDEEARS           BITFLAG(1) // Headsets and such.
-#define HIDEEYES           BITFLAG(2) // Glasses.
-#define HIDEFACE           BITFLAG(3) // Dictates whether we appear as "Unknown".
-#define BLOCK_HEAD_HAIR    BITFLAG(4)    // Hides the user's hair overlay, and replace it with short hairs. Leaves facial hair.
-#define BLOCK_FACIAL_HAIR  BITFLAG(5)    // Hides the user's hair, facial and otherwise.
+#define HIDEMASK           BITFLAG(5)
+#define HIDEEARS           BITFLAG(6) // Headsets and such.
+#define HIDEEYES           BITFLAG(7) // Glasses.
+#define HIDEFACE           BITFLAG(8) // Dictates whether we appear as "Unknown".
+#define BLOCK_HEAD_HAIR    BITFLAG(9)    // Hides the user's hair overlay, and replace it with short hairs. Leaves facial hair.
+#define BLOCK_FACIAL_HAIR  BITFLAG(10)    // Hides the user's hair, facial and otherwise.
 #define BLOCK_ALL_HAIR     (BLOCK_HEAD_HAIR | BLOCK_FACIAL_HAIR)
+#define EQUIPMENT_VISIBILITY_FLAGS (HIDEGLOVES|HIDESUITSTORAGE|HIDEJUMPSUIT|HIDESHOES|HIDEMASK|HIDEEYES|HIDEEARS|HIDEFACE)
 
 // Inventory slot strings.
 // since numbers cannot be used as associative list keys.
@@ -176,18 +177,21 @@
 #define HUD_JANITOR  BITFLAG(3)
 
 // Limbs.
-#define BP_L_FOOT       "l_foot"
-#define BP_R_FOOT       "r_foot"
-#define BP_L_LEG        "l_leg"
-#define BP_R_LEG        "r_leg"
-#define BP_L_HAND       "l_hand"
-#define BP_R_HAND       "r_hand"
-#define BP_L_ARM        "l_arm"
-#define BP_R_ARM        "r_arm"
-#define BP_HEAD         "head"
-#define BP_CHEST        "chest"
-#define BP_GROIN        "groin"
-#define BP_TAIL         "tail"
+#define BP_L_FOOT "l_foot"
+#define BP_R_FOOT "r_foot"
+#define BP_L_LEG  "l_leg"
+#define BP_R_LEG  "r_leg"
+#define BP_L_HAND "l_hand"
+#define BP_R_HAND "r_hand"
+#define BP_L_ARM  "l_arm"
+#define BP_R_ARM  "r_arm"
+#define BP_HEAD   "head"
+#define BP_CHEST  "chest"
+#define BP_GROIN  "groin"
+#define BP_TAIL   "tail"
+
+// Other inventory-related slots (also organs).
+#define BP_MOUTH  "mouth"
 
 var/global/list/all_limb_tags = list(BP_CHEST, BP_GROIN, BP_TAIL, BP_HEAD, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
 var/global/list/all_limb_tags_by_depth = list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TAIL, BP_CHEST)
@@ -197,25 +201,26 @@ var/global/list/default_onmob_icons = list(
 	BP_R_HAND =          'icons/mob/onmob/items/righthand.dmi'
 )
 
+// This list should be sorted by display priority/order for mob examine to look nice.
 var/global/list/all_inventory_slots = list(
-	slot_back_str,
 	BP_L_HAND,
 	BP_R_HAND,
+	BP_MOUTH,
 	slot_w_uniform_str,
 	slot_head_str,
 	slot_wear_suit_str,
-	slot_l_ear_str,
-	slot_r_ear_str,
+	slot_s_store_str,
+	slot_back_str,
+	slot_gloves_str,
 	slot_belt_str,
 	slot_shoes_str,
 	slot_wear_mask_str,
-	slot_handcuffed_str,
-	slot_wear_id_str,
-	slot_gloves_str,
 	slot_glasses_str,
-	slot_s_store_str,
+	slot_l_ear_str,
+	slot_r_ear_str,
+	slot_wear_id_str,
+	slot_handcuffed_str,
 	slot_tie_str,
 	slot_l_store_str,
 	slot_r_store_str
 )
-

code/__defines/level_data.dm

@@ -0,0 +1,7 @@
+#define ZLEVEL_STATION BITFLAG(0)
+#define ZLEVEL_ADMIN   BITFLAG(1)
+#define ZLEVEL_CONTACT BITFLAG(2)
+#define ZLEVEL_PLAYER  BITFLAG(3)
+#define ZLEVEL_SEALED  BITFLAG(4)
+#define ZLEVEL_SAVED   BITFLAG(5)
+#define ZLEVEL_MINING  BITFLAG(6)

code/__defines/mapping.dm

@@ -1,3 +1,5 @@
+#define LEVELS_ARE_Z_CONNECTED(ZA, ZB) ((ZA > 0 && ZB > 0 && ZA <= world.maxz && ZB <= world.maxz) && ((ZA == ZB) || ((length(SSmapping.connected_z_cache) >= ZA && SSmapping.connected_z_cache[ZA] && length(SSmapping.connected_z_cache[ZA]) >= ZB) ? SSmapping.connected_z_cache[ZA][ZB] : SSmapping.are_connected_levels(ZA, ZB))))
+
 // Maploader bounds indices
 #define MAP_MINX 1
 #define MAP_MINY 2

code/__defines/misc.dm

@@ -3,6 +3,9 @@
 #define TURF_FLAG_NOJAUNT             BITFLAG(0) // This is used in literally one place, turf.dm, to block ethereal jaunt.
 #define TURF_FLAG_NORUINS             BITFLAG(1) // Used by the ruin generator to skip placing loaded ruins on this turf.
 #define TURF_FLAG_BACKGROUND          BITFLAG(2) // Used by shuttle movement to determine if it should be ignored by turf translation.
+#define TURF_IS_HOLOMAP_OBSTACLE      BITFLAG(3)
+#define TURF_IS_HOLOMAP_PATH          BITFLAG(4)
+#define TURF_IS_HOLOMAP_ROCK          BITFLAG(5)
 
 #define TRANSITIONEDGE 7 // Distance from edge to move to another z-level.
 #define RUIN_MAP_EDGE_PAD 15
@@ -86,6 +89,7 @@
 #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
 
 //Map template flags
 #define TEMPLATE_FLAG_ALLOW_DUPLICATES BITFLAG(0)  // Lets multiple copies of the template to be spawned
@@ -238,9 +242,6 @@
 #define SOULSTONE_EMPTY 0
 #define SOULSTONE_ESSENCE 1
 
-#define INCREMENT_WORLD_Z_SIZE world.maxz++; global.connected_z_cache.Cut(); if (SSzcopy.zlev_maximums.len) { SSzcopy.calculate_zstack_limits() }
-#define ARE_Z_CONNECTED(ZA, ZB) (ZA > 0 && ZB > 0 && ZA <= world.maxz && ZB <= world.maxz && ((ZA == ZB) || ((length(global.connected_z_cache) >= ZA && global.connected_z_cache[ZA] && length(global.connected_z_cache[ZA]) >= ZB) ? global.connected_z_cache[ZA][ZB] : AreConnectedZLevels(ZA, ZB))))
-
 //Request Console Department Types
 #define RC_ASSIST 1		//Request Assistance
 #define RC_SUPPLY 2		//Request Supplies

code/__defines/mobs.dm

@@ -158,7 +158,6 @@
 #define INCAPACITATION_ALL         (~INCAPACITATION_NONE)
 
 // Organs.
-#define BP_MOUTH    "mouth"
 #define BP_EYES     "eyes"
 #define BP_HEART    "heart"
 #define BP_LUNGS    "lungs"