From fa32a3890f005fe07659db3f754fd3b55abcd0b3 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 20 Jun 2024 00:52:36 +0000 Subject: [PATCH 1/2] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-3076.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3099.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3100.yml | 6 ------ html/changelogs/AutoChangeLog-pr-3113.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3122.yml | 5 ----- html/changelogs/AutoChangeLog-pr-3123.yml | 7 ------- html/changelogs/AutoChangeLog-pr-3125.yml | 6 ------ html/changelogs/archive/2024-06.yml | 25 +++++++++++++++++++++++ 8 files changed, 25 insertions(+), 39 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-3076.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3099.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3100.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3113.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3122.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3123.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-3125.yml diff --git a/html/changelogs/AutoChangeLog-pr-3076.yml b/html/changelogs/AutoChangeLog-pr-3076.yml deleted file mode 100644 index 6628d276fc53..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3076.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: FalloutFalcon -changes: - - {admin: reverted filling admin context menus with alot of not useful stuff by - rehiding it behind a toggle.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3099.yml b/html/changelogs/AutoChangeLog-pr-3099.yml deleted file mode 100644 index 47820cfdd00a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3099.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Skies-Of-Blue -changes: - - {balance: you can now float over tables when in 0g} - - {balance: you no longer shatter glass tables when floating} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3100.yml b/html/changelogs/AutoChangeLog-pr-3100.yml deleted file mode 100644 index 80794bddfac2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3100.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Gristlebee -changes: - - {rscadd: 'Energy guns show how much charge and shots they have remaining, or if - it doesnt have a cell installed on examine.'} - - {code_imp: span classes to span macros for energy.dm} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3113.yml b/html/changelogs/AutoChangeLog-pr-3113.yml deleted file mode 100644 index dd5763da3a94..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3113.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: SomeguyManperson -changes: - - {balance: 9mm boxes are now cheaper than other pistol calibers to account for - the lower damage per bullet} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3122.yml b/html/changelogs/AutoChangeLog-pr-3122.yml deleted file mode 100644 index 42787b75bb15..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3122.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Sadhorizon -changes: - - {tweak: "SRM cabinets - namely, Hunter's, Shadow's and Flamebearer's - now use - cabinet sounds."} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3123.yml b/html/changelogs/AutoChangeLog-pr-3123.yml deleted file mode 100644 index 04efb41c07fe..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3123.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: generalthrax -changes: - - {bugfix: 'The black market sawed off Illestren is now actually sawed off, and - can fit on your belt'} - - {bugfix: The presawn double barrel shotgun can now fit on the belt like normal - sawn off double barrels} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3125.yml b/html/changelogs/AutoChangeLog-pr-3125.yml deleted file mode 100644 index d345bf321ecc..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3125.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: generalthrax -changes: - - {rscdel: Removed invisible limb armour from Gezenan marine + navywear} - - {rscadd: Allowed Gezenan armour to hold all guns like normal armour} - - {bugfix: Fixed Montagne hat description to reflect the fact it is no longer armoured} -delete-after: true diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index 0a3fe084958d..5c4640de3f3c 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -266,3 +266,28 @@ - bugfix: mobs will no longer stick around after being butchered sometimes Yata9ar4su: - bugfix: Atmos mask sprite +2024-06-20: + FalloutFalcon: + - admin: reverted filling admin context menus with alot of not useful stuff by rehiding + it behind a toggle. + Gristlebee: + - rscadd: Energy guns show how much charge and shots they have remaining, or if + it doesnt have a cell installed on examine. + - code_imp: span classes to span macros for energy.dm + Sadhorizon: + - tweak: SRM cabinets - namely, Hunter's, Shadow's and Flamebearer's - now use cabinet + sounds. + Skies-Of-Blue: + - balance: you can now float over tables when in 0g + - balance: you no longer shatter glass tables when floating + SomeguyManperson: + - balance: 9mm boxes are now cheaper than other pistol calibers to account for the + lower damage per bullet + generalthrax: + - bugfix: The black market sawed off Illestren is now actually sawed off, and can + fit on your belt + - bugfix: The presawn double barrel shotgun can now fit on the belt like normal + sawn off double barrels + - rscdel: Removed invisible limb armour from Gezenan marine + navywear + - rscadd: Allowed Gezenan armour to hold all guns like normal armour + - bugfix: Fixed Montagne hat description to reflect the fact it is no longer armoured From 5976ffae26662e1e3ade909a3c6696051da09bf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 01:14:40 +0000 Subject: [PATCH 2/2] Bump ws from 7.5.3 to 7.5.10 in /tgui (#3120) Bumps [ws](https://github.com/websockets/ws) from 7.5.3 to 7.5.10.
Release notes

Sourced from ws's releases.

7.5.10

Bug fixes

  • Backported e55e5106 to the 7.x release line (22c28763).

7.5.9

Bug fixes

  • Backported bc8bd34e to the 7.x release line (0435e6e1).

7.5.8

Bug fixes

  • Backported 0fdcc0af to the 7.x release line (2758ed35).
  • Backported d68ba9e1 to the 7.x release line (dc1781bc).

7.5.7

Bug fixes

  • Backported 6946f5fe to the 7.x release line (1f72e2e1).

7.5.6

Bug fixes

  • Backported b8186dd1 to the 7.x release line (73dec34b).
  • Backported ed2b8039 to the 7.x release line (22a26afb).

7.5.5

Bug fixes

  • Backported ec9377ca to the 7.x release line (0e274acd).

7.5.4

Bug fixes

  • Backported 6a72da3e to the 7.x release line (76087fbf).
  • Backported 869c9892 to the 7.x release line (27997933).
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ws&package-manager=npm_and_yarn&previous-version=7.5.3&new-version=7.5.10)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/shiptest-ss13/Shiptest/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tgui/packages/tgui-dev-server/package.json | 2 +- tgui/yarn.lock | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 56951b14846f..a026558a47a1 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -8,6 +8,6 @@ "glob": "^7.1.7", "source-map": "^0.7.3", "stacktrace-parser": "^0.1.10", - "ws": "^7.5.3" + "ws": "^7.5.10" } } diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 17de1b885e24..faa07b26931d 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -8583,7 +8583,7 @@ resolve@^2.0.0-next.3: glob: ^7.1.7 source-map: ^0.7.3 stacktrace-parser: ^0.1.10 - ws: ^7.5.3 + ws: ^7.5.10 languageName: unknown linkType: soft @@ -9432,7 +9432,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.3": +"ws@npm:^7.3.1, ws@npm:^7.4.6": version: 7.5.3 resolution: "ws@npm:7.5.3" peerDependencies: @@ -9447,6 +9447,21 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"ws@npm:^7.5.10": + version: 7.5.10 + resolution: "ws@npm:7.5.10" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: f9bb062abf54cc8f02d94ca86dcd349c3945d63851f5d07a3a61c2fcb755b15a88e943a63cf580cbdb5b74436d67ef6b67f745b8f7c0814e411379138e1863cb + languageName: node + linkType: hard + "xml-name-validator@npm:^3.0.0": version: 3.0.0 resolution: "xml-name-validator@npm:3.0.0"