Commit Graph
22524 Commits
Author SHA1 Message Date
Casper3667andGitHub a772f72fee Fixes sec revolver lethals (#22129)
I did a small fuckup by not doublechecking stats. This makes them equal
to the .45 pistols.
2026-04-01 10:12:55 +00:00
BatrachophrenoandGitHub 71c18374db Bugfixes - Slowdowns, Sofa spinning, Turbolift squishing, and more (#22043)
Fixes https://github.com/Aurorastation/Aurora.3/issues/21669
Fixes https://github.com/Aurorastation/Aurora.3/issues/21951
Fixes https://github.com/Aurorastation/Aurora.3/issues/21972
Fixes https://github.com/Aurorastation/Aurora.3/issues/22077

changes:
- bugfix: "All movespeed_modifier slowdown data now applied correctly
post-smooth movement PR. IE: active magboots, duffel bags, etc. again
slow you down."
  - bugfix: "Sofas no longer able to be rotated while anchored."
- bugfix: "Attempting to use crowbars, fire axes, hammers on airlocks
while in the Hurt intent will now make you attack the airlock."
- bugfix: "Fixes graphical bug with open lid graphics for crates painted
in any engineering color variants."
- bugfix: "Individual butterfly knife parts are no longer larger than
butterfly knives themselves."
- bugfix: "Elevators that squish mobs (any type of mob/living) will now
appropriately gib instead of just quietly deleting them."
- rscadd: "Miniature fusion reactor explosions now use subsystem
radiation instead of manually applying rad damage to all mobs in range."
2026-03-30 18:44:39 +00:00
FyniandGitHub d883a05005 Adds the stafylia gyro (#22102)
Adds the stafylia gyro, THE authentic taste of Assunzione fast food!

---------

Signed-off-by: Fyni <itsfyni@gmail.com>
2026-03-30 09:07:25 +00:00
BatrachophrenoandGitHub f9a3ae76d8 Fixes submariner's beanie being invisible (#22109)
Icon_state typo. Fixed.
2026-03-29 02:16:28 +00:00
FenodyreeAvandGitHub e1929a46c8 Fixes Grab bugs and makes Grabs harder for third parties to break (#22108)
These changes are intended to prevent red grabs (neck grabs) being
broken so easily.
It also makes blue grabs very slightly harder to break, by stopping
people from pulling grabbed mobs.

Firstly, the grabbed mobs were not being moved along with their grabber
sometimes.
This happened when the grabber was force moved (such as by a pull, or
another grab or being walked into on harm intent), in which case the
grab that breaks was resolved purely by which had Process called on it
first.

Secondly, you can now no longer pull either the grabber, or the grabbed
mob. This prevents blue-grabs being broken by someone walking up and
pulling either person away, bypassing the Resist mechanic.

Thirdly, a red-grabbed mob cannot be pulled or grabbed by anyone else.
This means the only way to break a red-grab is to disarm the grabber,
stun the grabber, or throw the grabber more than 2 tiles.



https://github.com/user-attachments/assets/9d392229-4544-4546-ae8d-bdfc835fda19

I touched mob, living and mob_movement for this, because the grab checks
were so spread out. I'm not particularly comfortable with having done
that!
I've tested pretty extensively and it seems like nothing broke, but it's
hard to find edge cases without lots of clients and lots of grabs.
2026-03-29 02:09:18 +00:00
13fa715edd Pump GUI Update (#22100)
Updates the GUI of the Atmos Pumps to include a normalized flow rate
(normalized to 1ATM and 20C) and measurement functionality.

---------

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2026-03-29 02:08:38 +00:00
CatsinHDandGitHub 130988fa44 6.8mm and PRA rifle rebalance (#22089)
Rebalances the 6.8mm bullet and it's AP variant to not be antag shredder
9000. Additionally, alters pricing in the cargo order list and adds an
AP variant of the 6.8mm to the cargo order list. The values for the
rounds are below.

6.8mm: 40 dam | 12 AP
6.8mm AP: 30 dam | 30 AP

Against 55 armor (major ballistics armor):
6.8mm: 13 damage
6.8mm AP: 18 damage
5.56: 16.67 Damage
5.56 AP: 25 Damage
7.62: 18.56 Damage

The thought process behind these values:
<details><summary></summary>
<p>
Adhomai does not make wide use of personal body armor. As a result,
ammunition does not prioritize defeating body armor. Therefore, it is
more effective the less armor one has, leading to a high damage value
but low AP values. As they are rifle power cartridges, there is still
some AP. The specific 6.8mm AP cartridge was created for defeating the
armor of the S'rand'marr coalition, thus why it is comparable to 7.62
</p>
</details> 

These values can be tweaked as needed to make the rifle and ammo
reasonable.
This PR DOES NOT modify the rifle itself, and therefore should not
conflict with #22088
2026-03-26 21:49:14 +00:00
Casper3667andGitHub c89f4fb977 Combines the quikpay system into a datum, adds categories and more commissary things (#22055)
This fixes a couple of issues with the quikpay program, and makes it
into a datum that can be put into anything.
The ordering terminal the galley has now uses the quikpay program as
well.
The commissary now has a wall terminal they can enable and disable at
need to allow people to purchase things while the shop is unattended.
Also a small expansion to the commissary.
Food and drink fridges can be renamed with a pen.
All commissary shelves now have a message when an item are taken from
them.
The frozen meal vending machine was also readded behind the café.

<img width="550" height="550" alt="image"
src="https://github.com/user-attachments/assets/9217d942-47f1-4ec8-a459-0e94107bcebe"
/>
<img width="210" height="201" alt="image"
src="https://github.com/user-attachments/assets/fc7ad3df-7e96-49ae-83ec-df5c4a956cb4"
/>

<img width="451" height="556" alt="image"
src="https://github.com/user-attachments/assets/9126477e-7058-429e-a0e4-264d9c59f9ed"
/>

<img width="684" height="628" alt="image"
src="https://github.com/user-attachments/assets/fc95aa5c-eab1-414b-8491-2b1bbc156763"
/>

<img width="447" height="452" alt="image"
src="https://github.com/user-attachments/assets/c136840c-867c-4ea3-b61a-03aa3e5cd99d"
/>

<img width="160" height="224" alt="image"
src="https://github.com/user-attachments/assets/63e2add4-ce41-4920-bd91-1038f9661a85"
/>
2026-03-26 20:57:43 +00:00
BatrachophrenoandGitHub 9e9808ab8a Light's Edge (#22103)
changes:
- rscadd: "Adds additional configuration data to the Light's Edge
sector."
  - soundadd: "Adds a Welcome AI voiceline for the Light's Edge sector."
  - imageadd: "Adds Light's Edge sector skybox."
  - imageadd: "Adds Light's Edge sector state to the Stargazer."
- balance: "Slightly decreases default light brightness, slightly
increases night mode light range."
  
(Light changes before and after for reference. It's a weird inclusion
for a sector PR, but I found the lights on the Horizon were washing out
the starlight, and after I stopped trying to modify starlight and
instead modified the actual light machinery, I found that the values I
landed on actually looked really nice across the ship and offsites
tested.)

Before
<img width="1346" height="1342" alt="before"
src="https://github.com/user-attachments/assets/f3d1389f-26bd-4649-a5fd-049fbee8358b"
/>
After
<img width="1347" height="1341" alt="after"
src="https://github.com/user-attachments/assets/d3109ba7-4603-47c5-83f6-5b3caa136d76"
/>
2026-03-26 20:45:31 +00:00
e5b8918885 Fixes tajaran rifles loading more ammo than intended (#22090)
Bugfix
made a hacky fix for the tajaran rifle issue in
https://github.com/Aurorastation/Aurora.3/pull/22088

---------

Signed-off-by: Birigilis <kavbest10@gmail.com>
Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
Co-authored-by: bovvv <kavbest11@gmail.com>
Co-authored-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
2026-03-26 10:06:30 +00:00
Casper3667andGitHub f09bcd6cdd Replaces security disruptors with ballistics and removes all disruptors (#21987)
Security officers and the warden each get a .45 pistol loaded with
rubbers, and a spare rubber mag in their lockers.
The investigator get a new .45 revolver loaded with rubbers, based on
the konyang revolver, and a speedloader, also with rubbers.

The armory has had .45 speedloaders added to it, but is otherwise
untouched.

Also the autolathe gets to print .45 speedloaders now for the
investigator gun.

Practice ammo has been added to the autolathe.

The Elyran ERT had their disruptors replaced with plasma pistols.
Other non-Horizon disruptors were replaced with lethal .45.
Horizon disruptors were replaced with rubber .45.
2026-03-25 21:19:47 +00:00
55b2740cdb Voidtamer ship (#21162)
**WIP**
Adds a new voidtamer awayship.
<img width="871" height="1032" alt="voidtamer"
src="https://github.com/user-attachments/assets/aa1f6568-10f8-4812-8e48-2bb7b59192f8"
/>

I have not done a ship in a long, long time at this point, especially
with working power and atmos, if there's any issues or feedback on it
i'd absolutely appreciate it lol
(Image is a bit out of date)

---------

Signed-off-by: Yonnimer <31339047+Yonnimer@users.noreply.github.com>
Signed-off-by: ArbiterAmbrose <n22don2009@gmail.com>
Co-authored-by: Kano <89972582+kano-dot@users.noreply.github.com>
Co-authored-by: ArbiterAmbrose <n22don2009@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-25 16:12:04 +00:00
647ef22e70 Make tracker implants purchaseable from operations (#22066)
Inspired by a recent rev round where there was not enough of them, now
it is possible to order the trackers. I'm not too sure if the price is
good or not though, but we'll see.

---------

Signed-off-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-25 15:50:13 +00:00
Cody BrittainandGitHub 23789d4113 Sorts out existing projectile weapons (#22059)
This PR is intended to sort out our existing guns into something
resembling organization. In addition, ancient decrepit guns are removed,
and abstract paths are labeled as such.

In addition, all guns are now standardized to refer to their model.
Considering the huge number of weapons we have, a `pistol` is not
descriptive enough.

NOTE: At over 200 files touched, this is being split. Not everything was
sorted, but this is already a monster to sort through. The rest can
wait.
2026-03-25 15:37:50 +00:00
FabianK3andGitHub aff736cda2 Persistence code refactoring (#22044)
# Summary

This PR refactores code and structure of the current persistence
subsystem, in preparation for Persistency: Circles, Squares and
Triangles.

This should not contain any user facing changes.

~~This PR is based of branch #21925 and **needs** to be merged in order.
The files changed display will be meaningless until then.~~ *Done.*

## Changes

- Split subsystem in partial files.
- Refactored proc names, added "persistentObject" format for current
code.
- Renamed SQL table.
- Refactored logging and call hiearachy.
- Fix CI labeler adding DB label on non-SQL files.
2026-03-24 19:53:37 +01:00
fd1c4ead05 Adds Xanan Passcards (#22057)
This adds two passcards to represent xanan pride across the spur on the
horizon to the loadout as accessories.
Ill-fated is the creator of the sprites and descriptions, I am the
implementor by her request!

### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR: xanu_passcard, nationa_militia, the item
descriptions in full. All by the_ill_fated on discord.
<img width="302" height="203" alt="image"
src="https://github.com/user-attachments/assets/39e66093-2730-4d84-8534-37c6058f3471"
/>

---------

Signed-off-by: ArbiterAmbrose <n22don2009@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-24 17:02:03 +00:00
6e1f1f7e73 Tweaking what produce boxes can spawn (#22048)
Updates produce boxes to better reflect what's needed from them to make
common foods, upping the spawn rates of some things (such as chilis),
lowering the spawn rate of others (such as white-beets) and adding new
produce for it to spawn (such as lemons)
as well as a few rarely-spawning items for some less-common foods such
as berries and chickpeas, but with low-enough spawn rates that they
won't remove the kitchen's dependency on cargo and botany.
(Also fixes a small typo in Caramelized steak bites while i'm at it)

---------

Signed-off-by: tomixcomics <11053204+tomixcomics@users.noreply.github.com>
Co-authored-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-23 09:16:26 +00:00
Cody BrittainandGitHub 77aca119d9 Added screen alerts (#22051)
Ports screen alerts from CM13. This enables an immediate reference to
whether you are cuffed or buckled. It also provides an easy way to get
out of said situation by simply clicking on the alert.

<img width="430" height="454" alt="image"
src="https://github.com/user-attachments/assets/0c20abf2-0901-49e0-ac29-492ba7c6dbe5"
/>


### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:

| Path | Original Author | License |
| --- | --- | --- |
| icons/mob/screen_alert.dmi (buckle, succumb) | CM13Devs (CM-13) |
CC-BY-SA 3.0 |
2026-03-23 09:16:23 +00:00
Casper3667andGitHub 07ea1ab294 Adds a tea set box to the loadout and reduces the point cost of cigs (#22067)
Adds a 2 point box to the loadout that allows one to have a tin of tea,
teapot and 4 cups to properly share tea with people. Inspired after I
saw similar elsewhere and thought how annoying it was to use 3 points
just to get the tea, teapot and 1 (potentially full) cup.
Tea tins were made a bit smaller as it seemed weird they were box sized,
and so that it would actually fit in the tea set box.

The point cost of cigs were reduced to 1 point, down from 2, as it seem
to make more sense. We have entire lunchboxes and augs for 2 points,
while cigs are more an aesthetic choice.
2026-03-23 09:16:03 +00:00
22cd2ed612 Integrated Circuitry Tweaks/Fixes (#22074)
**power stuff**
- generally 10Xs all power draw stuff so they actually have a
significant effect on assembly power cells.
- buffs some of the lower-end power gen. circuits to go with, but the
higher-end ones can already handle the new numbers

**reagent pump**
- changes adjacent check to use turfs to cover more bases (ie. assembly
being held in-hand, or source/target being in an assembly thats held
in-hand — these being 90% of reagent pump uses)

**tickers**
- shouldn't have appended `SECONDS` to them all. they work as advertised
now (again)

---------

Signed-off-by: c#min7 <sadkermit01@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-23 09:15:52 +00:00
d9c15cb648 Fixes spiderbot bug (#22076)
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪
🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪 🎪

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-19 23:59:51 +00:00
2c4163a121 Integrated Circuitry Miniupdate (#21971)
- Updates the **medical analysers** to get health values significant to
Brainmed instead of Pointmed. About 6 years late?
- Adds a **radiation scanner**.
- Adds a **light scanner**.
- Adds a **custom ticker** that can be calibrated between 2 (fast ticker
equivalent) and 600 seconds.
- Adds a **face scanner** that can get basic information about
humanoids, including: name (same as an examiner), general flavourtext,
face flavourtext, species, height, estimated age, and eye colour. Has
applications for species-specific circuitry, identity confirmation, or
flavour usage.
- Adds a **flasher** that functions similarly to the **shocker**, but
applies a non-weakening/non-stunning flash instead. Shocker nerfed to
have much higher power draw, which the flasher also mimics.
- Redid all of the **tickers** to actually use seconds (as advertised in
their descriptions). Their intervals have also been changed to be more
significant: 10-secs, 30-secs, 5-mins, 2-secs (upgraded printer only),
custom 2sec to 10mins (upgraded printer only).
- Adds an **Alden-Saraspova counter circuit**. Scans only immediate
(in-view) surroundings for mineral deposits with artefacts inside and
returns a distance.
- Adds a **bluespace portal circuit**. Consumes bluespace crystals
(either tear apart Telescience OR get high tech levels + every material)
to open a portal with a destination based on a supplied *direction* and
*power*. Worse than telescience in every way (5x5m variance;
cardinal/ordinals only; no cross z-level teleporting; 1-way; BUT it's
portable!)
- Adds a **bubble shield circuit**. Relies on relative coordinate inputs
to generate a low health shield. Max range of 3 tiles. Max lifespan of
60 seconds. Can only project 3 shields at a time.

**To-Do:**
- [x] Test everything
- [x] Add any other quick requests before I hit review
- [x] Fuck around with circuits ingame for a bit to figure out any other
gaps
- [x] Test everything again

---------

Signed-off-by: c#min7 <sadkermit01@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-18 13:05:35 +00:00
VMSolidusandGitHub b5a3a165e1 Loner Update (#22034)
Antag Psionics were generally kind of underwhelming (especially in the
face of more interesting power sets like the Vampire/Ling jumpstarters),
so to add a new option for autotraitor rounds, I've given Loner back
their Awaken and Drain powers that they were allegedly supposed to have
according to the wiki. There is now also a new Loner Jumpstarter
available in the (Traitor-only) Antag Uplink, which changes the user
into a Loner antag.

I have also reduced the cost of the standard Psi Jumpstarter to 15tc,
which yes that does put it within the realms of what Mercs can buy. In
the grand scheme of balance it's still really underwhelming in
comparison to everything else Mercs can roll with, though I am very
interested in seeing mercs pull more antag psionic gimmicks.

<img width="1918" height="970" alt="image"
src="https://github.com/user-attachments/assets/33d21a21-9d26-40ac-b9c1-758fc7af2809"
/>
2026-03-18 12:47:32 +00:00
13083e7c55 Fixes Modular Lasers (#22054)
Fixes very old bugs with modular lasers that prevented them from taking
damage when fired.
Fixes a multiply by zero error that removed their fire delay.
Fixes the weapon analyzer, so it correctly shows their damage and number
of shots.
Fixes the shot-multiplier of the two capacitor mods.

Tweaks the damage chance, so that it's not a guarantee that you gun
breaks on the first shot if you have more than 1 mod.
Reduces the size of components, so that people can pick them up and put
them in their bags after their guns break.

Forum thread about these changes:

https://forums.aurorastation.org/topic/22876-modular-laser-rework-and-fix/

---------

Signed-off-by: FenodyreeAv <fenodyree.av@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-17 16:19:54 +00:00
6c4e9254b2 Add ashtray persistence & fixes (#21925)
# Summary

This PR adds persistency to ash trays. This in turn fixes cigarettes
butts spawning a round later in locations where non-empty ash trays were
found.

## Changes

- Add persistence to ash trays and prevent (fixes) cigarette butt
persistence if in an ash tray.
- Fixed cigarette butts not being persistent if the cigarette was put
out on purpose and landing on the floor.
- Fixed loss of registered persistence track on item pickup.
- Fixed persistent tracks when item is held by player.
- Removed all ash trays on the Horizon as their existence is now
persistent. One-time job for operations after merge.
- Fixed matter configuration on `/obj/item/material` not being set
during `set_material()`.
- Fixed persistent trash on space turfs.
- Minor adjustments in SQL/Readme.md.

---------

Signed-off-by: FabianK3 <21039694+FabianK3@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2026-03-17 13:12:57 +00:00
Cody BrittainandGitHub 108d2ca63a Added new effects for stasis (#22038)
Stasis now gives a ripple effect on the mob when they are under it, as
well as giving them a HUD icon. In addition, this improves stasis bed
code, fixing a bug and adding some neat stuff too.
2026-03-17 09:30:15 +00:00
SabreMLandGitHub 7be78d4c50 Fixed the last round in an ammo pile getting deleted (#22052)
## Description
Fixed a bug where splitting a stack of two cartridges would delete one
of them and cause a runtime. Both of these were caused in
`/obj/item/ammo_pile/proc/check_ammo()`.

In this case the proc is called after the second-to-last round has been
removed. The *intention* is for the final bullet to be moved onto the
floor, then the `/obj/item/ammo_pile` item is deleted, then the bullet
is equipped into the user's hand in its place.
In practice, the bullet is never actually removed from the pile's `ammo`
list, so it gets deleted alongside it when the list is cleaned up in
`/obj/item/ammo_pile/Destroy()`.

https://github.com/Aurorastation/Aurora.3/blob/ea939d0aa2cae35dc14dc1f41c94773b87b40003/code/modules/projectiles/ammunition/ammo_pile.dm#L125-L135
The runtime happens on L135 when it continues on after that since there
isn't a return. (`ammo` doesn't exist anymore).

## Media
### Before:


https://github.com/user-attachments/assets/dadad09f-5291-4f90-ad5b-9989d5d11735

**Result after unloading and manually reloading a magazine:**
<img width="315" height="82" alt="before 1"
src="https://github.com/user-attachments/assets/69e4ae2b-dbb9-4c2e-a1b9-30c911b08463"
/>

### After:


https://github.com/user-attachments/assets/13a5f4c4-0711-4f64-b74c-3f2bc968a4d3

**Result after unloading and manually reloading a magazine:**
<img width="315" height="81" alt="after 1"
src="https://github.com/user-attachments/assets/911e25e0-84b1-4a98-9bb3-8bca9469349e"
/>

## Changelog
  - ~~rscdel: Banished the ammo goblin, who fed upon loose cartridges.~~
- bugfix: Fixed the last round in an ammo pile (stack of cartridges)
getting deleted after the second-to-last round was removed.
- bugfix: Fixed 'runtime error: list index out of bounds' in
`/obj/item/ammo_pile/proc/check_ammo()`. (Not player facing)
2026-03-16 23:08:35 +00:00
Cody BrittainandGitHub b525005618 Nerf incendiary projectiles (#22015)
Incendiary projectiles, from things like hivebots, plasma weapons, and
incendiary shotguns, were too powerful. This nerfs them drastically.
2026-03-16 21:10:32 +00:00
BatrachophrenoandGitHub e7ce9356c8 Multiz Shield Gen balance adjustments (#22017)
Based on observed behavior in first live rounds following
https://github.com/Aurorastation/Aurora.3/pull/21862!

changes:
- balance: "Reduces Horizon multi-z hull generator Watt -> Renwick
conversion rate from 0.0002 to 0.00006, given increased capacitor
throughput and reactor outputs."
- balance: "Reduces maximum shield capacitor storage from 200 mJ to 20
mJ."
- bugfix: "Corrects Shield Capacitor TGUI displaying capacitor storage
as Watts instead of Joules."
2026-03-16 21:10:31 +00:00
2a3d3e4835 Vien Custom Item (#22023)
Somehow I kept thinking hazel and vien are the same person, hence the
branch name.

Anyway, yeah. Custom item prosthetic.

---------

Co-authored-by: WickedCybs <wickedcybs@gmail.com>
2026-03-16 21:10:23 +00:00
BatrachophrenoandGitHub 39f473bd31 Bugfixes - Shield Projectors, Luceian Items, Kinetic Harvester (#22042)
Fixes https://github.com/Aurorastation/Aurora.3/issues/22003
Fixes https://github.com/Aurorastation/Aurora.3/issues/22026

changes:
- bugfix: "Resolves some lingering weird behavior with emergency shield
projectors with regards to power draw."
- bugfix: "Updates Warding Spheres, Luminous Sceptres, and Azubarre
Torches to correctly emit light."
- bugfix: "Updates temp control unit to correctly use MOVABLE_LIGHT for
its light_system."
- bugfix: "Hull shield generator correctly checks for both capacitor
presence and activation state when toggling."
- qol: "INDRA Kinetic Harvester no longer disables harvesting a material
if it happens to drop to zero (less aggravation when staggering fuel
injection)."
2026-03-16 21:09:50 +00:00
ce8796c12f Fixed a rounding issue that made it so that organs would sometimes retain very small, unhealable amounts of damage when surgically fixed. (#22039)
Providing a damage value between 0 and 1 to the surgical fixing proc
would make it get rounded, and thus heal 0 damage.

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-14 19:48:45 +00:00
Stev-the-thirdandGitHub 5c05ae8c28 Recolourable slippers and SCC-branded slippers and a sleep mask (#22008)
What the title says, really. Adds generic recolourable slippers to the
load-out and the recovery ward (couldn't think of anywhere else to put
them), and SCC-branded slippers and a sleep mask. Fyni mentioned these
offhandedly once, like how some airlines will hand out branded sleep
masks and slippers to first class travelers, so I thought it'd be kinda
funny. Might add them to more places if people have suggestions of where
to, however I'm probably not going to add the SCC-branded stuff to the
load-out.

<img width="1280" height="960" alt="Export"
src="https://github.com/user-attachments/assets/eef5c383-77fb-451a-b96e-a818ef4d9d95"
/>
2026-03-14 16:27:07 +00:00
FenodyreeAvandGitHub 5c0e1c3b18 Fixes weapon analyzer not detecting self-charging guns (#22027)
Fixes the R&D weapon analyzer always showing that modular guns can't
self-charge, even when they can.
2026-03-14 16:27:02 +00:00
VMSolidusandGitHub 8bafeb0fb8 Zeng-Hu Mind Shielding (#21996)
This PR was requested by @Fyniiy and @nauticall for the _A Dream for
Tomorrow_ lore arc, as one of two new options for the crew to take when
dealing with ADPI in the Lemurian Sea. As a new lore development,
Zeng-Hu Pharmaceuticals has begun offering their own take on Mind
Blankers (previously a bioaug invented by the Federal Technocracy of
Galatea) as a commercial product marketed towards SCC employees
traveling into the Lemurian Sea. These implants were previously
restricted only to Galatean Humans and Offworlders, but are now expanded
in availability to any Psi-sensitive species (So not including Diona,
Vaurca, and IPCs).

https://wiki.aurorastation.org/index.php/Lemurian_Sea

<img width="1616" height="765" alt="image"
src="https://github.com/user-attachments/assets/ff16606d-acfb-4c84-b06a-2ab4d97e3138"
/>
2026-03-13 16:28:26 +00:00
6c23b4ca76 A few medical fixes. (#22022)
- Pneumalin no longer fixes damage on robotic lungs.
- Fixed augments not processing. This means that HUD augments are fixed
as well.
  - Fixed health analyzers displaying damage between 0 and 1 as 'none'.

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-12 20:04:12 +00:00
cbc219e7de Fixes slipping not dropping people. (#22020)
title, supersedes #22018

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-12 19:11:16 +00:00
BatrachophrenoandGitHub 5adff1b2ec Emergency Shield Projector activation guard logic (#22016)
Fixes a bug introduced in
https://github.com/Aurorastation/Aurora.3/pull/21862 that caused shield
projectors to activate during certain delayed process() ticks and when
dragged across an area boundary (only noticeable if doing so within the
radius of open space turfs).
2026-03-12 13:45:30 +00:00
33278949b1 Renames Engineer & Re-Introduction of Alt-Titles: Merge attempt (#22011)
https://github.com/Aurorastation/Aurora.3/pull/21195 is having some
weird merge issues, so this is put up to try to get it merged. No actual
changes from the other PR atm aside from merged master.

---------

Signed-off-by: KingOfThePing <43940569+KingOfThePing@users.noreply.github.com>
Co-authored-by: KingOfThePing <cb.back@gmx.de>
Co-authored-by: KingOfThePing <43940569+KingOfThePing@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: JohnWildkins <john.wildkins@gmail.com>
2026-03-11 17:34:00 +00:00
0c342878e5 Engineering spriting (detailing & port), portable shield balance, bugfixes (#21862)
EXTREMELY MINOR MISCELLANEOUS CHANGES TEEHEE

changes:
- imageadd: "Adds +bolted, +welded, +lights overlays to several large
machines for easier visual identification of whether or not clicking on
that emitter will kill you or not, etc."
- imageadd: "Modifies the base of the Shield Wall Generator sprite to
better match that of the Emergency Shield Projector (and so they can use
the same overlays mentioned above)."
- imageadd: "Tweaks the Emitter's directional sprites slightly so that
the base doesn't seem to change shape quite so drastically when
rotated."
- imageadd: "Ports very pretty space heater sprites made by Wallemations
and vinylspiders from /tg/."
  - imageadd: "Adds unique sprites for Old and Heavy-Duty power cells."
- balance: "Increases power draw and range of Emergency Shield
Projectors."
  - balance: "Increases power draw of Shield Wall Generators."
- balance: "Greatly reduces time for debugger to fix APCs corrupted by
electrical storms."
- balance: "Increases multi-z shield capacitor reserve charge and
maximum throughput, so that high-strength shields can actually be run
(at high power draw)."
- balance: "Tweaks the INDRA power output formula to scale better with
increasing temperature."
- balance: "Slight adjustments to space heater efficiency formula with a
friendly handwave to entropy."
- balance: "Old power cells have a 5% chance to be defective and have
slightly lower maxcharge than standard cells."
  - qol: "Adds extended examine hints to engineering objects."
- qol: "Extends list of object types which INDRA core field will
interact peacefully with."
- qol: "Improved space heater UX (chat msgs changed to balloon alerts,
audible feedback, etc.)"
  - code_imp: "Updates many code comments to use DMdocs."
- code_imp: "Consolidates various shield generation machine sprites in
scattered across multiple files into a single shield generator machines
sprite file."
  - bugfix: "Fixes Emergency Shield Projector hard del issue."
- bugfix: "Emergency Shield Projector now shuts down as intended if the
area's APC gets completely drained."
- bugfix: "Firing the gyrotron into the INDRA while no reactants are
present will no longer generate heat."
  - bugfix: "Fixes INDRA runtime."
- bugfix: "Fixes Power Monitoring app not displaying grid sensors when
run from a modular computer held in-hand."
  
  Bolted/welded down Emitter:
<img width="130" height="101" alt="Screenshot 2026-02-13 123842"
src="https://github.com/user-attachments/assets/8357b5ea-77e6-46f7-b4a0-724aaa141cef"
/>

Modified shieldwall sprites (with old ones for comparison)
<img width="667" height="103" alt="Screenshot 2026-02-13 111422"
src="https://github.com/user-attachments/assets/2b1e849e-f955-49cb-b094-0bef098a754f"
/>

Shields actually useful for damage control now (though they'll blow
through APC charge if you go as crazy as this):
<img width="804" height="891" alt="Screenshot 2026-02-13 124245"
src="https://github.com/user-attachments/assets/39268b42-5abe-4a3b-ba8a-a18bdc63873e"
/>

### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:

| Path | Original Author | License |
| --- | --- | --- |
| icons/obj/atmos.dmi (all "sheater*") | [Wallemations, VinylSpiders
(/tg/station #93800)](https://github.com/tgstation/tgstation/pull/93800)
| CC-BY-SA |

---------

Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2026-03-11 16:39:54 +00:00
Cody BrittainandGitHub adeaaaee4a Fixed balloon alert blending (#22006)
Balloon Alerts were sharing planes with NVG effects, causing them to
blend improperly. I re-added their proper plane, and ensured they work
again.
2026-03-11 16:38:55 +00:00
ElorgRHGandGitHub 6f63831667 Pants, skirt and shirt-ifies tajaran summer clothing (#21960)
Changes:
> - rscadd: "Added two new tajaran loadout options: pants and skirts +
shirts. Summer pants and dress (renamed to skirt) have been put there."
> - bugfix: "The tajaran summer dress and pants have been made into
pants slot items and should now display properly."

In the effort to fix the summer dress and pants not displaying properly
in the loadout selection they have been split up to their own respective
loadout options.
2026-03-11 16:38:30 +00:00
d6d2470ef6 Fixes paincrit (or incapacitation in general) not making people drop what they're holding. (#22004)
title

I was lied to by the incapacitation proc (it does not actually check
incapacitation necessarily)

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-11 00:04:05 +00:00
WildkinsandGitHub afd8d9d8e0 Lag War 2: Revengeance (#21950)
<img width="750" height="449" alt="image"
src="https://github.com/user-attachments/assets/29c06609-eb62-42be-9b9c-334f9fe88636"
/>

Ports: tgstation/tgstation#75769, tgstation/tgstation#72572,
tgstation/tgstation#93054

Fixes the holodeck causing 800 trillion hard dels that brings the server
to its knees. Stops turrets, weather system, and overmap contacts from
generating 500+ timers every tick by just using vars instead.

---------

Signed-off-by: Wildkins <john.wildkins@gmail.com>
2026-03-09 21:47:50 +00:00
1beef3d476 Collapses the lying down intent into normal resting. (#21967)
Instead of middle clicking to lie down, you now simply rest. You can
also now do it with your gun in your hand. Removes all code related to
bespoke lying down.

To-do:

- [x] Add a signal to make firearm accuracies update on lying down.

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-09 21:47:47 +00:00
b6dc5c017f Fixes admin announces sanitization. (#21994)
title

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2026-03-08 23:25:08 +00:00
WildkinsandGitHub 3633b556c7 Fix Tajaran movespeed (#21991)
Fixes #21974

Turns out we had ancient code that used a hardcoded bodytemp value to
lower people's movespeed if they got too cold. Tajara naturally want a
cooler body temp, and as a result they could end up movespeed nerfing
themselves silently. Now the movespeed nerf is pegged to
cold_discomfort_level, so your move speed will only be nerfed when you
start getting warnings about feeling too cold.
2026-03-08 01:31:28 +00:00
Greenjoe12345andGitHub 108e02dbf7 Adds Twin Suns and Raskara symbols to paperwork (#21966)
Adds the Twin Suns and Raskara cult symbols to paperwork ingame
<img width="447" height="539" alt="image"
src="https://github.com/user-attachments/assets/359ad815-b7dd-44c5-af0d-f495b47bbbbb"
/>


<img width="455" height="533" alt="image"
src="https://github.com/user-attachments/assets/70b839c1-a00c-4fe7-adc3-238ebca8b253"
/>


use [twinsuns] and [raskara_sigil] to draw them, with _small appended in
the brackets to draw the small versions


| Path | Original Author | License |
| All added images | Alberyk | Permission to use given via discord |
<img width="779" height="224" alt="image"
src="https://github.com/user-attachments/assets/acb99c2c-11c6-4f9e-a707-8ec63b0b274e"
/>
2026-03-07 08:36:21 +00:00
9eb93ace0b Add three more Dominian Banners (#21964)
Adds three new banners, for House Kaneko, von Sinzendorf and Seok. Yes I
am making a Seok character, how could you tell?

<img width="292" height="101" alt="image"
src="https://github.com/user-attachments/assets/2a95c5cc-b419-4625-8abe-63cc15a35277"
/>

All sprites by me.

Descriptions by Schwann / Human Lore.

---------

Signed-off-by: Fyni <itsfyni@gmail.com>
Co-authored-by: Kano <89972582+kano-dot@users.noreply.github.com>
2026-03-07 08:35:59 +00:00
ElorgRHGandGitHub ac06801f51 Loadout citizenship restrictions (#21963)
Changes:
>  - rscadd: "Added citizenship loadout restrictions to the loadout."
> - rscadd: "Dominian Consular loadout items are now citizenship
restricted to the Empire of Dominia."
> - bugfix: "Religion loadout restrictions now actually restrict items
to religions."

Could prove useful and actually restricts what should be allowed to be
taken in the loadout if characters don't fit certain criteria. Proof of
concept presented the Empire of Dominia and their consular clothing.
2026-03-07 08:35:45 +00:00