Merge remote-tracking branch 'upstream/dev-sierra' into vox-cultures

.github/workflows/changelog_generation.yml

@@ -16,13 +16,13 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           fetch-depth: 0 # Otherwise, we will fail to push refs
           ref: dev-sierra
           token: ${{ secrets.BOT_TOKEN }}
       - name: Python setup
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/check_changelog.yml

@@ -19,7 +19,7 @@ jobs:
           wget https://raw.githubusercontent.com/SierraBay/SierraBay12/dev-sierra/tools/changelog/sierra_check_changelog.py
           wget https://raw.githubusercontent.com/SierraBay/SierraBay12/dev-sierra/tools/changelog/tags.yml
       - name: Установка Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
         with:
           python-version: '3.x'
       - name: Установка зависимостей

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/deploy.yml

@@ -0,0 +1,43 @@
+name: Deploy
+
+concurrency:
+  group: deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      # ci_required:
+      #   description: 'CI Suite is required'
+      #   type: boolean
+      #   required: true
+      #   default: true
+      perform_deploy_sierra:
+        description: 'Deploy SierraBay'
+        type: boolean
+        required: true
+        default: true
+
+jobs:
+  # CI:
+  #   uses: ./.github/workflows/ci.yml  # use the callable tests job to run tests
+  #   if: ${{ inputs.ci_required }}
+
+  deploy-sierra:
+    name: Deploy SierraBay
+    runs-on: ubuntu-latest
+    # needs: [CI]
+    if: always() && !cancelled() && !failure() && inputs.perform_deploy_sierra
+
+    steps:
+    - name: Update and Build SierraBay
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.PRODUCTION_HOST }}
+        username: ${{ secrets.PRODUCTION_USERNAME }}
+        key: ${{ secrets.PRODUCTION_SSH_KEY }}
+        passphrase: ${{ secrets.PRODUCTION_SSH_KEY_PASS }}
+        script: |
+          TIME=$(date +'%Y-%m-%d%T')
+          sudo systemctl --wait start deploy-sierrabay
+          journalctl --since $TIME -u deploy-sierrabay --no-pager --all
+          systemctl is-failed deploy-sierrabay | grep -q "failed" && echo "Deployment Failed!" && exit 1 || exit 0

.github/workflows/generate_documentation.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: paths-filter
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
@@ -37,9 +37,9 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: Setup Cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -49,7 +49,7 @@ jobs:
         run: |
           ~/dmdoc
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e
+        uses: JamesIves/github-pages-deploy-action@5c6e9e9f3672ce8fd37b9856193d2a537941e66c
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

.github/workflows/make_changelogs.yml

@@ -16,11 +16,11 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           fetch-depth: 25
       - name: Python setup
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: paths-filter
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
@@ -32,9 +32,9 @@ jobs:
     needs: PreFlight
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: Setup Cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -60,9 +60,9 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: Setup Cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -90,16 +90,16 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: Setup Cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -128,16 +128,16 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: Setup Cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -166,16 +166,16 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       - name: Setup Cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"

baystation12.dme

@@ -269,6 +269,7 @@
 #include "code\datums\browser.dm"
 #include "code\datums\callbacks.dm"
 #include "code\datums\category.dm"
+#include "code\datums\chat_message.dm"
 #include "code\datums\cinematic.dm"
 #include "code\datums\datum.dm"
 #include "code\datums\footsteps.dm"
@@ -1686,6 +1687,7 @@
 #include "code\modules\clothing\under\accessories\fire_overpants.dm"
 #include "code\modules\clothing\under\accessories\flannel_shirt.dm"
 #include "code\modules\clothing\under\accessories\ftu_pin.dm"
+#include "code\modules\clothing\under\accessories\goggle_mods.dm"
 #include "code\modules\clothing\under\accessories\hawaii.dm"
 #include "code\modules\clothing\under\accessories\helmcover.dm"
 #include "code\modules\clothing\under\accessories\helmet_decor.dm"
@@ -2320,6 +2322,7 @@
 #include "code\modules\mob\living\silicon\robot\modules\module_uncertified.dm"
 #include "code\modules\mob\living\simple_animal\combat.dm"
 #include "code\modules\mob\living\simple_animal\defense.dm"
+#include "code\modules\mob\living\simple_animal\kamerr.dm"
 #include "code\modules\mob\living\simple_animal\life.dm"
 #include "code\modules\mob\living\simple_animal\natural_weapons.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
@@ -2945,7 +2948,6 @@
 #include "code\modules\reagents\reagent_containers\food\snacks.dm"
 #include "code\modules\reagents\reagent_containers\food\sushi.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle.dm"
-#include "code\modules\reagents\reagent_containers\food\drinks\jar.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\bugmeat.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\cheese.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\donkpocket.dm"
@@ -3367,6 +3369,7 @@
 #include "mods\_master_files\code\modules\power\gravitygenerator.dm"
 #include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm"
 #include "mods\_master_files\code\modules\species\station\adherent.dm"
+#include "mods\_master_files\code\modules\species\station\machine.dm"
 #include "mods\_master_files\maps\mapsystem\maps.dm"
 #include "mods\_master_files\maps\sierra\sierra_ranks.dm"
 #include "mods\_master_files\maps\sierra\items\rigs.dm"

code/__defines/__renderer.dm

@@ -161,6 +161,8 @@
 	#define HUD_ABOVE_ITEM_LAYER         4
 	#define HUD_ABOVE_HUD_LAYER          5
 
+#define RUNECHAT_PLANE               7
+
 /// This plane masks out lighting, to create an "emissive" effect for e.g glowing screens in otherwise dark areas.
 #define EMISSIVE_PLANE 10
 #define EMISSIVE_TARGET "*emissive"

code/__defines/_renderer.dm

@@ -220,6 +220,10 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 	group = RENDER_GROUP_SCREEN
 	plane = HUD_PLANE
 
+/atom/movable/renderer/runechat
+	name = "Runechat"
+	group = RENDER_GROUP_SCREEN
+	plane = RUNECHAT_PLANE
 
 /* *
 * Group renderers

code/__defines/byond_tracy.dm

@@ -27,5 +27,5 @@
 		if(UNIX) lib = "libprof.so"
 		else CRASH("Tracy initialization failed: unsupported platform or DLL not found.")
 
-	var/init = call_ext(lib, "init")()
+	var/init = CALL_EXT(lib, "init")()
 	if("0" != init) CRASH("[lib] init error: [init]")

code/__defines/culture.dm

@@ -40,7 +40,8 @@
 #define HOME_SYSTEM_MARS       "Mars"
 #define HOME_SYSTEM_VENUS      "Venus"
 #define HOME_SYSTEM_CERES      "Ceres"
-#define HOME_SYSTEM_PLUTO      "Pluto"
+#define HOME_SYSTEM_KUIPERB      "Kuiper, Belt"
+#define HOME_SYSTEM_KUIPERD    "Kuiper, Interdust"
 #define HOME_SYSTEM_TAU_CETI   "Ceti Epsilon"
 #define HOME_SYSTEM_HELIOS	   "Eos"
 #define HOME_SYSTEM_TERRA 	   "Terra"
@@ -67,7 +68,9 @@
 #define CULTURE_HUMAN_VENUSIAN "Venusian, Zoner"
 #define CULTURE_HUMAN_VENUSLOW "Venusian, Surfacer"
 #define CULTURE_HUMAN_BELTER   "Belter, Ceres"
-#define CULTURE_HUMAN_PLUTO    "Plutonian"
+#define CULTURE_HUMAN_KUIPERI  "Kuiper, Insider"
+#define CULTURE_HUMAN_KUIPERO  "Kuiper, Outsider"
+#define CULTURE_HUMAN_MAGNITKA "Magnitkan"
 #define CULTURE_HUMAN_EARTH    "Earther"
 #define CULTURE_HUMAN_CETIN    "Cetite, Northern"
 #define CULTURE_HUMAN_CETIS    "Cetite, Southern"
@@ -83,8 +86,8 @@
 #define CULTURE_HUMAN_SPACER   "Spacer"
 #define CULTURE_HUMAN_OFFWORLD "Offworlder"
 #define CULTURE_HUMAN_SOLCOL   "Solar-Colonial"
-#define CULTURE_HUMAN_CONFEDC  "Terran, Core Systems"
-#define CULTURE_HUMAN_CONFEDO  "Terran, Outer Systems"
+#define CULTURE_HUMAN_CONFEDC  "Confederate, Core Systems"
+#define CULTURE_HUMAN_CONFEDO  "Confederate, Outer Systems"
 #define CULTURE_HUMAN_GAIAN    "Gaian"
 #define CULTURE_HUMAN_OTHER    "Other, Humanity"
 #define CULTURE_STARLIGHT      "Starlit Realms"

code/__defines/flags.dm

@@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define ATOM_AWAITING_OVERLAY_UPDATE     FLAG(10)
 
 #define MOVABLE_FLAG_PROXMOVE       FLAG(0)  // Does this object require proximity checking in Enter()?
-#define MOVABLE_FLAG_Z_INTERACT     FLAG(1)  // Should attackby and attack_hand be relayed through ladders and open spaces?
+#define MOVABLE_FLAG_Z_INTERACT     FLAG(1)  // Should use_tool and attack_hand be relayed through ladders and open spaces?
 #define MOVABLE_FLAG_EFFECTMOVE     FLAG(2)  // Is this an effect that should move?
 
 #define OBJ_FLAG_ANCHORABLE     FLAG(0)  // This object can be stuck in place with a tool
@@ -81,3 +81,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define OVERMAP_SECTOR_IN_SPACE     FLAG(2)
 /// If the sector is untargetable by missiles.
 #define OVERMAP_SECTOR_UNTARGETABLE FLAG(3)
+
+
+/// For mob/living/ignore_hazard_flags. When set, shards do not damage the mob.
+var/global/const/HAZARD_FLAG_SHARD = FLAG(0)

code/__defines/guns.dm

@@ -3,6 +3,7 @@
 #define CALIBER_PISTOL_MAGNUM 	"15mm"
 #define CALIBER_PISTOL_FLECHETTE "4mm"
 #define CALIBER_PISTOL_ANTIQUE	"~10mm"
+#define CALIBER_PISTOL_FAST	 "5.7mmP"
 
 #define CALIBER_RIFLE			"5mmR"
 #define CALIBER_RIFLE_MILITARY  "7mmR"

code/__defines/items_clothing.dm

@@ -35,7 +35,9 @@
 #define ACCESSORY_SLOT_ARMOR_M  "Misc armor"
 #define ACCESSORY_SLOT_HELM_C	"Helmet cover"
 #define ACCESSORY_SLOT_HELM_D   "Helmet decor"
-
+#define ACCESSORY_SLOT_VISOR    "Helmet visor"
+#define ACCESSORY_SLOT_VISION   "Vision modification"
+#define ACCESSORY_SLOT_HUD      "HUD modification"
 
 #define ACCESSORY_REMOVABLE FLAG(0)
 #define ACCESSORY_HIDDEN FLAG(1)

code/__defines/lists.dm

@@ -29,7 +29,12 @@
 #define LAZYMERGELIST(L1, L2) if (length(L2)) { if (!L1) { L1 = list() } L1 |= L2 }
 // 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() )
-
+///This is used to add onto lazy assoc list when the value you're adding is a /list/. This one has extra safety over lazyaddassoc because the value could be null (and thus cant be used to += objects)
+#define LAZYADDASSOCLIST(L, K, V) if(!L) { L = list(); } L[K] += list(V);
+// Adds to the item K the value V, if the list is null it will initialize it
+#define LAZYADDASSOC(L, K, V) if(!L) { L = list(); } L[K] += V;
+// Removes the value V from the item K, if the item K is empty will remove it from the list, if the list is empty will set the list to null
+#define LAZYREMOVEASSOC(L, K, V) if(L) { if(L[K]) { L[K] -= V; if(!length(L[K])) L -= K; } if(!length(L)) L = null; }
 
 /****
 * Binary search sorted insert

code/__defines/proc_presets.dm

@@ -1 +1 @@
-#define MERGE_ASSOCS_WITH_NUM_VALUES(a, b) merge_assoc_lists(a, b, /proc/assoc_merge_add, 1)
+#define MERGE_ASSOCS_WITH_NUM_VALUES(a, b) merge_assoc_lists(a, b, GLOBAL_PROC_REF(assoc_merge_add), 1)

code/__defines/~mods/expanded_culture_descriptor.dm

@@ -16,6 +16,7 @@
 #define FACTION_ZPCI            "Zone Protection Control Inc."
 #define FACTION_SEPTENERGO      "SeptEnergo"
 
+#define CULTURE_HUMAN_PLUTO    "Plutonian"
 #define CULTURE_HUMAN_LORRIMAN "Lorrimanian"
 #define CULTURE_HUMAN_AVANOBLE "Avalon Noble"
 #define CULTURE_HUMAN_AVACOMMON "Avalon Commoner"
@@ -24,6 +25,7 @@
 #define CULTURE_HUMAN_MIRANIAN "Miranian"
 #define CULTURE_HUMAN_NYXIAN "Nyxian"
 
+#define HOME_SYSTEM_PLUTO      "Pluto"
 #define HOME_SYSTEM_TERSTEN                 "Tersten"
 #define HOME_SYSTEM_AVALON               	"Avalon"
 #define HOME_SYSTEM_MIRANIA              	"Mirania"