From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Mon, 27 Oct 2025 20:38:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/stable'
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=acdd62ec5705e6d497e7e8ed8520b6745662af88;p=space-station-14.git

Merge remote-tracking branch 'upstream/stable'
---

acdd62ec5705e6d497e7e8ed8520b6745662af88
diff --cc Resources/Changelog/Changelog.yml
index 1ad11639c7,720de38957..3b37199314
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@@ -3819,110 -3919,10 +3819,117 @@@
    id: 9149
    time: '2025-10-23T15:27:38.0000000+00:00'
    url: https://github.com/space-wizards/space-station-14/pull/40318
 +- author: Silverfur-underscore
 +  changes:
 +  - message: The Mime Job Lizard plushie no longer breaks its vow when being thrown
 +      against something or eaten.
 +    type: Fix
 +  id: 9150
 +  time: '2025-10-24T00:02:31.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41063
 +- author: MDuch369
 +  changes:
 +  - message: Added guidebook entry for gas recycler.
 +    type: Add
 +  - message: Gas recycler can now be rotated.
 +    type: Fix
 +  id: 9151
 +  time: '2025-10-24T01:07:47.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/39212
 +- author: Princess_Chzblz, AdmiralObvious, hyphenation, Is-A-Slark, beck
 +  changes:
 +  - message: PAIs will no longer get uplinks instead of traitors when a player is
 +      selected as an traitor and holding a pAI
 +    type: Fix
 +  id: 9152
 +  time: '2025-10-24T05:58:49.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41069
 +- author: slarticodefast
 +  changes:
 +  - message: Fixed being able to wield two-handed weapons when having only one hand.
 +    type: Fix
 +  id: 9153
 +  time: '2025-10-24T07:36:29.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/40966
 +- author: TheGrimbeeper
 +  changes:
 +  - message: Fix artifact radiation trigger not being triggered by ambient radiation.
 +    type: Fix
 +  id: 9154
 +  time: '2025-10-24T09:21:26.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41065
 +- author: PicklOH
 +  changes:
 +  - message: Space Dragon and Carp are more heat resistant. Carp no longer take fire
 +      damage.
 +    type: Tweak
 +  id: 9155
 +  time: '2025-10-24T19:26:43.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/40820
 +- author: Centronias
 +  changes:
 +  - message: Solution reactions which create items scale their resulting products
 +      with the reactants, instead of eating extra reactants.
 +    type: Fix
 +  id: 9156
 +  time: '2025-10-25T00:29:28.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41091
 +- author: Princess-Cheeseballs
 +  changes:
 +  - message: Eating stacks of items no longer consumes the whole stack in one bite.
 +    type: Fix
 +  id: 9157
 +  time: '2025-10-26T01:09:43.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41092
 +- author: TheGrimbeeper
 +  changes:
 +  - message: Artifact instantly teleporting themselves fixed.
 +    type: Fix
 +  id: 9158
 +  time: '2025-10-26T10:36:06.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41049
 +- author: psykana
 +  changes:
 +  - message: Toggle internals now uses jetpack only if there's no proper gas tank
 +      equipped
 +    type: Tweak
 +  id: 9159
 +  time: '2025-10-26T15:48:07.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/35068
 +- author: Huaqas
 +  changes:
 +  - message: Added a bottle of crazy space lube to the toy box!
 +    type: Add
 +  id: 9160
 +  time: '2025-10-26T18:37:26.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/36292
 +- author: ThatGuyUSA
 +  changes:
 +  - message: .50 uranium pellets use their intended sprite.
 +    type: Fix
 +  id: 9161
 +  time: '2025-10-26T18:50:01.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41068
 +- author: ArtisticRoomba
 +  changes:
 +  - message: Examine text for whether an object is currently taking Delta-Pressure
 +      damage is predicted, so you no longer have to wait for it to pop into place,
 +      it just shows up instantly.
 +    type: Tweak
 +  id: 9162
 +  time: '2025-10-27T11:12:17.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41135
 +- author: lzk228
 +  changes:
 +  - message: Water cup spills when worn
 +    type: Tweak
 +  id: 9163
 +  time: '2025-10-27T18:56:16.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/41148
+ - author: Princess-Cheeseballs
+   changes:
+   - message: Wizard is now only a midround spawn.
+     type: Tweak
 -  id: 9150
++  id: 9164
+   time: '2025-10-23T15:29:38.0000000+00:00'
+   url: https://github.com/space-wizards/space-station-14/pull/40983