Skip to content

Upstream#131

Closed
mass-bot[bot] wants to merge 24 commits into
masterfrom
upstream
Closed

Upstream#131
mass-bot[bot] wants to merge 24 commits into
masterfrom
upstream

Conversation

@mass-bot

@mass-bot mass-bot Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

🆑 MassMeta add: Upstream /:cl:

tgstation-ci Bot and others added 24 commits June 2, 2026 00:00
…. Repaths some items. (#96056)

## About The Pull Request

Moves the deep lore proc to the parent for guns. 

Adds deep lore to some of the pistols.

Rewrites the deep lore for the stun baton and contractor baton.

Repaths the Liberator pistol to a more sensible path name.

Rechambers the Regal Condor to .45, because I was today years old when I
learned that the Tiger Cooperative are _[radical Christian
extremists](https://github.com/tgstation/common_core/blob/cf1edb9f770e7d3c38ca894e951ab5ac50395a47/Governments%20and%20Organisations/Corporations/The%20Syndicate/The%20Syndicate.md?plain=1#L73)_.
I just thought they were nutso about changelings, I didn't know they
also think they're God's ubermensch. Anyway, that freak who started the
cult would chamber their relic pistol in .45 and you know it.

## Why It's Good For The Game

I love dumping large amounts of text into the code base that will
rarely, if ever, be noticed by the player. It's also the means by which
I can summon forth my good friend Hatterhat to contribute to this
codebase. Like a carrot on a stick.

If I post enough, one day he'll PR flashforge mines like he promised me.
… of recovery (#96300)

## About The Pull Request

i thought this was some sort of strange balance change at first but no
it's definitely not intended, this crafting recipe is supposed to
basically just be a reskin ability to turn a normal jaws of life into a
jaws of recovery. you're not supposed to be able to roundstart shrink
the jaws of recovery down to normal size and make them silent and let
you break into the pharmacy through the windoors

## Why It's Good For The Game

its kinda cringe man
…96258)

## About The Pull Request

Changes hard density and flexibility requirements to be flag checks for
valid item crafting flags for armor, and non-amorphous materials for
everything else (so basically anything but snow and raw sand (not
sandstone))

## Why It's Good For The Game

The restriction was mostly futureproofing and doesn't do much currently,
I don't see this adding much, this just ended up removing some content
like meat toolboxes/armor on accident. (this was intended to block
snow/paper/sand from being made into material items, but after thinking
a bit paper material stuff does make some sense)

## Changelog
:cl:
balance: You can make toolboxes out of meat and paper again
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants