Skip to content

Upstream 2026-01-25-0301Z#40

Merged
blinkdog merged 54 commits intomainfrom
upstream-202601250301Z
Jan 25, 2026
Merged

Upstream 2026-01-25-0301Z#40
blinkdog merged 54 commits intomainfrom
upstream-202601250301Z

Conversation

@blinkdog
Copy link
Contributor

Update from Shiptest on 2026-01-25-0301Z.

actions-user and others added 30 commits January 11, 2026 01:26
## About The Pull Request

i need to just unit test / set warns for this stuff

## Changelog

:cl:
fix: stomach works again
/:cl:
## About The Pull Request
Accidentally regressed a few reagent transfer arguments making inhalers
turn you into a balloon filled with salbutamol
ports tgstation/tgstation#69035 while I'm in the
files

## Changelog

:cl: Ingorer, Erika
fix: Inhaler reagent administration being extremely weird.
fix: fixed taste layering
code: changed exposing reagents
/:cl:
## Why It's Good For The Game

Initially I was going to increase the base damage of .45-70 but I think
the simpler solution is just adding the hollow point package for open
use since both .45-70 guns are extremely unwieldy and it'd unlikely be a
guaranteed one-two on carbons because of the limb hit chance

## Changelog

:cl:
add: .45-70 hollowpoint added to cargo
/:cl:
## About The Pull Request

by removing it

## Why It's Good For The Game

subshuttle spawner already makes a docking port you dont need double

## Changelog

:cl:
fix: Kali Subshuttle Port is no longer double and works
/:cl:
## Changelog

:cl:
fix: trifuge has a ghost spawner again
/:cl:
## Why It's Good For The Game

I forgot in the other pr

## Changelog

:cl:
balance: Other non-standard meats cut into 4 cutlets as well
/:cl:
Fixes some guns firing twice simultaneously, and makes click code a tiny
bit more sane

Resolves #5582

🆑
fix: Fixed some guns firing twice simultaneously
/🆑
## About The Pull Request
Allows you to spawn turfs not through a build mod, but also through the
game panel.

## Why It's Good For The Game
Missed `;` in code - Game Panel fix create turf
Admins can look up turfs and spawn them again for reasons
- Game Panel: CeladonSS13/Shiptest#2562

## Testing
<details><summary>Screenshot</summary>
<img width="412" height="500" alt="image"
src="https://github.com/user-attachments/assets/6e6b48dc-1071-4cbb-848f-ba96dd6c4ce4"
/>
</details>

## Changelog

:cl:
fix: Game panel create turf list
/:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Makes the deathgasp emote unusable as an intentional emote. It still
triggers after someone dies naturally.

## Why It's Good For The Game

It's pretty immersion breaking to see someone lying on the floor and
deathgasping three times in a row in the slim chance that they can
somehow survive and frag montage their way out of dying

## Changelog

:cl:
del: Removed intentional deathgasps
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
<img width="157" height="478" alt="image"
src="https://github.com/user-attachments/assets/e5fe0e1a-6316-4815-81ed-523202a36aa5"
/>

## Why It's Good For The Game
makes it shorter because it was basically the same as normal thighhigh
before

## Changelog

:cl:
add: digi alt thighhigh adjustment
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Does what it says on the tin, deleting two pixels on the side states so
eyes look normal
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
It looked ugly before
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
fix: Ponytail (Side) 4 now shows the eyes properly.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
## About The Pull Request

<img width="1792" height="1504" alt="image"
src="https://github.com/user-attachments/assets/e0d01207-ec16-41d7-bbbe-236c5a24a168"
/>

<img width="1792" height="1504" alt="image"
src="https://github.com/user-attachments/assets/eec3d4bc-0717-4270-9588-a6d9666f102d"
/>

<img width="1097" height="936" alt="image"
src="https://github.com/user-attachments/assets/878aef15-1af0-49db-a1d9-34732a1df8b7"
/>

Adds the Ramzi Ice Command Post, includes:

-A sizable amount of ammo and engineering equipment
-Some cybernetics and other treats like a limited emag
-Roumain DB, Scout, Cottonmouth, Absolution, Himehabu for guns
-A little over 2000 in cash along with secret documents
-Three Viscerator grenades (warn against ramzi use)
-Tier Four Vein

## Why It's Good For The Game

Wanted another ruin to ice to give them a nice clean five. Think this
would be the second planet along with rock to have a full five modern
ruins. Also wanted to return the ice T4 vein to ice worlds.

## Changelog

:cl:
add: Added a new ruin, Ramzi Command Post, on ice worlds
/:cl:

---------

Signed-off-by: generalthrax <139387950+generalthrax@users.noreply.github.com>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<img width="1760" height="2240" alt="image"
src="https://github.com/user-attachments/assets/6df28f26-45db-4b16-b394-9bfef379b722"
/>
<img width="1760" height="2240" alt="image"
src="https://github.com/user-attachments/assets/6df28f26-45db-4b16-b394-9bfef379b722"
/>

## Why It's Good For The Game

Remaps cavecrew. Adds a bit more threat, some salvage, and keeps most of
the original ruin loot the same. Mostly removes the metagame entrance
that I never liked. Featuring: more vicious enemy placement, higher
threat, some more versatile rewards, and some basic map hazards.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

Gives an old ruin some love while keeping it's essential concept.

## Changelog

:cl:
add: Added new things
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
## Why It's Good For The Game

forgot

## Changelog

:cl:
fix: Haboob now has correct headsets for officer
/:cl:
actions-user and others added 24 commits January 18, 2026 00:04
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## Why It's Good For The Game
this probably wont ever come into play but in the event it does prevents
some stupid things from happening
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: flea now has pirate headset instead of syndicate one
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
## Why It's Good For The Game

this probably wont ever come into play but in the event it does prevents
some stupid things from happening

## Changelog

:cl:
fix: roach now has pirate headsets instead of syndicate ones
/:cl:
## About The Pull Request
Fixes code missed in PR #5628 where non-CTF guns were incorrectly being
deleted.

## Why It's Good For The Game
Fix CTF guns code missed `/cm82/ctf/` code.
Prevents non-CTF guns from being improperly deleted when thrown or drop.

## Changelog

:cl:
fix: Non-CTF CM-82 guns no longer get deleted when thrown or drop
/:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Shield bash now works for anything classified as a melee weapon
Batons aren't real and cannot hurt you. This sword, however...

## Why It's Good For The Game

half life 1 crowbar sound effect

## Changelog

:cl:
add: bashing your shield is no longer restricted to batons and now works
for all melee weapons
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
tgstation/tgstation#89777
## Changelog

:cl: hry-gh
fix: the admin music player works again on 516
/:cl:
resolves #5828 
## Changelog

:cl:
fix: T4 drill missions will now progress properly
fix: T4 drills now have a sound associated with their mining.
fix: drills will now properly unanchor themselves from veins they
destroy.
/:cl:
## About The Pull Request

ports
tgstation/tgstation#77219
tgstation/tgstation#89320 (partially)
tgstation/tgstation#76376
tgstation/tgstation#75892
tgstation/tgstation#90587
tgstation/tgstation#82735
tgstation/tgstation#93038

## Why It's Good For The Game
<img width="490" height="266" alt="BqGA08LDYh"
src="https://github.com/user-attachments/assets/14c4b3c5-1ede-4941-95a5-afad588bd173"
/>



## Changelog

:cl: Smartkar, Ghommie, Melbert, Jacqurel, Rhials,  Erika (Porting Fox)
code: Updated some status effect tick code to be more clear of how long
is elapsing between ticks. Some effects that were inadvertently weakened
are now stronger as a result (fire and some heretic effects).
fix: Fixed grab offsets not showing for anything but passive grab
refactor: Refactored pixel offsets of mobs. Report any oddities
refactor: Replaced hardcoded "safeties" for lava, chasms and ignoring
turf slowdowns on catwalks with traits.
balance: much like catwalks, tables and conveyors also disable turf
slowdowns.
balance: slippery turfs won't slip you when walking on a table.
fix: pixel offsets from grabbing other mobs now respect the body offset
variables.
refactor: Changed some code so that resized mobs no longer look like
they're poking over the below tile with their legs or not even reaching
the bottom edge of the tile they're on.
add: deep water swimming w/ immersive drowning 
image: walking on water will now immerse you in it... visually, at
least.

/:cl:
So in #5502 I forgot phorids exist and made plasma an irritating gas

## Changelog

:cl:
fix: Fixed phorids dying for no reason
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Remaps the Dwayne-class Long Range Mining Transport.
<img width="1184" height="608" alt="image"
src="https://github.com/user-attachments/assets/c9fb88bb-ed4c-4f36-9bef-7c607738d605"
/>
<img width="1184" height="608" alt="image"
src="https://github.com/user-attachments/assets/7b7a8b35-eb6c-489b-b832-ee58a8c3622b"
/>
<img width="1184" height="608" alt="image"
src="https://github.com/user-attachments/assets/f25d3862-dcea-43a6-9888-9bc0966aecdb"
/>

The armory is shifting from a bajillion flaming arrows to a Volt
carbine, Conflagration shotgun, Ohm pistol, and a Candor.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Simultaneously brings the Dwayne in line with other NT vessels while
making it enjoyable to play on.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: remaps the Dwayne
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
@blinkdog blinkdog self-assigned this Jan 25, 2026
@blinkdog blinkdog merged commit 0f587b9 into main Jan 25, 2026
35 checks passed
@blinkdog blinkdog deleted the upstream-202601250301Z branch January 25, 2026 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Comments