From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 18 Jan 2026 21:37:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/stable' into stable-merge-2026-01-17-2
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ff9798a0ca73f2fc4486e3b8ecbc6e8212ae5c36;p=space-station-14.git

Merge remote-tracking branch 'upstream/stable' into stable-merge-2026-01-17-2
---

ff9798a0ca73f2fc4486e3b8ecbc6e8212ae5c36
diff --cc Resources/Changelog/Changelog.yml
index 46ef611980,8e705abcb3..8efcbd56cf
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@@ -3830,93 -3881,3 +3814,84 @@@
    id: 9407
    time: '2026-01-15T20:01:06.0000000+00:00'
    url: https://github.com/space-wizards/space-station-14/pull/42040
- - author: Velken
-   changes:
-   - message: RCD can no longer spam lights in the same spot.
-     type: Fix
-   - message: RCD can no longer be used to destroy indestructible tiles.
-     type: Fix
-   id: 9408
-   time: '2026-01-15T20:39:02.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/42432
 +- author: B_Kirill
 +  changes:
 +  - message: Added camera map. Cutting MAP wire hides camera from map while keeping
 +      it accessible in camera list.
 +    type: Add
 +  id: 9409
 +  time: '2026-01-15T21:37:19.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/39684
 +- author: ScarKy0
 +  changes:
 +  - message: Added Makeshift and Regular Mortar&Pestle! It can be found in the nutrimax
 +      and dinnerware vendors or crafted. It works slower and can only process 1 item
 +      at a time.
 +    type: Add
 +  - message: Added Makeshift and Regular Handheld Juicer! It can be found in the nutrimax
 +      and dinnerware vendors or crafted. It works slower and can only process 1 item
 +      at a time.
 +    type: Add
 +  id: 9410
 +  time: '2026-01-16T00:35:32.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42019
 +- author: EmoGarbage404
 +  changes:
 +  - message: Fixed flatpackers ignoring material costs for certain machine board requirements
 +      and being able to print unlatheable items for flatpacks.
 +    type: Fix
 +  id: 9411
 +  time: '2026-01-16T00:52:35.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42445
 +- author: sowelipililimute
 +  changes:
 +  - message: Using a core pinpointer piece on another piece no longer causes you to
 +      start an unintended construction recipe.
 +    type: Fix
 +  id: 9412
 +  time: '2026-01-16T02:09:01.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42446
 +- author: neomoth
 +  changes:
 +  - message: Fix zombie resistance, instead of making you more likely to be infected,
 +      it now properly makes you less likely to be infected.
 +    type: Fix
 +  id: 9413
 +  time: '2026-01-16T08:40:47.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42451
 +- author: Samuka
 +  changes:
 +  - message: The mothership now starts with more materials so there is less need to
 +      salvage for them.
 +    type: Tweak
 +  - message: Xenoborgs guidebook entry got updated in regards to preparation and tactics.
 +    type: Tweak
 +  id: 9414
 +  time: '2026-01-16T17:19:48.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42448
 +- author: Kowlin
 +  changes:
 +  - message: All intern jobs now lock out after 10 hours, up from 5 hours.
 +    type: Tweak
 +  - message: Security Officer now requires 4 hours of Security Cadet, up from 2.5
 +      hours.
 +    type: Tweak
 +  - message: Head of Security now requires 3 hours of Warden, up from 1 hour.
 +    type: Tweak
 +  id: 9415
 +  time: '2026-01-17T20:24:42.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42372
 +- author: sowelipililimute
 +  changes:
 +  - message: Vox can eat trash again.
 +    type: Fix
 +  id: 9416
 +  time: '2026-01-18T20:44:50.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42503
 +- author: sowelipililimute
 +  changes:
 +  - message: Gibbing now drops your inventory contents again.
 +    type: Fix
 +  id: 9417
 +  time: '2026-01-18T21:25:27.0000000+00:00'
 +  url: https://github.com/space-wizards/space-station-14/pull/42504