16221 Commits
Author SHA1 Message Date
SimplyLoganandGitHub ad64c8d077 Fixes using syndie graffiti spray/crayon writing while zero grav drifting (#92742)
## About The Pull Request

Fixes #92583

Does a check at the end of the spraying to see if player is still
adjacent to the item, specifically to deal with low gravity.
Also discovered Crayons have this issue too so fixed that

| During Gravity Drift| Check Failed | After Gravity Drift |
|--------|--------|--------|
| <img width="429" height="515" alt="image"
src="https://github.com/user-attachments/assets/5ed4216c-e656-4601-ac1e-86d177305483"
/> | <img width="260" height="137" alt="image"
src="https://github.com/user-attachments/assets/06e2bba2-848b-418e-910c-661b891951ad"
/>| <img width="436" height="523" alt="image"
src="https://github.com/user-attachments/assets/338baf15-1658-402c-b4fd-eacf278d8be7"
/> |
## Why It's Good For The Game

- Quick fix to an issue
- No performance overhead as as check only happens after finish
spraying/drawing
2025-09-08 12:16:01 -05:00
fadbf16e1b Asthma quirk, inhalers - Electric Boogaloo (#92747)
## About The Pull Request

Revival of https://github.com/tgstation/tgstation/pull/79691

A while back, I made this PR, but lost motivation after diving too deep
into the code soup of can_breathe and related procs. Now, I have removed
those parts, and have simplified that part of the code to the point I
think it's ready for review.

Many reviews from the previous PR have been addressed in this PR.

<hr>

<details>
  <summary>Details</summary>
  
Asthma is a 4 point negative quirk that emulates real life asthma. It
works by slowly decreasing the amount of pressure each breath you take
receives, until your lungs completely seal, ensuring death if you dont
get oxyloss meds/windpipe surgery.

Inflammation (the tracker for intensity) increases whenever you breathe
smoke, use a cigarette, metabolize histimine, or suffer an asthma
attack.

Asthma attacks have a low chance of happening every second, starting 10
minutes after you spawn and with a 20-30 grace period between attacks.
They are "diseases" that cant be outright cured by albuterol, only put
into remission. They increase inflammation at varying rates depending on
their severity, with extreme asthma attacks being a immediate threat to
your life while mild ones might not even cause inflammation. The
response to these is always the same - use your inhaler before you start
choking.

Asthmatics start with a rescue inhaler, a low-capacity inhaler loaded
with albuterol, which I will get to later.

Albuterol is a new medicine thats a little tricky to make but still
doable. It can be efficiently created with inverse convermol, or
transmutated from salbutamol and convermol. The opposite is true, with
albuterol able to be turned into salbutamol. Two canisters are available
in chemvends.

Upon use, it increases the virtual pressure of all breaths taken by 40%.
This allows for you to breathe in lower pressure environments, as well
as enhancing the effects of things like healium.

It's OD causes your diaphram to spasm, causing sporadic losebreath and
forced breathing.

Inhalers are a fancy new reagent application apparatus that uses the
INHALE reagent bitflag.

Inhalers themselves are rather unremarkable, they are merely the method
of using inhaler canisters (they also have a rotary display
approximating the uses left in a canister - just like real life
inhalers).

Inhaler canisters are the reagent containers, and are generally low
capacity. They can only be used in a inhaler, and contain aerosolized
chemicals.

Inhaler canisters and inhalers are unlocked from chemical synthesis, and
are printable for cheap from a medlathe.

In order to use a inhaler, one must uncover the mouth of a carbon and
wait a few seconds (its faster if its a self-application) before a small
amount of the reagents are delivered via the INHALE bitflag. This only
works on things currently breathing - if theyre dead, have no lungs, or
just, arent breathing - it will fail. This includes asthmatics with 100%
inflammation.
  
</details>

<img width="181" height="74"
alt="282863233-77a7cd6b-44d2-458e-9966-06d485df1521"
src="https://github.com/user-attachments/assets/293b6659-0834-4e9a-b033-cc3b0cfde18e"
/>

<img width="1465" height="202"
alt="282863346-2a247736-0c3a-43b0-a60b-7cff10ce4963"
src="https://github.com/user-attachments/assets/5d9a13dc-b7b2-4de2-adda-8fbc8276e667"
/>


Sprites are not mine; they are from swanni and I can NOT sprite for the
life of me
## Why It's Good For The Game

1. Asthma is just cool. One of my favorite features on bay was the fact
lung damage required you to turn up the pressure on your O2 tank to
survive, and this does precisely that.
2. Its always fun to add new ways to interact with atmos as a player
that arent grossly broken, and I fail to see how a 40% increase of gas
intake will really affect balance too badly.
3. Inhalers are badass.
## Changelog
🆑
add: Asthma quirk, based on IRL asthma
add: Inhalers, a new reagent administering method that uses INHALE
add: Albuterol, a new reagent that increases the amount of gas you
inhale by 40%
balance: Inverse convermol now forms once the reaction is done, not on
metabolize
/🆑

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2025-09-08 13:31:21 +12:00
Leland KembleandGitHub 6898315e16 Prevents bone from being grilled into steak (#92738)
## About The Pull Request

Removes the ability to grill the mutant/skeleton subtype of meat slabs,
because there's no meat on that bone.

## Why It's Good For The Game

closes #88767
there ain't no meat on that bone

## Changelog
🆑

del: you can't grill a bone into a steak anymore

/🆑
2025-09-07 21:05:32 -04:00
John WillardandGitHub f8186a7db3 Adds a furnace that grants space protection to nearby people (#92342)
## About The Pull Request

##### Code bounty for holinka4ever

Adds a furnace equippable to the back slot, which when active (it is a
lamp), will form a bubble of space protection, affecting the user and
people nearby, and will last 5 minutes before it dissipates and needs to
be re-formed. This item requires a pyroclastic anomaly core to activate,
while the bubble itself can only be formed in pressurized environments.
It's researchable in the Anomaly technology node.

The downsides of the item is it requires 2 hands to hold, can't be
inserted into storage items (as it's bulky), can only be equipped to the
bag slot, and has slowdown while on, which only affects you when you're
in gravity anyways.

## Why It's Good For The Game

The pyro anomaly is currently one of the more useless anomaly cores, not
even getting a unique reactive armour variation. This hopefully gives it
some purpose as a good tool to keep people alive in a spaced area at a
good cost to the user. This is an item that shouldn't be overpowered,
but also isn't just a selfish tool- when someone's crafting this item
it's specifically aiming to help people, which I think is a benefit.

## Changelog

🆑 JohnFulpWillard, sprites by PopLop
add: Added a new pyroclastic anomaly locked item, the Space Furnace.
Grants space immunity to people nearby while active.
/🆑
2025-09-07 21:04:47 -04:00
Xander3359andGitHub b78fefd4d4 Replaces T2 Tools with T1 Versions in CE Toolbelt (#92872)
## About The Pull Request
Removes the T2 tools from CE belt
## Why It's Good For The Game
The T2 tools are bad because:
1. It encourages heads to play their subdepartment’s roles instead of
their own, which is to manage their department, delegate tasks, and
teach newer players.
2. It encourages bad command players to take the role for the gear
instead of leaving it for the people who want it for the command.

This also sets a bad precedent, people always point at the CE for reason
why other heads should get more advanced gear, so this would be a hard
bandaid to rip off but I think it is necessary.
## Changelog
🆑
balance: Downgraded CE tools to T1 instead of T2
/🆑
2025-09-07 20:50:16 -04:00
nevimer 098564aab1 more intense jiggling
more scrimblo code
2025-09-07 13:17:58 -04:00
Leland KembleandGitHub 1c1826659b De-HTMLs manuals, updates chef recipes (#92841)
## About The Pull Request

The manuals' formatting is fucked up, and the chef recipes book was
really out of date. This PR changes the formatting to work better, and
updates the chef recipes to be more correct.

## Why It's Good For The Game

fixes #84168
Good formatting

## Changelog
🆑

spellcheck: Fixes a bunch of manual's formatting, and updates Chef
Recipes

/🆑
2025-09-07 11:28:41 +02:00
Xander3359andGitHub c82a39217a Converts some afterattack to interaction (#92762)
<!-- 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
Converts the following into item interaction:
- porta_turret
- porta_turret_cover
- plating/foam (Foam plating)
- plate
~cup (and mortar subtype)~
- Recharger
<!-- 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
Conversion from afterattack to interaction
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
refactor: change some attack procs to use item interaction
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
2025-09-07 09:30:50 +02:00
nevimer 0e31590d16 make it build 2025-09-07 00:47:34 -04:00
nevimer b348b617a3 Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07
# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
2025-09-07 00:37:52 -04:00
f8511ea227 You can install B.O.R.I.S. in circuits with MMI components (+other MMI component changes) (#92002)
## About The Pull Request

This PR adds the ability to install a B.O.R.I.S. in a circuit that
contains an MMI component. These circuits can then be remotely connected
to by an AI by clicking on them or anything they are inside of. To
indicate that a circuit allows remote AI connection, an indicator is
given to the circuit and anything containing it.

Additionally:
- Refactors the MMI component to use `item_interaction`, since it was
pertinent.
- You cannot insert an MMI/B.O.R.I.S. into a locked circuit.
- You can no longer hotswap MMIs/B.O.R.I.S.es - you must manually eject
the inserted one.

Let me know what changelog labels I should use for the hotswap removal
and the prevention of insertion into locked circuits.

## Why It's Good For The Game

If you can put an MMI or posibrain in a circuit, why not allow an AI to
use it using a B.O.R.I.S.?

## Changelog

🆑
add: B.O.R.I.S.es can be installed inside of integrated circuits with
MMI components, allowing an AI to remotely interface with them the same
way an MMI or posibrain could.
refactor: The MMI component now uses item interaction behavior for
inserting MMIs/B.O.R.I.S.es.
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2025-09-03 23:25:50 -07:00
GhomandGitHub 3ea1eb101e [NO GBP] Fix to burned mess (#92684)
## About The Pull Request
#92394 did more harm than good.

First, only the microwavable element transferred reagents even if the
result was a burned mess (in general, a non-positive one), while
grillable and bakeable comps didn't... but that's because I've
overlooked a few checks that skipped the "transfer reagents to the
result" step, which the microwavable element also has, though it stopped
working as intended after I messed with it.
However, I think it's stupid for bad recipes to have a static amount of
"bad food" reagent in them, and overcooking a whole cake shouldn't yield
the same reagents as a bag of chips burned to a crisp, so I scrapped
those damn bad_result checks, and finally let the burned mess item
itself handle converting the consumable reagents into "bad food".

Second, examining most food items no longer tells you that you can make
a burned mess if you microwave it.

## Why It's Good For The Game
This fixes the above issues.

## Changelog

🆑
fix: Examining most food items no longer tells you that you can make
burned mess by microwaving them.
fix: Burned mess now has "bad food" in it more or less proportional to
the nutrients of the item you just overcooked. This also applies to
decomposition now.
/🆑
2025-09-03 04:39:43 -07:00
mcbalaamandGitHub d40bb5ddd2 H.A.U.L. gauntlets and package wrapper QOL (#92427)
## About The Pull Request

- Wrapping a crate with package wrapping while pulling it will now
automatically make you grab it
- You can now open the crate while dragging it with the H.A.U.L.
gauntlets if you're the one who's pulling it. Also applies to other
items (including MOD modules) that have the component


https://github.com/user-attachments/assets/7b4743c8-855d-4274-89ca-b0507f6d3e0e

## Why It's Good For The Game

QOL for cargo technicians - having to constantly grab and let go of
crates is very annoying
2025-09-02 21:32:47 -05:00
MrMelbertandGitHub d2b92afe55 Plant Analyzer UX Revamp (#92667)
## About The Pull Request

<img width="1300" height="706" alt="image"
src="https://github.com/user-attachments/assets/c7971eab-6af3-4fea-94f5-b76104696b73"
/>

1. Chems are no longer hidden in an icon's tooltip. There is a separate
tab for chems. Right clicking to do a chem scan will pull up the chem
tab, but you can also just use the two buttons at the top - Closes
#91172

2. You no longer need to repeatedly scan a tray to update the UI.
Standing adjacent to a scanned tray will update it regularly.

3. Units have been redefined from pure seconds to minutes/seconds where
applicable.

4. The report has been swapped around, with tray on top and plant on
bottom.

5. The nutrient bar is now colored based on contents of the tray. It no
longer has a tooltip listing the tray's contents, that's now in the
chemicals tab.

6. Auto-grow, pollinating, and yield modifier icons have been brought
center below the tray, instead of in the top right section. They now
change color to make it more apparent at a glance.

7. Traits have been moved from icons to a collapsible list at the bottom
of the UI, and are now printed entirely. They still have tooltips
explaining what they do.

8. Grafted gene was moved center below the plant, and is now printed
entirely.

9. Mutations have been moved to a collapsible list center below the
plant.

10. Plants now indicate if they are dead in the UI.

11. Scanning produce now lists all the chemicals inside it on top of all
the chemicals it produces. - Closes #89443, Closes #90793

12. Restores lost behavior of seed unique data - Closes #90706

Also

13. Added Hydroponics to Runtime station

14. Added screentip for dumping reagents from hydro-trays

## Why It's Good For The Game

While I was initially supportive of the move to a plant analyzer UI it
was undeniable it was a huge UX stepdown from printing results to chat.

This PR aims to bring back some of those lost UX features by making more
information visible at a glance (instead of requiring memorization of
mystery meat icons or hovering over many elements to find information
hidden in tooltips)

I know it's a little bit of a mess with the colors and layout, I planned
on doing a whole custom css and layout and such but I kinda just wanted
to get it out.

## Changelog

🆑 Melbert
qol: Plant analyzer: Scanning a tray will regularly update the UI with
the tray's information while you stand adjacent to it, no longer
requiring you re-scan the tray to update it.
qol: Plant analyzer: UI is now split between chems and stats - RMB will
open directly to the chem tab.
qol: Plant analyzer: UI received several UX changes - listing out more
information at a glance, rather than behind tooltips or icons
fix: Plant analyzer: Chem scanning plants now shows the plant's current
chemical contents once again (on top of their genes)
fix: Plant analyzer: Unique seed data (kudzu mutation, replica pod dna)
is shown again
qol: Added hydroponics to runtime station
qol: Added screentip to hydroponic trays for clearing reagents
/🆑
2025-09-02 18:57:41 -07:00
Leland KembleandGitHub 052844c8ec Remove double (Computer Board) on custom shuttle boards (#92806)
## About The Pull Request

computer boards saying (Computer Board) is done by name_extension on the
base board, and the shuttle boards had a second one in their base name.

## Why It's Good For The Game

Only need one (Computer Board)

## Changelog
🆑
spellcheck: Made shuttle computer boards only say (Computer Board) once
/🆑
2025-09-02 18:56:47 -07:00
ab1136909c Improves the ore silo UI (#92460)
## About The Pull Request

Improves the ore silo UI, continuing
https://github.com/tgstation/tgstation/pull/91142

Before:

<img width="760" height="336" alt="image"
src="https://github.com/user-attachments/assets/06c2f628-ea05-49be-88ed-9947ffc55254"
/>

After:

<img width="626" height="604" alt="image"
src="https://github.com/user-attachments/assets/d6a501be-425f-44ba-b75a-c238e20b06fe"
/>

All sources of silo material withdrawal are now consistent with naming
to get properly color coded, which helps with looking for stuff.

## Why It's Good For The Game

Better UI readability, more consistent logs

## Changelog


🆑
qol: Color coded and consistent material silo logs
/🆑

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
2025-09-02 18:55:12 -07:00
e991857e88 Girlifies His Grace (4) (low-stakes edition) (#92658)
## About The Pull Request

Alternative to 3️⃣(#92591), which has been fatally shot.

Makes it so that His Grace can be turned into Her Grace via a
xenobiology gender-change potion. Her Grace turns the souls of the
consumed into confetti, creating a nice party atmosphere.

Also adds pronoun helpers for /atom/s, as they weren't there before.

## Why It's Good For The Game

I thought this was a good idea
<img width="934" height="153" alt="image"
src="https://github.com/user-attachments/assets/aff7abe0-86b6-47e1-a8e6-2c233544e9aa"
/>

It's a silly little variation, and it's purely voluntary. Couldn't hurt.

## Changelog
🆑
add: His Grace will now drink gender-change potions
/🆑

---------

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2025-09-01 12:50:02 +12:00
64af7e953d Adds back mounted wind turbines (#92516)
## About The Pull Request
Adds portable wind turbines that can be put in your back slot or
anchored to the ground. They accept a cell-powered item and charge it
while you walk, or when space wind passes over them. Can be purchased
for 400 credits or crafted with 3 kitchen knives, plastic, and servos.
Requires a capacitor to charge things, and higher tiers charge faster,
faster walkspeed also charges faster.

<img width="592" height="644" alt="im222age"
src="https://github.com/user-attachments/assets/e9997536-5ee0-4417-a31c-cb58666d4d07"
/>


https://github.com/user-attachments/assets/1cf7fce5-d385-4e3e-be97-fb15e253c308

## Why It's Good For The Game
Sometimes you don't have a cell charger. And you need to charge
something. Now you can charge something by running laps around the
station.
During a blob, rechargers are brought to the front lines to charge
energy guns and such but what if the blob turns off the power? And what
are bar-rp'ers to do? Kill two birds with one stone by having them run
laps instead of sitting around doing nothing.
Also its funny.

## Changelog

🆑
add: Added a portable wind turbine which can charge things when you walk
around
add: Added a signal that procs when an object resists space wind (from
being anchored / pulled)
sound: added woosh.ogg as a low "wooshing" noise
image: added a wind turbine sprite
/🆑

---------

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
2025-08-31 21:13:11 +00:00
Leland KembleandGitHub 69f21ff997 Replaces flamethrower unique hit_reaction handling with the bullet_intercepting component (#92731)
## About The Pull Request

Flamethrower exploding when shot was handled by hit_reaction previously,
and will now use the generic bullet_intercepting component. Also adds
handling for multiple projectile types in the bullet_intercepting
component, as well as a check for whether the object currently can block
bullets. Should have no gameplay changes.

## Why It's Good For The Game

closes #81863 , they said it'd be better consistency
2025-08-29 15:25:26 -05:00
SmArtKarandGitHub aebc419282 Resprites all mineral overlays (from mining scanners) (#92725) 2025-08-27 13:40:56 -04:00
PepsilawnandGitHub 6717ec176a Removes Blood Beam's ability to turn iron sheets into cult metal (#92647)
## About The Pull Request

Blood beam, while supposed to be quite costly can be used after slicing
the throat of a single monkey.
You could then, put as many iron sheets on the floor as you wanted, aim
your blood beam at it (aiming away from the center of the station
recommended) and convert potentially multiple full stacks of it 1:1 into
cult metal.

## Why It's Good For The Game

Cultists already have a dedicated spell for creating cult metal
requiring plasteel instead, which is usually harder to gather in bulk
especially early on. That interaction completely overshadows it. As a
fun fact, it's also older than the change that moved the construct spell
from iron to plasteel so it's likely somebody just forgot.
2025-08-26 16:50:23 -05:00
SimplyLoganandGitHub 336e7f6417 Fix to hide pink sprite when wearing trashbags on suitstore slot (#92710)
## About The Pull Request

Fixes - https://github.com/tgstation/tgstation/issues/92388
## Why It's Good For The Game

- Pink null sprites are bad
- Quick fix
2025-08-26 16:40:03 -05:00
MrMelbertandGitHub 59f8de91dc Adds 5 Bond-tier gadgets to the Spy's reward pool (#92481)
## About The Pull Request

1. Penbang

A flashbang disguised as a pen. Clicking the pen arms the flashbang and
has no other visual or audio tell besides the pen clicking.
The fuse's length is based on the angle the pen cap is twisted. 
Works as a normal pen otherwise.

2. Camera Flash

A camera with a high power flash. 
Clicking on an adjacent target will flash them, ie, as a handheld flash.
Works as a normal camera otherwise - no tell.

3. Dagger Boot

A pair of jackboots with a blade embedded in them.
Makes your kicks sharp, meaning they will cause bleeding.
Looks like normal jackboots otherwise, though has a tell on
double-examine

4. Monster Cube Box

A box containing 5 monster cubes, which spawn into a random monster when
wet.
Monsters include Migos, Carps, Bears, Spiders, Wolves...

5. Spider Bite Scroll

A martial art focused around kicks and grabs. 
- Punches against standing, staggered targets will instead kick them,
applying the bonus accuracy and damage that you'd expect from a kick.
(Also combos with the dagger boots)
- All kicks have a chance to disarm the target's active weapon. Chance
increases per sequential kick.
- Grants you the innate ability to tackle. This form of tackling has a
very high skill modifier, meaning you are very likely to get a positive
outcome (or at least, not fail). You also get up fast from it.
- Your grabs are 20% harder to escape from and deal an additional 10
stam damage on fail.

## Why It's Good For The Game

1, 2, 3: Just some random flavorful items, giving them some more toys to
use to complete bounties.

4: Shenanigans, for people who just wanna do "funny thing" instead of
focusing on big loot.

5: I figured it would fill a fun niche: Spies are commonly depicted as
martial artists, and the only martial arts they can obtain is Krav Maga
(it's not unique to Spies) and Sleeping Carp (it's not unique to Spies).
This gives them their own thing that people may look forward to
acquiring and playing around with.
As for the design of it, I wanted to add something that synergizes with
one of the other other items, so in the field if you notice both of them
pop up you really want to go for both.
The rest of the design I just filled in as vaguely useful and flavorful
tools a spy might want for kidnapping or detaining people: Better grabs,
tackling, and disarms.
Then I just went with the flavor of it being something the Spider Clan
used to teach to their Spies / Ninjas, kinda like an analog to the real
life Ninjutsu. (Maybe we can give it to Space Ninjas as well later...
since it doesn't especially benefit Ninjas in any way.)

## Changelog

🆑 Melbert
add: Adds 5 rewards to the Spy item pool: Penbang, Camera Flash,
Dagger-Boot, Monster Cube Box, and the Spider Bite martial art
/🆑
2025-08-26 10:22:11 +10:00
bda68348a8 lets you put pills in slices of cheese and meats (#92630)
## About The Pull Request

Adds the food storage component to cutlets, cooked and raw, as well as
slices of cheese. This means you can put pills in them.
Also changes pills on accidental consumption, if you like the food they
are stuck into, then you don't even notice that you just ate a pill. Mmm
cheese...
## Why It's Good For The Game

Food storage is a really funny component but only works on very few
foods, like whole wheels of cheese or loaves of bread. Everyone knows
the best way to sneak a pill is to put it in a slice of cheese.
## Changelog
🆑
add: Lets small items be stuck into slices of cheese or lunch meat
balance: Pills in food no longer alert you that you've just swallowed
one if you like the food they were stuck in (yum... cheese...)
/🆑

---------

Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
2025-08-24 14:59:10 -04:00
SmArtKarandGitHub 6419867c56 Fixes metal hydrogen being blocked from all material storages (#92691)
## About The Pull Request

It should be invulnerable to damage, not completely indestructible by
all means
Closes #92540

## Changelog
🆑
fix: Fixed metal hydrogen being blocked from all material storages
/🆑
2025-08-24 19:41:01 +02:00
SmArtKarandGitHub 9e7037c973 Fixes plant analyzer blocking all interactions in the darkness (#92642)
## About The Pull Request

Closes #92637

## Changelog
🆑
fix: Fixed plant analyzer blocking all interactions in the darkness
/🆑
2025-08-21 20:17:32 +02:00
89ac4472f5 Adds the surplus energy sword; the mall katana of the future. (#92544)
## About The Pull Request

<img width="911" height="517" alt="image"
src="https://github.com/user-attachments/assets/631d5254-95a4-42d5-ae07-f58a815a1976"
/>

Adds the surplus energy sword. This is found in the black market with a
reasonable probability of being stocked but at a pretty high cost.

The weapon otherwise functions as an energy sword, but with a
significantly lower amount of damage if you're not hitting someone who
is in a compromised position; such as being prone, staggered, attacked
from behind or incapacitated (like stuns).

After 20 hits, you need to recharge the sword by clicking it with the
right mouse button. After an interaction timer, the weapon recharges to
full. You can do this early if you'd like.

Energy swords default to WEIGHT_CLASS_HUGE while active.

## Why It's Good For The Game

I've seen a few folk complain about a lack of particularly interesting
and potent melee weapons that might be floating around to find and
acquire. It'd also be somewhat funny for an actual traitor to have to
get through a pack of goons wielding shitty knockoffs of their own
energy sword.

This was actually my first ever idea for a PR back when I was first
starting the game but had absolutely no idea as to how to code or
anything. I was hardstuck on this for a long ass time. Now I guess I'm
doing it because I was reminded abotu that fact.

## Changelog
🆑
add: Adds the surplus energy sword; the mall katana of the future. It
cuts like shit, but if you're desperate enough, you could kill someone
with it. Just remember to keep it charged.
balance: Energy swords are huge objects while activated.
/🆑

---------

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2025-08-21 20:08:50 +02:00
nevimer 99be7d565e Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-08-19
# Conflicts:
#	.github/CODEOWNERS
#	.github/CONTRIBUTING.md
#	.github/workflows/auto_changelog.yml
#	.github/workflows/compile_all_maps.yml
#	.github/workflows/compile_changelogs.yml
#	.github/workflows/gbp.yml
#	.github/workflows/gbp_collect.yml
#	.github/workflows/stale.yml
#	README.md
#	SQL/database_changelog.md
#	_maps/_basemap.dm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/wawastation.json
#	code/__DEFINES/combat.dm
#	code/__DEFINES/icon_smoothing.dm
#	code/__DEFINES/inventory.dm
#	code/__DEFINES/mobs.dm
#	code/__DEFINES/subsystems.dm
#	code/__DEFINES/surgery.dm
#	code/__HELPERS/roundend.dm
#	code/_globalvars/bitfields.dm
#	code/_globalvars/lists/mobs.dm
#	code/_globalvars/traits/_traits.dm
#	code/_globalvars/traits/admin_tooling.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/hud/human.dm
#	code/_onclick/hud/screen_objects.dm
#	code/controllers/subsystem/processing/quirks.dm
#	code/controllers/subsystem/sprite_accessories.dm
#	code/controllers/subsystem/statpanel.dm
#	code/controllers/subsystem/ticker.dm
#	code/datums/brain_damage/creepy_trauma.dm
#	code/datums/browser.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/components/echolocation.dm
#	code/datums/components/leanable.dm
#	code/datums/dna/blocks/dna_features_block.dm
#	code/datums/dna/dna.dm
#	code/datums/emotes.dm
#	code/datums/map_config.dm
#	code/datums/mutations/_mutations.dm
#	code/datums/mutations/chameleon.dm
#	code/datums/quirks/negative_quirks/allergic.dm
#	code/datums/records/manifest.dm
#	code/datums/ruins/icemoon.dm
#	code/datums/station_traits/_station_trait.dm
#	code/datums/station_traits/job_traits.dm
#	code/datums/station_traits/neutral_traits.dm
#	code/datums/status_effects/debuffs/dna_transformation.dm
#	code/datums/storage/storage.dm
#	code/datums/storage/subtypes/bags.dm
#	code/datums/storage/subtypes/belts.dm
#	code/datums/storage/subtypes/others/misc.dm
#	code/datums/storage/subtypes/pockets.dm
#	code/datums/weather/weather.dm
#	code/datums/weather/weather_types/ash_storm.dm
#	code/game/data_huds.dm
#	code/game/gamemodes/objective.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/dna_console.dm
#	code/game/machinery/computer/orders/order_computer/mining_order.dm
#	code/game/machinery/computer/records/medical.dm
#	code/game/machinery/dish_drive.dm
#	code/game/machinery/dna_infuser/organ_sets/fox_organs.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/machinery/requests_console.dm
#	code/game/objects/effects/decals/cleanable/blood.dm
#	code/game/objects/items/climbingrope.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/dualsaber.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/game/objects/items/storage/backpack.dm
#	code/game/objects/items/storage/belt.dm
#	code/game/objects/items/storage/boxes/clothes_boxes.dm
#	code/game/objects/items/storage/dufflebags.dm
#	code/game/objects/items/storage/medkit.dm
#	code/game/objects/items/storage/toolboxes/weapons.dm
#	code/game/objects/items/surgery_tray.dm
#	code/game/objects/items/tools/painter/paintable_decals.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	code/game/objects/structures/girders.dm
#	code/game/objects/structures/kitchen_spike.dm
#	code/game/objects/structures/mirror.dm
#	code/game/objects/structures/tables_racks.dm
#	code/game/sound/sound.dm
#	code/game/world.dm
#	code/modules/admin/admin.dm
#	code/modules/admin/create_mob.dm
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/admingame.dm
#	code/modules/admin/verbs/ert.dm
#	code/modules/antagonists/brother/brother.dm
#	code/modules/antagonists/cult/cult_armor.dm
#	code/modules/antagonists/fugitive/hunters/hunter.dm
#	code/modules/antagonists/space_ninja/space_ninja.dm
#	code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm
#	code/modules/client/preferences.dm
#	code/modules/client/preferences/language.dm
#	code/modules/client/preferences/middleware/_middleware.dm
#	code/modules/client/preferences/species_features/moth.dm
#	code/modules/client/preferences/species_features/mushperson.dm
#	code/modules/client/preferences/species_features/pod.dm
#	code/modules/client/preferences_savefile.dm
#	code/modules/clothing/head/hat.dm
#	code/modules/clothing/shoes/boots.dm
#	code/modules/clothing/shoes/sneakers.dm
#	code/modules/clothing/suits/utility.dm
#	code/modules/clothing/under/color.dm
#	code/modules/clothing/under/jobs/security.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/hydroponics/grown/replicapod.dm
#	code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
#	code/modules/jobs/job_types/cyborg.dm
#	code/modules/loadout/categories/pocket.dm
#	code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
#	code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm
#	code/modules/mob/dead/dead.dm
#	code/modules/mob/living/blood.dm
#	code/modules/mob/living/blood_types.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/mob/living/carbon/examine.dm
#	code/modules/mob/living/carbon/human/_species.dm
#	code/modules/mob/living/carbon/human/dummy.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_update_icons.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/carbon/human/species_types/felinid.dm
#	code/modules/mob/living/carbon/human/species_types/mothmen.dm
#	code/modules/mob/living/carbon/human/species_types/mushpeople.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_item_handling.dm
#	code/modules/mob/living/silicon/ai/ai_say.dm
#	code/modules/mob/living/silicon/robot/examine.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/silicon/robot/robot_model.dm
#	code/modules/mob/mob_say.dm
#	code/modules/mod/mod_activation.dm
#	code/modules/mod/modules/_module.dm
#	code/modules/modular_computers/computers/item/computer.dm
#	code/modules/power/smes.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/chemistry/holder/mob_life.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/religion/honorbound/honorbound_rites.dm
#	code/modules/shuttle/mobile_port/shuttle_move_callbacks.dm
#	code/modules/surgery/bodyparts/_bodyparts.dm
#	code/modules/surgery/bodyparts/head_hair_and_lips.dm
#	code/modules/surgery/organs/external/_visual_organs.dm
#	code/modules/surgery/organs/external/spines.dm
#	code/modules/surgery/organs/external/tails.dm
#	code/modules/surgery/organs/external/wings/moth_wings.dm
#	code/modules/surgery/organs/internal/ears/_ears.dm
#	code/modules/surgery/organs/internal/eyes/_eyes.dm
#	code/modules/surgery/surgery_step.dm
#	code/modules/tooltip/tooltip.html
#	code/modules/unit_tests/changeling.dm
#	code/modules/unit_tests/designs.dm
#	code/modules/unit_tests/screenshot_humanoids.dm
#	code/modules/unit_tests/screenshots/screenshot_airlocks_icons.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_blobinfection.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_obsessed.png
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human.png
#	code/modules/unit_tests/screenshots/screenshot_husk_body.png
#	code/modules/unit_tests/simple_animal_freeze.dm
#	code/modules/vending/medical.dm
#	code/modules/vending/sovietsoda.dm
#	config/dynamic.toml
#	config/maps.txt
#	config/spaceruinblacklist.txt
#	icons/map_icons/clothing/_clothing.dmi
#	icons/map_icons/clothing/head/_head.dmi
#	icons/map_icons/clothing/head/beret.dmi
#	icons/map_icons/clothing/mask.dmi
#	icons/map_icons/clothing/neck.dmi
#	icons/map_icons/clothing/shoes.dmi
#	icons/map_icons/clothing/suit/_suit.dmi
#	icons/map_icons/clothing/under/_under.dmi
#	icons/map_icons/clothing/under/costume.dmi
#	icons/map_icons/clothing/under/dress.dmi
#	icons/map_icons/items/_item.dmi
#	icons/map_icons/items/encryptionkey.dmi
#	icons/map_icons/items/pda.dmi
#	icons/map_icons/objects.dmi
#	interface/skin.dmf
#	modular_zubbers/code/modules/storyteller/event_defines/ghostset/alien_infestation.dm
#	modular_zubbers/code/modules/storyteller/event_defines/ghostset/changeling.dm
#	modular_zubbers/code/modules/storyteller/event_defines/ghostset/nightmare.dm
#	modular_zubbers/code/modules/storyteller/event_defines/ghostset/space_dragon.dm
#	modular_zubbers/code/modules/storyteller/event_defines/ghostset/space_ninja.dm
#	modular_zubbers/code/modules/storyteller/event_defines/ghostset/spider_infestation.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/abductor.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/blob.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/fugitives.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/morph.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/pirates.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/revenant.dm
#	modular_zubbers/code/modules/storyteller/event_defines/major/slaughter.dm
#	strings/pirates.json
#	strings/traumas.json
#	tgui/packages/tgfont/icons/nanotrasen_logo.svg
#	tgui/packages/tgfont/icons/syndicate_logo.svg
#	tgui/packages/tgui/index.tsx
#	tgui/packages/tgui/interfaces/AntagInfoBlob.tsx
#	tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx
#	tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx
#	tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
#	tgui/packages/tgui/interfaces/PersonalCrafting/constants.ts
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/MainPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/QuirksPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/ItemDisplay.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/base.ts
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/index.tsx
#	tgui/packages/tgui/interfaces/Vending.tsx
#	tgui/packages/tgui/interfaces/VotePanel.tsx
#	tgui/packages/tgui/styles/interfaces/NtosMessenger.scss
#	tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss
#	tgui/packages/tgui/styles/main.scss
#	tools/ci/copy_build_output.sh
#	tools/maplint/lints/window_spawner.yml
#	tools/pull_request_hooks/autoChangelog.js
2025-08-19 23:36:21 -04:00
Lucyandnevimer 9b7818b44b Nukes get_modified_bleed_rate() and just use cached_bleed_rate instead (#92621)
## About The Pull Request

Port of my changes from [Monkestation/Monkestation2.0@`c54fc87`
(#7295)](https://github.com/Monkestation/Monkestation2.0/pull/7295/commits/c54fc872bfe767238a02da2b8bb5efdeb93a8526)

This nukes `/obj/item/bodypart/proc/get_modified_bleed_rate()`, instead
everything just uses the `cache_bleed_rate` var - `refresh_bleed_rate()`
will now take into account body position and grasping in the same way
`get_modified_bleed_rate` did.

(Un)grasping a limb already called `refresh_bleed_rate()` anyways, so
the only other change needed was making
`COMSIG_LIVING_SET_BODY_POSITION` also call it.
2025-08-19 22:43:00 -04:00
Rhialsandnevimer 906ac46477 Makes water coolers more mechanically interesting, fills them up with fruit punch sometimes (#92480)
## About The Pull Request

This overhauls Water Coolers (now referred to as "liquid coolers"
internally and in most external cases). They'll feel less like a useless
prop now.

(sprites may look off because of the gif software I use)

**Important Thing # 1:** The reagents are now handled by cooler jugs.
You can pop the jug off of a cooler, fill it with whatever the hell you
want, and put it back on. Fill it with drugs. Fill it with acid. I don't
care, I'm not your mom.

<img width="41" height="56" alt="image"
src="https://github.com/user-attachments/assets/4c618cab-99b4-4a72-ae7b-7b900d7f5eaf"
/>

The sprite now uses an overlay to change colors based on the mix. Water,
when present in the cooler, is magically turned blue to keep that
classic water cooler look.

<img width="280" height="333" alt="image"
src="https://github.com/user-attachments/assets/8a6a905c-bef4-4f5f-9393-5ce5dcca0620"
/>

The jugs are 200 reagents, and are mechanically comparable to the jerry
can. No 200 unit acid splashes or anything.

Y'know, unless you put the jug in a cooler and knock it over...

![JUST COVER ME IN ACID WHY
DONTCHA](https://github.com/user-attachments/assets/7536a13c-1cb4-4af1-bfcc-25842215b393)

**Important Thing # 2:** They can be anchored, tipped, and crafted.

Tipping them requires the cooler be unanchored. If you want to use one
of these tactically, unwrench it beforehand.

![the
tipperrrr](https://github.com/user-attachments/assets/6b2cef28-bfb6-457a-b191-d91ec4fd9028)

**Important Thing # 3:** They can be bought from cargo now!

<img width="501" height="605" alt="image"
src="https://github.com/user-attachments/assets/6f261aab-f11a-4126-98ce-d9278d01d0a0"
/>

**Important Thing # 4**

Fruit punch.

<img width="175" height="127" alt="image"
src="https://github.com/user-attachments/assets/ac81e48c-47ff-461f-85f8-3e77a6a6ca55"
/>

Fruit punch is a drink with impressive (slightly faster than omnizine)
healing qualities. Unfortunately, it's so unbearably sweet that it can
only be safely consumed near a liquid cooler! Drinking this stuff is a
commitment, since if you stray from the cooler while digesting it, you
will be hurt and disoriented. You should avoid drinking too much at
once, in case an emergency comes up!

For this reason, we encourage drinkers to _take small sips from your
paper cooler cup, hang around the cooler, and maybe chat with other
people who are healing too._

(Mapload) water coolers have a 1% chance to start full of punch instead
of water. Maybe you'll get lucky and start with a healing station in
your department, or maybe a hopeless space explorer will find one in a
ruin and be saved.

You can also buy one from cargo but it's priceyyyyy. It's also the only
source of punch.
## Why It's Good For The Game

Realizing how little functionality water coolers have was super
disappointing. They do hardly anything but take up space and look
pretty. And now, they're getting mapped into all of the new stations! We
can't have a bunch of inert, sandbox-shunning furniture just sitting
around, the other codebases would laugh at us!

Now, coolers are more congruent with how most people would expect one to
behave in the game environment. Even minor changes like making them
unanchorable or refillable helps them fit in with most players'
intuitive understanding of how atoms typically behave.

The reagent storage change gives coolers their own unique niche in the
sandbox. Tipping them over can also give you an edge in escaping
someone, so even the untouched roundstart coolers can serve a purpose to
savvy players.

For the punch cooler, I figured "why not make a reagent that rewards
players for treating the water cooler like a water cooler?" The punch
encourages players to stand around it, slowly sip from the cooler, and
chat with their co-workers. Just like people do in offices! It's
thematically sound!
## Changelog
🆑 Rhials
add: You may now remove water cooler jugs and put whatever you want in
them. Go nuts.
add: Water coolers are now craftable (with plastic), orderable from
cargo, and tippable when unanchored.
add: Rarely, water coolers will spawn full of healing fruit punch
instead of water! Be careful not to stray from the cooler while
digesting this stuff.
add: You can also just buy the punch cooler from cargo if you feel like
it.
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
# Conflicts:
#	code/modules/reagents/reagent_dispenser.dm
2025-08-19 22:42:52 -04:00
Time-Greenandnevimer a66a60e711 1X3 ICEBOX | Wilderness Expansion (Now not extremely slow!) (#91920)
## About The Pull Request
Turns the surface z-level of icebox into a 1x3 area, effectively adding
2 wilderness new z-levels surrounding the station

Because it's not always clear to other people what I'm talking about,
this is what I mean with making the surface level a 3x3 z-level

The wilderness z-levels are gridlinked, instead of crosslinked, which
just means the connections are consistent and not randomized. If you
keep going right, you will always end up where you started again,
eventually. This also removes the black border around the surface icebox
z-level (cause you can just go there now)

**Wilderness levels**
I've added some Z-level templates that can be generated. They're
incredibly basic, but all can spawn runes on them as well.
- Snow planes (5x)
- Ice planes (1x)
- Forest planes (1x)
- Mountain planes (1x)

I've also tweaked surface generation quite a bit. It being completely
covered in bones always felt weird, and the intersparsed rocks and
chasms never sat right with me. The default overworldgen is now more
like the Forested trait, but with more sparse trees.

All of this is modular btw. You can increase the amount of z-levels,
make any space z-level be unrandomized gridlinked or add your own
wilderness z-levels (either to your own map or icebox)

## Why It's Good For The Game
Icebox exploration is kind of depressing. We have this unique setting,
but we can't really go anywhere? You can go down and find that one pool,
which is about the peak of exploration of icebox.

Now you can literally explore the entire round and get incredibly lost!
It's also a great opportunity for mappers! (Especially since the
templates I made were made rather quickly as I wasn't sure if this had
merit).

2 extra z-levels isn't a lot, but it'll let us further develop planetary
wilderness z-levels further without impacting load times that much.
Maybe 3x3 icebox can be real in the future, but for now 1x3 icebox will
have to do
2025-08-19 22:41:05 -04:00
Thunder12345andnevimer c50c88a82a Icebox ruin: RoroCo glove factory (#92473)
## About The Pull Request

Adds a new surface ruin to icebox, the RoroCo factory. Contains a couple
of puzzles, and a small amount of loot in the form of ~~3 total pairs of
insulated gloves~~ a pair of insulated gloves, two adorable roros and a
cool unique labcoat. Just don't ask where the gloves come from...

Puzzles can of course be avoided/brute-forced by breaking down the walls
but that's for chumps.

<img width="1152" height="1024" alt="Space Station 13 2025-08-06 221903"
src="https://github.com/user-attachments/assets/21050aa6-9b27-494d-a949-7496aeda18cf"
/>

## Why It's Good For The Game

The upcoming 1x3 icebox surface calls for more ruin content to help fill
that space.

## Changelog
🆑
add: A new insulated glove factory has popped up on the ice moon.
add: Freezer floor tiles now come in the full range of shapes.
/🆑
2025-08-19 22:40:43 -04:00
0f849cad42 The effects of flashbangs become less severe the further away you are from the flashbang when it detonates. (#92294)
## About The Pull Request

<img width="691" height="207" alt="flashbang agony zone"
src="https://github.com/user-attachments/assets/a4cc5fdb-19dc-4849-8c4a-2db1ac0fe212"
/>

In this handy chart, you can now see the impact of the flashbang based
on location.

**Dead Center:** While our Powergaming RD for Testing Pruposes is immune
to this, being on this tile when the flashbang goes off still hard stuns
you for a really long time even if you have ear protection. The bang
doesn't do anything in a vacuum.

**Pointblank:** This works as it does live, going through protections.
Though the bang doesn't work in a vacuum.

**Sweetspot:** This works as it does live, stunning and knocking you
down, but not if you're protected from the flash and the bang. This is
currently set to 3 tiles.

**Stagger Zone:** If you're vulnerable to the bang, you are staggered
and drop your items, rather than stunned and knocked down. If you're
vulnerable to the flash, you are dizzied and drop your items, rather
than stunned and knocked down.

**Safe Zone:** Basically this is outside of the flashbang's effective
range. The effective range is the same as live (7 tiles).

## Why It's Good For The Game

Flashbangs are a pretty easy room wide attack that acts as a one of our
more extreme gear checks. You either are entirely safe from this, or you
probably are going to eat shit to something just tossed into your line
of sight. Either you need to be able to disappear from the room
immediately, or the flashbang gets you.

Without nullifying the room attacking effect too severely, as well as
the mass disarming capabilities of the flashbang, this at least helps
provide some ways to counteract flashbangs without absolutely needing to
have the protections. You can play around the stagger and dizziness more
easily than you can the stuns.

The vacuum stuff is mostly because being hit by a flashbang's bang in a
vacuum is a bit absurd. The flash still works, however.

## Changelog
🆑
balance: The effects of flashbangs become less severe the further away
you are from the flashbang.
balance: The bang effect of flashbangs cannot affect you in a vacuum.
The flash still functions in a vacuum.
/🆑

---------

Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2025-08-19 22:39:39 -04:00
Thunder12345andnevimer 20118ad747 Converts a bunch of time/delay vars to use time defines (#92495)
## About The Pull Request

Converts as many time vars expressed in deciseconds as I could find to
use time defines.

## Why It's Good For The Game

Makes these values neater and more readable.

## Changelog
🆑
code: Converted a lot of time-based variables to be expressed with time
defines.
/🆑
# Conflicts:
#	code/modules/clothing/head/hat.dm
#	code/modules/clothing/shoes/boots.dm
#	code/modules/clothing/suits/utility.dm
2025-08-19 22:38:55 -04:00
SyncIt21andnevimer e1a722580a [NO GBP] Fixes empty vending canisters in some cases (#92538)
## About The Pull Request
- Fixes #92527
- Closes #92537

## Changelog
🆑
fix: product category vendors start out correctly filled & can be
refilled with cargo ordered vending canisters again
/🆑
2025-08-19 22:34:05 -04:00
MrMelbertandnevimer 5f35bdee00 [MDB Ignore] Re-add hop console second ID slot (#92157)
## About The Pull Request

<img width="491" height="301" alt="image"
src="https://github.com/user-attachments/assets/a3b5b19f-edf5-4de9-9201-9cbfab9e8827"
/>

Mod computers with the access changing software installed have a
secondary ID slot once again. This ID slot doesn't contribute to access.
You can insert IDs into the slot with right click and remove them with
alt-right click.

Also removes the "New IDs and you" memo paper.

Also tweaks PDA on_deconstruct so contents are dropped on when they're
deconstructed with assembly.

Fixes #92151

## Why It's Good For The Game

Changing IDs is very unnecessarily clunky with the one slot. Insert hop
id, log in, remove hop id, insert crew id, change access, remove crew
id, log out.

We had it right back when we had two slots. Insert hop ID, insert crew
id, log in. It just works.

This also allows for mobile HoPs to change access without necessitating
removing their ID from their PDA.

Other changes:

The "New IDs and you" memo is very old. They haven't been new for 4
years now. I don't think anyone reads it and they served their purpose.

I found it odd that, if your PDA was melted or blown up, it would delete
your ID. If this is a hold-over from old PDA behavior feel free to let
me know but otherwise it seems sensible that it'd spit out the contents
as you would expect.

## Changelog

🆑 Melbert
qol: The access changing software (the HoP console) now has ID two slots
again (one for the HoP's id and one for the ID being changed). You can
insert IDs in the secondary slot via the UI or right click, and remove
them via the UI or alt-right click.
qol: If your PDA is destroyed via acid or bombs, your ID (and similar
contents such as disks) are spit out instead of being deleted
del: Deletes the "New IDs and you" memo in the HoP's office. They
haven't been new for 4 years.
fix: Engineering sub-tab in the access changing software no longer looks
messed up
fix: Fix reversed alt-click logic for mod pcs
/🆑
# Conflicts:
#	code/modules/modular_computers/computers/item/computer.dm
2025-08-19 22:32:57 -04:00
7ff0a19883 Burned mess from culinary disasters is once again toxic. (#92394)
## About The Pull Request
When an item is cooked, reagents are generally cleared from the
resulting object and the reagents of the source object are transferred
to it instead. This means burned mess won't have its toxins when cooked,
locking you out of one or two chemistry recipes that require it while
also making the item generally not toxic at all.
So to fix it, we simply have to replace all or most of the consumable
reagents inside the burned mess with bad food, via component signals.

## Why It's Good For The Game
Fixing an issue with food and chemistry.

## Changelog

🆑
fix: burned mess made with a microwave, oven or griddle once again
toxins.
/🆑

---------

Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
2025-08-19 22:30:38 -04:00
SSensum13andnevimer 99d95aae62 Some ITEM_SLOT bitflags fixes. (#92441)
## About The Pull Request

This PR fixes wrong usage of bitflags in a few places, where instead of
bitfields lists were used.

## Why It's Good For The Game

It will help prevent problems that can be a thing in the future,
improving consistency of the codebase.
2025-08-19 22:30:33 -04:00
SyncIt21andnevimer 8b0d22d14b General maintenance for vending machines (#91987)
## About The Pull Request
**1. Code Improvements**
- Removed unused vars `coin`, `bill` & other stuff
- Removed duplicate definition of `on_deconstruction()`
- Autodoc for a lot of procs
- Merged smaller procs into larger ones to avoid scrolling in the code
editor & reduced overhead
- Split the vending machine file into several smaller files for easy
code management

**2. Qol**
- Implemented vending machine ads. They now display random stuff on the
UI

https://github.com/user-attachments/assets/9720ea60-f268-4ca2-940d-243e3d0ac75f
- More error messages for custom & normal vendors as to why an item
could not be loaded
- Custom vending machines can be deconstructed safely via crowbar
without any explosion only after unlinking your account from the machine
else you get the same explosion. Upon deconstruction all loaded items
are moved into its restock canister meaning the machine can be safely
moved with all its products just like a regular vending machine to a new
location

**3. Fixes**
- Fixes #81917. Any returned items in the vending machine now show up as
free in the UI & won't cost credits to buy them
- Fixes #87416. Custom & normal vendors now keep track of products
removed via `Exited()` so the UI gets always updated
- Fixes #83151. Items with different names & custom prices now show up
in unique rows
- Fixes #92170 Custom vendors now show the correct icon for inserted
items
- Closes #80010. From the above fix this situation is impossible so it's
safe to close this as a duplicate
- Closes #78016 same problem as above with `Exited()` duplicate
- Custom vendors can now actually be used by players who are not the
owner instead of locking down the UI
- Vending machines keep track of `max_amount` of stocked items by hand
as well & not just RPED

**4. Refactor**
- Separates custom vending machine code from normal vending machine
code. This prime Marely focus on the `vending_machine_input` list which
now only exists inside the custom vending machine
- Compressed the UI code for vending machine so both custom & normal
vending machines can send the same data instead of separating the 2.
Overall less code
- Moved attack chain from `attackby()` to `item_interaction()` for
loading items

## Changelog
🆑
code: cleaned up vending machine code
qol: vending machines now have more product slogans you never heard
before
qol: custom & normal vending machines now have more feedback on why an
item could not be loaded
qol: vending machines now display random ads on the UI
qol: custom vending machines can be deconstructed via crowbar safely
only after unlinking your account from the machine.
qol: upon deconstructing a custom vendor all its products are moved into
its refill canister & it will be restored when reconstructing the
machine elsewhere
fix: Returned items to the vending machine now show up as free in the UI
and won't be greyed out if you don't have credits to get them back
fix: items that leave the vending machine by any means will update the
UI in all cases
fix: loading items by hand to the vending machine now respects the
max_amount for that category
fix: custom vendors can now actually be used by players who are not the
owner thus enabling them to transfer credits to the owner during
purchases & basically they do their job again
fix: custom vendors now show the correct icon for inserted items
fix: Items with different names & custom prices now show up in unique
rows in custom vendors
refactor: separated custom & normal vending machine code. Reduced UI
code & improved attack chain
/🆑

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
# Conflicts:
#	code/modules/vending/_vending.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
2025-08-19 22:28:01 -04:00
Axidyandnevimer f4dd6aa0f4 Misspeled Kotra Wellington to correct Korta Wellington (#92485) 2025-08-19 22:23:37 -04:00
LucyandGitHub d9da415f44 Nukes get_modified_bleed_rate() and just use cached_bleed_rate instead (#92621)
## About The Pull Request

Port of my changes from [Monkestation/Monkestation2.0@`c54fc87`
(#7295)](https://github.com/Monkestation/Monkestation2.0/pull/7295/commits/c54fc872bfe767238a02da2b8bb5efdeb93a8526)

This nukes `/obj/item/bodypart/proc/get_modified_bleed_rate()`, instead
everything just uses the `cache_bleed_rate` var - `refresh_bleed_rate()`
will now take into account body position and grasping in the same way
`get_modified_bleed_rate` did.

(Un)grasping a limb already called `refresh_bleed_rate()` anyways, so
the only other change needed was making
`COMSIG_LIVING_SET_BODY_POSITION` also call it.
2025-08-18 20:50:30 +00:00
4f6e27ca92 Makes water coolers more mechanically interesting, fills them up with fruit punch sometimes (#92480)
## About The Pull Request

This overhauls Water Coolers (now referred to as "liquid coolers"
internally and in most external cases). They'll feel less like a useless
prop now.

(sprites may look off because of the gif software I use)

**Important Thing # 1:** The reagents are now handled by cooler jugs.
You can pop the jug off of a cooler, fill it with whatever the hell you
want, and put it back on. Fill it with drugs. Fill it with acid. I don't
care, I'm not your mom.

<img width="41" height="56" alt="image"
src="https://github.com/user-attachments/assets/4c618cab-99b4-4a72-ae7b-7b900d7f5eaf"
/>

The sprite now uses an overlay to change colors based on the mix. Water,
when present in the cooler, is magically turned blue to keep that
classic water cooler look.

<img width="280" height="333" alt="image"
src="https://github.com/user-attachments/assets/8a6a905c-bef4-4f5f-9393-5ce5dcca0620"
/>

The jugs are 200 reagents, and are mechanically comparable to the jerry
can. No 200 unit acid splashes or anything.

Y'know, unless you put the jug in a cooler and knock it over...

![JUST COVER ME IN ACID WHY
DONTCHA](https://github.com/user-attachments/assets/7536a13c-1cb4-4af1-bfcc-25842215b393)

**Important Thing # 2:** They can be anchored, tipped, and crafted.

Tipping them requires the cooler be unanchored. If you want to use one
of these tactically, unwrench it beforehand.

![the
tipperrrr](https://github.com/user-attachments/assets/6b2cef28-bfb6-457a-b191-d91ec4fd9028)

**Important Thing # 3:** They can be bought from cargo now!

<img width="501" height="605" alt="image"
src="https://github.com/user-attachments/assets/6f261aab-f11a-4126-98ce-d9278d01d0a0"
/>

**Important Thing # 4**

Fruit punch.

<img width="175" height="127" alt="image"
src="https://github.com/user-attachments/assets/ac81e48c-47ff-461f-85f8-3e77a6a6ca55"
/>

Fruit punch is a drink with impressive (slightly faster than omnizine)
healing qualities. Unfortunately, it's so unbearably sweet that it can
only be safely consumed near a liquid cooler! Drinking this stuff is a
commitment, since if you stray from the cooler while digesting it, you
will be hurt and disoriented. You should avoid drinking too much at
once, in case an emergency comes up!

For this reason, we encourage drinkers to _take small sips from your
paper cooler cup, hang around the cooler, and maybe chat with other
people who are healing too._

(Mapload) water coolers have a 1% chance to start full of punch instead
of water. Maybe you'll get lucky and start with a healing station in
your department, or maybe a hopeless space explorer will find one in a
ruin and be saved.

You can also buy one from cargo but it's priceyyyyy. It's also the only
source of punch.
## Why It's Good For The Game

Realizing how little functionality water coolers have was super
disappointing. They do hardly anything but take up space and look
pretty. And now, they're getting mapped into all of the new stations! We
can't have a bunch of inert, sandbox-shunning furniture just sitting
around, the other codebases would laugh at us!

Now, coolers are more congruent with how most people would expect one to
behave in the game environment. Even minor changes like making them
unanchorable or refillable helps them fit in with most players'
intuitive understanding of how atoms typically behave.

The reagent storage change gives coolers their own unique niche in the
sandbox. Tipping them over can also give you an edge in escaping
someone, so even the untouched roundstart coolers can serve a purpose to
savvy players.

For the punch cooler, I figured "why not make a reagent that rewards
players for treating the water cooler like a water cooler?" The punch
encourages players to stand around it, slowly sip from the cooler, and
chat with their co-workers. Just like people do in offices! It's
thematically sound!
## Changelog
🆑 Rhials
add: You may now remove water cooler jugs and put whatever you want in
them. Go nuts.
add: Water coolers are now craftable (with plastic), orderable from
cargo, and tippable when unanchored.
add: Rarely, water coolers will spawn full of healing fruit punch
instead of water! Be careful not to stray from the cooler while
digesting this stuff.
add: You can also just buy the punch cooler from cargo if you feel like
it.
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2025-08-17 02:04:46 +00:00
Time-GreenandGitHub a47835a04f 1X3 ICEBOX | Wilderness Expansion (Now not extremely slow!) (#91920)
## About The Pull Request
Turns the surface z-level of icebox into a 1x3 area, effectively adding
2 wilderness new z-levels surrounding the station

Because it's not always clear to other people what I'm talking about,
this is what I mean with making the surface level a 3x3 z-level

The wilderness z-levels are gridlinked, instead of crosslinked, which
just means the connections are consistent and not randomized. If you
keep going right, you will always end up where you started again,
eventually. This also removes the black border around the surface icebox
z-level (cause you can just go there now)

**Wilderness levels**
I've added some Z-level templates that can be generated. They're
incredibly basic, but all can spawn runes on them as well.
- Snow planes (5x)
- Ice planes (1x)
- Forest planes (1x)
- Mountain planes (1x)

I've also tweaked surface generation quite a bit. It being completely
covered in bones always felt weird, and the intersparsed rocks and
chasms never sat right with me. The default overworldgen is now more
like the Forested trait, but with more sparse trees.

All of this is modular btw. You can increase the amount of z-levels,
make any space z-level be unrandomized gridlinked or add your own
wilderness z-levels (either to your own map or icebox)

## Why It's Good For The Game
Icebox exploration is kind of depressing. We have this unique setting,
but we can't really go anywhere? You can go down and find that one pool,
which is about the peak of exploration of icebox.

Now you can literally explore the entire round and get incredibly lost!
It's also a great opportunity for mappers! (Especially since the
templates I made were made rather quickly as I wasn't sure if this had
merit).

2 extra z-levels isn't a lot, but it'll let us further develop planetary
wilderness z-levels further without impacting load times that much.
Maybe 3x3 icebox can be real in the future, but for now 1x3 icebox will
have to do
2025-08-15 01:58:58 -05:00
Thunder12345andGitHub d1b8145ad2 Icebox ruin: RoroCo glove factory (#92473)
## About The Pull Request

Adds a new surface ruin to icebox, the RoroCo factory. Contains a couple
of puzzles, and a small amount of loot in the form of ~~3 total pairs of
insulated gloves~~ a pair of insulated gloves, two adorable roros and a
cool unique labcoat. Just don't ask where the gloves come from...

Puzzles can of course be avoided/brute-forced by breaking down the walls
but that's for chumps.

<img width="1152" height="1024" alt="Space Station 13 2025-08-06 221903"
src="https://github.com/user-attachments/assets/21050aa6-9b27-494d-a949-7496aeda18cf"
/>

## Why It's Good For The Game

The upcoming 1x3 icebox surface calls for more ruin content to help fill
that space.

## Changelog
🆑
add: A new insulated glove factory has popped up on the ice moon.
add: Freezer floor tiles now come in the full range of shapes.
/🆑
2025-08-15 00:10:01 +00:00
77375b66eb The effects of flashbangs become less severe the further away you are from the flashbang when it detonates. (#92294)
## About The Pull Request

<img width="691" height="207" alt="flashbang agony zone"
src="https://github.com/user-attachments/assets/a4cc5fdb-19dc-4849-8c4a-2db1ac0fe212"
/>

In this handy chart, you can now see the impact of the flashbang based
on location.

**Dead Center:** While our Powergaming RD for Testing Pruposes is immune
to this, being on this tile when the flashbang goes off still hard stuns
you for a really long time even if you have ear protection. The bang
doesn't do anything in a vacuum.

**Pointblank:** This works as it does live, going through protections.
Though the bang doesn't work in a vacuum.

**Sweetspot:** This works as it does live, stunning and knocking you
down, but not if you're protected from the flash and the bang. This is
currently set to 3 tiles.

**Stagger Zone:** If you're vulnerable to the bang, you are staggered
and drop your items, rather than stunned and knocked down. If you're
vulnerable to the flash, you are dizzied and drop your items, rather
than stunned and knocked down.

**Safe Zone:** Basically this is outside of the flashbang's effective
range. The effective range is the same as live (7 tiles).

## Why It's Good For The Game

Flashbangs are a pretty easy room wide attack that acts as a one of our
more extreme gear checks. You either are entirely safe from this, or you
probably are going to eat shit to something just tossed into your line
of sight. Either you need to be able to disappear from the room
immediately, or the flashbang gets you.

Without nullifying the room attacking effect too severely, as well as
the mass disarming capabilities of the flashbang, this at least helps
provide some ways to counteract flashbangs without absolutely needing to
have the protections. You can play around the stagger and dizziness more
easily than you can the stuns.

The vacuum stuff is mostly because being hit by a flashbang's bang in a
vacuum is a bit absurd. The flash still works, however.

## Changelog
🆑
balance: The effects of flashbangs become less severe the further away
you are from the flashbang.
balance: The bang effect of flashbangs cannot affect you in a vacuum.
The flash still functions in a vacuum.
/🆑

---------

Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2025-08-14 14:33:08 +02:00
Thunder12345andGitHub 260960d6f4 Converts a bunch of time/delay vars to use time defines (#92495)
## About The Pull Request

Converts as many time vars expressed in deciseconds as I could find to
use time defines.

## Why It's Good For The Game

Makes these values neater and more readable.

## Changelog
🆑
code: Converted a lot of time-based variables to be expressed with time
defines.
/🆑
2025-08-12 18:30:25 -04:00
SyncIt21andGitHub 7acf1d427b [NO GBP] Fixes empty vending canisters in some cases (#92538)
## About The Pull Request
- Fixes #92527
- Closes #92537

## Changelog
🆑
fix: product category vendors start out correctly filled & can be
refilled with cargo ordered vending canisters again
/🆑
2025-08-12 13:02:40 +02:00
MrMelbertandGitHub 5df4de3f71 [MDB Ignore] Re-add hop console second ID slot (#92157)
## About The Pull Request

<img width="491" height="301" alt="image"
src="https://github.com/user-attachments/assets/a3b5b19f-edf5-4de9-9201-9cbfab9e8827"
/>

Mod computers with the access changing software installed have a
secondary ID slot once again. This ID slot doesn't contribute to access.
You can insert IDs into the slot with right click and remove them with
alt-right click.

Also removes the "New IDs and you" memo paper. 

Also tweaks PDA on_deconstruct so contents are dropped on when they're
deconstructed with assembly.

Fixes #92151

## Why It's Good For The Game

Changing IDs is very unnecessarily clunky with the one slot. Insert hop
id, log in, remove hop id, insert crew id, change access, remove crew
id, log out.

We had it right back when we had two slots. Insert hop ID, insert crew
id, log in. It just works.

This also allows for mobile HoPs to change access without necessitating
removing their ID from their PDA.

Other changes: 

The "New IDs and you" memo is very old. They haven't been new for 4
years now. I don't think anyone reads it and they served their purpose.

I found it odd that, if your PDA was melted or blown up, it would delete
your ID. If this is a hold-over from old PDA behavior feel free to let
me know but otherwise it seems sensible that it'd spit out the contents
as you would expect.

## Changelog

🆑 Melbert
qol: The access changing software (the HoP console) now has ID two slots
again (one for the HoP's id and one for the ID being changed). You can
insert IDs in the secondary slot via the UI or right click, and remove
them via the UI or alt-right click.
qol: If your PDA is destroyed via acid or bombs, your ID (and similar
contents such as disks) are spit out instead of being deleted
del: Deletes the "New IDs and you" memo in the HoP's office. They
haven't been new for 4 years.
fix: Engineering sub-tab in the access changing software no longer looks
messed up
fix: Fix reversed alt-click logic for mod pcs
/🆑
2025-08-11 19:08:18 +00:00
38f65b2c14 Burned mess from culinary disasters is once again toxic. (#92394)
## About The Pull Request
When an item is cooked, reagents are generally cleared from the
resulting object and the reagents of the source object are transferred
to it instead. This means burned mess won't have its toxins when cooked,
locking you out of one or two chemistry recipes that require it while
also making the item generally not toxic at all.
So to fix it, we simply have to replace all or most of the consumable
reagents inside the burned mess with bad food, via component signals.

## Why It's Good For The Game
Fixing an issue with food and chemistry.

## Changelog

🆑
fix: burned mess made with a microwave, oven or griddle once again
toxins.
/🆑

---------

Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
2025-08-11 20:30:47 +02:00
SSensum13andGitHub 4722bf017e Some ITEM_SLOT bitflags fixes. (#92441)
## About The Pull Request

This PR fixes wrong usage of bitflags in a few places, where instead of
bitfields lists were used.

## Why It's Good For The Game

It will help prevent problems that can be a thing in the future,
improving consistency of the codebase.
2025-08-11 13:20:50 -05:00