10472 Commits

Author SHA1 Message Date
Zekins3366
38be9a956c buildfixes 2026-01-31 15:24:36 +03:00
Zekins3366
4b6f7d13f9 Merge remote-tracking branch 'upstream/master' 2026-01-31 14:58:49 +03:00
MishaUnity
883362a8d1 Кастомизация андроидов (#300)
* Новая кастомизация и исправления

* Дебаф стана от воды

* Последний штрих

* Update comment formatting for ShockDamage field

---------

Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
2026-01-31 14:11:59 +03:00
Gamewar360
4500ecab1e Бафф ЭмБэ культ (#287)
* fix-translate

* commit2

* Revert "commit2"

This reverts commit 47e4a1291e.

* Revert "fix-translate"

This reverts commit 65cd54a703.

* buffcult

* buff cult

* microbaff

* fix_plusmicrobaff

* Ed

Слишком много для игровой меты

---------

Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
2026-01-31 13:49:09 +03:00
HappyRoach
08baea27c3 Заточка оружия (#271)
* sharpening

* Delete On Sharpening

* Fix delete
2026-01-31 13:31:15 +03:00
Dmitry
7ee4e66e77 Merge pull request #3488 from DIMMoon1/upstream01.2
Upstream01.2
2026-01-20 12:46:48 +07:00
Pok
b462533f82 [Wiki] Подгрузка ВСЕГО на вики (#3487) 2026-01-20 03:28:44 +07:00
Dmitry
bd135d7604 merge remote wizden/stable 2026-01-19 05:58:27 +07:00
Vasilis The Pikachu
ca07d6be49 Revert "Allow station tiles to be placed on solid ground and other platings. (#38898)"
This reverts commit 418b2b70b0.

Maintainer vote decided to vote this out due to code quality issues. The original contributor is aware and will get help from a maintainer to reintroduce it
2026-01-18 21:53:21 +01:00
Dmitry
09db1f5b77 upstreamfix
1
2026-01-17 02:43:19 +07:00
Dmitry
f501ebec66 merge remote master wizden 2026-01-16 14:30:48 +07:00
Nemanja
d2ac15c76f Fix flatpacker exploit ignoring board costs (#42445)
Fix flatpacks ignoring costs and board requirements
2026-01-16 00:22:24 +00:00
B_Kirill
b14964398b Camera map (#39684)
* Camera map

* I hope this helps

* Review 1

* Review 2

* Review 3

* Review 4

* Review 5

* Colorblind mode support

* Review 6

* Change design

* Map wire

* Logic fix

* Fix a terrible mistake

* Fix

* Fix 2

* Small rename

* More fix

* Better removal

* And another fix

* Will it work?

* It is literally pointless

* some small things
2026-01-15 21:21:55 +00:00
Fruitsalad
4f997f2069 Cryo pod UI (#41850)
* Add CryoPodWindow (placeholder)

* Change HealthAnalyzerWindow: split off reusable HealthAnalyzerControl for cryo pod UI

* Improve CryoPodWindow: add health analyzer

* Improve CryoPodWindow: add eject button

This wasn't requested in the issue but I implemented it as practice with the UI system.

* Rewrote GasAnalyzerWindow, split off reusable gas mix viewer for cryo pod

* Change GasAnalyzerWindow: change back to three columns

With two rows you get a layouting bug when there's a lot of different gases, which looks somewhat bad. I didn't feel like fixing the layouting bug (it's an engine issue) so we're going back to three columns. That way you don't ever get two rows in practice.

* Change GasAnalyzerWindow: simplify by disabling Resizable

I added a lot of complexity to make resizable work nicely with a derived max & min size, but it's not necessary.

* Change GasAnalyzerWindow: file-wide namespace

* Change GasAnalyzerSystem: add GenerateGasMixEntry

* Split HealthAnalyzerUiState from HealthAnalyzerScannedUserMessage

* Rewrote CryoPodWindow, add atmos info

* Improve CryoPodWindow: add loading placeholder

* Improve CryoPodWindow: add internationalization support

* Fix GasAnalyzerControl: add missing translation

* Improve CryoPodWindow: add beaker info, high temperature warning

* Improve CryoPodWindow/System: inject button in window + necessary system changes

* Fix CryoPodWindow: Entering cryopod now closes window

This way you can't heal yourself with a cryopod.

* Change CryoPodWindow: add & update comments

* Change HealthAnalyzerComponent: remove `uiKey` property (no longer necessary)

* Tiny fixes

* Improve CryoPodUiMessage: replace string with enum

* Change GasAnalyzerWindow: simplify Measure code

* Change CryoPodComponent: rename Injecting to InjectionBuffer

* Change CryoPodBUI: tiny code simplification

* Fix HealthAnalyzerComponent: Removed stray import

* Improve CryoPodWindow: Prettier, concise atmos

* Improve CryoPodWindow: Chemicals bar chart

* Improve CryoPodWindow: Add Ruler to reagents

* Change CryoPodWindow: More horizontal layout

* Improve CryoPodWindow: Reduce height jiggling

The health analyzer's height changes a lot, which can be annoying with the buttons (for example when the oxygen damage label is popping in and out)

* Improve CryoPodWindow: Add setup checklist

This is mostly here to fill vertical space in the new horizontal layout.

* Improve CryoPodWindow: Eject beaker button

* Improve CryoPodWindow: Localization

* Improve CryoPodWindow: Add BeakerBarChart

An animated version of the chemicals chart

* Fix CryoPodSystem: Ejecting beaker no longer clears injection buffer

* Improve BeakerBarChart: Not animated on first frame

* Fix CryoPodWindow: Fix broken translation

* Improve CryoPodWindow: Reorder sections

* Fix BeakerBarChart: Tooltips now show up

* Change BeakerBarChart: Reorder functions

* Change CryoPodWindow: Reorder sections, change margins

* Change CryoPodWindow: Edit flavor text

* Revert changes to GasAnalyzerWindow

Since GasAnalyzerControl is no longer used in CryoPodWindow, these changes are no longer relevant to this PR.

* Tidy CryoPodWindow: Remove old workarounds

These are old layouting bug workarounds from the older version of CryoPodWindow that had a ScrollContainer in it. They're no longer necessary. Less ScrollContainers less problems.

* Tidy up: Remove unused imports

* Remove LabelledSplitBar

It was replaced by BeakerBarChart, which is a lot fancier.

* Tidy up: Tiny code style fix

* Change CryoPodSystem: Move code from server to shared

This is still without adding UI prediction

* move a ton of stuff to shared.

* one last thing

* Improve BeakerBarChart: Keep visual entry width when swapping beakers

* Improve BeakerBarChart: Respect beaker order of reagents

* Improve CryoPodWindow: Ensure space for injection buffer

 We need to keep space on the chart for the injection buffer after swapping to a full beaker.

* Improve CryoPodWindow: Prettier ejection error

* Improve CryoPodWindow: Add "Cooling patient" status

* BeakerBarChart: Fix UI scale bug

* BeakerBarChart: Fix bluespace beaker ugliness

* BeakerBarChart: Add more pod status strings

* HealthAnalyzerControl: Filewide namespace, sort imports

* Style fix: Replace `bool x = y` with `var x = y`

* CryoPodUiMessage: Split off separate class for inject

* SharedCryoPodSystem: Move message-related code into Subs.BuiEvents

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-15 17:52:03 +00:00
slarticodefast
5cda60f2f9 Predict defibrillators and add an integration test for them (#41572)
* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction

* predict

* readd zapping interacting mobs
2026-01-15 17:43:32 +00:00
B_Kirill
07076a5a32 Cleanup warnings: CS0414 (#42429)
cleanup
2026-01-15 13:37:11 +00:00
Pok
eff710e312 [Wiki] loc fix 2 (#3484) 2026-01-15 13:44:45 +07:00
TriviaSolari
d6377862c1 Reduce unnecessary ComponentInit work for airtight entities (#42390)
Refactor AirtightSystem to skip rotation checks for omnidirectional blocks on init

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-01-15 02:31:05 +00:00
ArtisticRoomba
f702dc8f2d Atmos GasSpecificHeats in shared (#42136) 2026-01-14 15:21:04 -08:00
TheFlyingSentry
d857acfc07 Fixed Containment Generators not updating pointlight correctly (#42289)
oh my god i've been overcomplicating this you don't want to know...
2026-01-14 21:19:59 +00:00
korczoczek
acdeac6172 Make lathes refund materials when recipe gets cancelled (#42416)
30 day free refund
2026-01-14 21:12:30 +00:00
Pok
d326420204 [Wiki] loc fix (#3483) 2026-01-14 23:52:54 +07:00
pathetic meowmeow
fb133494cc Decouple gibbing from the body system (#42405)
* Decouple gibbing from the body system

* allow gibs that don't drop giblets

* pass through user

* prediction gon

* comment

* destructible

* playpvs

* very very very very very very very minor cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-14 05:57:08 +00:00
Pok
1cc0f83350 [Wiki] Подгрузка всех ключей локализации (#3482) 2026-01-14 12:55:26 +07:00
ArtisticRoomba
6cae5d9c4a Fix TritiumFireReaction low fuel limiting behavior (#42407)
fix fuel burn limiting logic incorrectly taking max instead of min
2026-01-14 05:08:25 +00:00
ArtisticRoomba
60e172e128 AirtightSystem Tests (#42190) 2026-01-13 15:06:59 -08:00
Sarah C
c7e4f20f02 Fix tritium fires breaking conservation of mass (#41870)
* i can't believe this went unnoticed for so long

* i may be stupid
2026-01-13 22:16:09 +00:00
Velken
418b2b70b0 Allow station tiles to be placed on solid ground and other platings. (#38898)
* WORK IN PROGRESS 1

* ITS ALIVE, ALIVE!!!!

* clean up

* WIP 1

* fix small oversight

* big diff of doom

* added CVAR to tile history stack size

* component time

* filescoped namespaces + remove redundant nametag

* fix silly little mistakes

* typo

* TileStacksTest

* bweeeeeeh :P

* nuke cvar

* :3

* WIP2025

* Fix submodule

* It's beginning to look a lot like Christmas

* It's the Most Wonderful Time of the Year

* tiny fix

* fixed extra spacing on yaml

* slightly improve tilestacking test

* Part 1 out of 2 (part 2 tomorrow)

* Part 2

* add a simple tile construction test for tilestacking

* guh

* address reviews (no documentation yet)

* documentation be upon ye

* remove extra spaces

* prediction fix

* dirt

* oops :p

---------

Co-authored-by: Killerqu00 <killerqueen1777@gmail.com>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-01-13 13:51:40 +00:00
Errant
04bda3ad59 Role time tracking support for admins (#31776)
role time tracking support for admined players

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2026-01-13 10:22:04 +00:00
Princess Cheeseballs
4cd5d115bf Balance swing at Vestine (#42302)
* AAAAAAAAAAAAAAAAAAAAAAA

* whhops

* full range whoop

* less diff any%

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-13 07:29:34 +00:00
Quantum-cross
d06b18a8f0 Allow late join from arrivals to be considered for antagonist. (#39837)
* Allow late join from arrivals to be considered for antagonist.

* Don't use `PendingClockInComponent` to block late join antag selection, instead do an arrivals grid transform check with new helper function `IsOnArrivals`.

* Minor formatting fixes

* missing using

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2026-01-12 22:17:27 +00:00
chaisftw
360bfd6e1c Spray bottles with visible reagent contents (#42155)
* Spray bottles with visible reagent contents

* Fixed cargo catalog to correctly reference the new spray bottle rsi

* Fixed indentation on rsi meta files

* Updated copyright in spray_bottle.rsi meta

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

Co-authored-by: āda <ss.adasts@gmail.com>

* Updated to follow yml convention, modified to inherit from DrinkBase and renamed fill textures

* Fixed solution names

* Updated solution name in BorgMegaSprayBottle

* de-hardcode solution name

* less breaking

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-01-12 22:01:35 +00:00
SlamBamActionman
435b7d5cf8 Add the ability for station maps to track grids they are not on (#41248)
* Initial commit

* Accidentally included the nukie map changes

* Fix the gridcheck

* Addressing review

* Review change

* Review comments
2026-01-12 02:47:47 +00:00
SlamBamActionman
9338834b1b Add admin logs for connecting/disconnecting players (#42363)
* Initial commit

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-01-11 21:34:08 +00:00
KillanGenifer
aad5613341 playtime flag tweaks (#3481) 2026-01-11 02:35:35 +07:00
KillanGenifer
671eca79c1 Playtime adminflag (#3480) 2026-01-10 07:18:03 +07:00
Pok
51e7a39bad Predict DrainSystem (#41711)
* DrainSystem-move-to-shared

* random

* review

* review 2

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-01-09 14:18:07 +00:00
mikey
ec024001e7 Increase shuttle FTL cooldown to prevent FTL spamming (#42209)
* seperate out shuttle cooldowns

* fix

* feedback

* fix spacing

* update to TimeSpan

* GOAT float

* return to TimeSpan

* add var

* clarify with seconds

* clarifying some things
2026-01-09 06:44:22 +00:00
B_Kirill
386aca70c7 Add craft for bonfire and bonfire with stake (#42211)
* Add craft for bonfire and bonfire with stake

* review

* review

* nullable MaxFireStacks

* retry

* retry

* review

* I will change it and hope that they will agree with me

* Revert "I will change it and hope that they will agree with me"

This reverts commit 83823692d0116bf9aa9eceb85a10e95c88b51fb9.

* construction

Merged the graphs
Changed the bonfire stake ID to follow the proper naming scheme

* add destroy sound

* planks Instead of logs

* of course I forgot about ftl

* Slarti review + Princess review

Yes I sneaked an admeme abuse change here

* a small fix

* clamp firestacks

* This was on purpose, leave as is

This reverts commit 7d63e38b66cb63e5e50b7fac5030013e2ef508b5.

* irrelevant

* Fixtures

* cleanup

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-09 04:00:36 +00:00
Princess Cheeseballs
8ec4669bf9 Allow items spawned in the smart fridge to show up as an entry. (#42268)
* Allow items spawned in the smart fridge to show up in the view

* AAAAAAAAAAAAAAAAAA

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-09 00:35:39 +00:00
Tayrtahn
f8ff3a92aa Fix broken state when attempting to escape a locker while cuffed (#42313)
Check that the DoAfter starts successfully instead of just assuming it does.
2026-01-08 21:18:23 +00:00
LevitatingTree
5d5c61fefc Bring back shrug sanitization in a different form (#41236)
* Re-add chat-san & add o//

* changed o// to :?
2026-01-08 19:29:44 +00:00
Perry Fraser
e4ac948dec fix: respect AllowedSlots for gogo hat (#39189) 2026-01-08 19:25:43 +00:00
Tayrtahn
28e830f8b4 Fix forced vaping checking if the user's mouth is blocked instead of the target's. (#42311)
Swap user and target arguments of IngestionSystem.HasMouthAvailable call.
2026-01-08 19:09:23 +00:00
Dmitry
1a9a79cbba upstream codefix
kek
2026-01-08 18:11:46 +07:00
Dmitry
6187a5a7bd merge remote stable wizden 2026-01-08 10:32:52 +07:00
SomegnihT
03b7788774 Vox now say they become fried chicken upon taking enough heat dmg (#42280)
* Made it so that vox now say they become fried chicken upon taking enough heat dmg

* updated a comment to be more clear

* changed the name of bodyburnvox-text-other to bodyburn-vox-text-other

* forgot that I needed to also update the text in vox.yml to go with the previous commit change

* BurnBodyBehavior now takes bodyburn-text-others as default

* fixed suggested changes

* Relized I forgot to do a suggested change, I have now done it

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-01-07 19:24:19 +00:00
Gamewar360
e86f4578e9 Фикс Данталеона (#290)
* fix-translate

* commit2

* Revert "commit2"

This reverts commit 47e4a1291e.

* Revert "fix-translate"

This reverts commit 65cd54a703.

* Reapply "fix-translate"

This reverts commit ab4df3441e.

* Reapply "commit2"

This reverts commit caaab7eb62.

* hotfix
2026-01-07 21:21:22 +03:00
Samuka
41f91a9207 Xenoborg camera monitor now shows xenoborgs names (#42205)
* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name
2026-01-07 16:24:35 +00:00
ScarKy0
a8469ca509 Predict Rotting Examine (#42254)
* init

* review

* test

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-01-07 15:58:28 +00:00