Merge remote-tracking branch 'upstream/master' into Flowers-for-Aegis

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

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"
   }
 }

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"