7049 Commits

Author SHA1 Message Date
Litogin
5236701ffc Revert "Заговорщики (#474)" (#480)
This reverts commit 51e8e5c3b0.
2026-02-07 20:53:38 +03:00
Nuxs
ceff9e969f rework age restrictions (#479) 2026-02-05 16:50:49 +03:00
tau
51e8e5c3b0 Заговорщики (#474)
* KITCHEN 2

* Illuminati

* Update Resources/ServerInfo/Guidebook/_WL/Antagonist/Conspirators.xml

Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/_WL/Antagonist/Conspirators.xml

Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* Update Resources/Locale/ru-RU/_WL/game-ticking/game-presets/preset-conspirator.ftl

Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* Illuminati 2

* Illuminati 3

* Illuminati 4 fix

---------

Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
2026-01-30 18:08:41 +03:00
MishaUnity
9ee377556c Тарелки и подносы (#473)
* Система подносов

* Небольшие правки

* Update tray.yml

* Фиксы
2026-01-24 14:50:59 +03:00
tau
6b1c0b93e4 Lobbyart (#467)
* Hotfixes

* Lang tweak
2026-01-18 16:35:47 +03:00
Charlotte Tezuka
346539ba44 Last dance 2026-01-17 20:57:48 +02:00
Charlotte Tezuka
0e3cebdb68 Merge branch 'master' into upstream 2026-01-14 18:18:43 +02:00
Charlotte Tezuka
ea713efb05 Merge remote-tracking branch 'corvax/master' into upstream 2026-01-14 18:15:24 +02:00
tau
87d6e5eff7 Languages v2 (#462)
* Languages v2

* Fixes

* Fixes 2

* Fixes 3

* Fixes yml
2026-01-14 15:33:46 +03: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
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
Vasilis The Pikachu
0ab3b1a075 Revert "feat: RnD tech research console now have reroll feature (#32931)"
This reverts commit 1f2d80297c.

Discussed during the maintainer meeting and voted to be reverted at this time.
2026-01-04 17:28:09 +01:00
Princess Cheeseballs
6cefe4299d [Staging] Let admins ignore the laws of physics again. (#42221)
admin ignore physics

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-03 20:39:17 +01:00
ArtisticRoomba
6e55a7bac4 Make some HeatContainerHelpers methods byref (#42197)
* make some HeatContainerHelpers methods byref

* all of them
2026-01-01 12:05:09 +00:00
Princess Cheeseballs
24005e3e93 Jet Injector Tweaks and Cleanup. (#42158)
* delete metabolismmovespeedmodifiersystem

* Revert "delete metabolismmovespeedmodifiersystem"

This reverts commit 19572fa0858bfb9385f4717fc77c8956bdbc56c0.

* misc cleanup

* math shows I should do this

* prevent popups

* fix handling as well

* this too

* actually these can create popups so just always handle em...

* remove comment

* final fixes

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-01 05:29:36 +00:00
Connor Huffine
1801f47418 Fix broken FTL references (#42181)
Add broken FTL links
2025-12-31 01:27:59 +00:00
Princess Cheeseballs
97a75f49c6 Damageable Cleanup + Bugfix (#42076)
* Does not build do not PR

* using blah blah blah rider hates me

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-31 00:42:49 +00:00
Crotalus
dc9d4accfd Fix warnings (#42175)
* Fix warnings

* Update Content.Server/Medical/DefibrillatorSystem.cs

* Update Content.Server/Medical/DefibrillatorSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-30 23:49:32 +00:00
Princess Cheeseballs
0b1e8a4bbc Status Effects Toolshed (#41670)
* toolshed :)

* Yeah they call me the gamer

* Fix test fails

* refactor: extract method ZeroAsNull

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-12-30 21:41:57 +00:00
OnyxTheBrave
3cc79c223a Chemmaster Pill Source (#40121)
* Buttons and basic internal data

* The buttons DO something

* it works?!!

* I hate predictions

* 5000 monkeys on typewritters

* who let the monkeys code?

* Localizations

* waiter, more commits please

* Not going insane (this is a lie)

* last one I SWEAR

* Some improvements ported from Moff

* clean it up a little

* one more cleanup

* The chemmaster is not a mime

* Fix my mistakes + address the other review

* Point to what chemmaster is broken, and why it's broken

* ChemMasterComponent changes

* Margin for packaging source

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-30 21:34:54 +00:00
Princess Cheeseballs
077dceeb2d Delete MetabolismMovespeedModifierSystem (#42134)
* delete metabolismmovespeedmodifiersystem

* Revert "delete metabolismmovespeedmodifiersystem"

This reverts commit 19572fa0858bfb9385f4717fc77c8956bdbc56c0.

* delete metabolismmovespeedmodifiersystem and component

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-28 23:22:04 +00:00
B_Kirill
01e583f500 Fix broken vending machine UI behavior (#42110)
* Fix broken vending machine UI behavior

* begone

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-12-28 00:57:02 +00:00
ScarKy0
662d2ee964 ReagentGrinder Comp and API to shared (#41956)
* init

* API

* review

* return

* review

* I tend to be stupid
2025-12-27 17:09:33 +00:00
EchoOfNothing
ee2f1da8c2 Merge IFF controls into one control. Make syndicate IFF turned off by default. (#42104)
* Merge IFF controls into one control.

* Implement logic to hide IFF of sydicate IFF console on map load. Add hideOnInit property to IFFConsoleComponent

* DataField

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-12-27 14:18:45 +00:00
B_Kirill
cd8d5a6a9c Cleanup warnings: CS0414, CS0618 (#42068)
Cleanup
2025-12-27 14:14:42 +00:00
ArtisticRoomba
8313a4e310 Atmospherics/Temperature HeatContainers (#39997)
* Initial HeatContainer logic

* comment fixes

* Comment changes + ChangeHeatCapacity

* highly intelligent specimen

* n-body full heat exchange methods

* extract to partials

* highly intelligent specimen

* fixes + ChangeHeatCapacityKeepTemperature

* Divide and merge methods

* even divide

* different merge signature

* forgot one little thing

* address review

* missing docs

* addr review

* oops

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-27 02:05:10 +00:00
GeneralGaws
2aa29de1ee Energy guns' fire mode text formating fix (#42103)
issue
2025-12-26 16:28:02 +00:00
Princess Cheeseballs
8b33f4734f Fix Kitchen Spike Paralysis by removing an unused subscription. (#42078)
* remove

* ACK ACK ACK ACK

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-26 07:41:27 +00:00
alexalexmax
4ff7411fb7 Voice mask effects are toggleable and hide your accent (#41965)
* apply negate accents system

* add toggle to voice mask ui

* roll negateaccents into voice mask system, delete negate accents comp&system, update yml entries

* convert button to ToggleButton and some cleanup

* retry for heisenfail

* accent toggle

* update names and add mask active check for accent hiding
2025-12-26 02:47:05 +00:00
Princess Cheeseballs
e197b7f9ad stable to master (#42038)
[HOTFIX] Fix MMI mind transfer (#41941)

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-12-23 22:57:41 -08:00
TemporalOroboros
6f38eed9d9 Splits temperature damage processing into its own component (#30515)
* Creates TemperatureDamageThresholdsComponent

* Obsolete TemperatureComponent fields

* Use TemperatureDamageThresholdsComponent
Moves all the uses of the relocated TemperatureComponent fields to use the TDTC versions

* Removes the obsolete TemperatureComponent fields

* Update YAML definitions

* Update doc comments

* Split TemperatureSystem
Creates TemperatureDamageSystem and moves the damage handling from TemperatureSystem

* Cull unused using statements

* Use component-based damage tick scheduling

* Fix temperature damage processing
Check was inverted resulting in things never starting to take temperature damage

* Poke tests

* Add TemperatureDamageThresholds to new prototypes

* Move TemperatureDamageThresholdsComponent to Shared
Parity with TemperatureComponent

* While I'm here
Fixes warning regarding obsolete ProtoId validator attribute

* Fix YAML errors

* Fix merge errors

* Rename TemperatureDamageThresholdsComponent -> TemperatureDamageComponent

* Use ContentHelpers.RoundToLevels for temperature alerts

* Fix YML

* A fuckton of cleanup

* working cleanup

* fix

* misc additions

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-24 06:37:11 +00:00
ScarKy0
9212f261ea [HOTFIX] Fix MMI mind transfer (#41941) 2025-12-23 22:34:10 -08:00
ArtisticRoomba
0ed5619e8b Fix atmos devices not correctly reffing the changed atmos (#41585) 2025-12-23 00:12:52 -08:00
ArtisticRoomba
dde01f746f Basic Dynamic Power Consumption Systems (#41885)
* init commit

* Addr reviews
2025-12-22 16:43:02 +00:00
Milon
f59ef4b986 fix solution contents duplication on spill behavior (#33231)
* I’M SCREAMING INTO THE VOID AND IT’S NOT LISTENING

* review

* explodes pancakes with mind

* graaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Meteors RAAAAAAAAAAH

* I'm so tired of solutions

* whhop

* revert

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-22 07:59:30 +00:00
Princess Cheeseballs
eb41d5010b Physics Assert in SharedMoverController (#37970)
* Physics asserts and Xenoarch fixes

* Fix blocking asserts

* Alright ready for the test fails

* Fix whitespace issues

* Fix whitespace

* Okay fix whitespace issues for real

* Fix test fails

* Temp fix

* Fix

* Whitespace

* Added a big ass comment

* Right

* A

* Should work

* Debug performance

* Mothership

* fix test fails real

* push

* fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-22 02:42:39 +00:00
Pieter-Jan Briers
787330f5c6 v269.0.0 RT update - .NET 10 (#41855)
* Make ServerPackaging automatically get extra server assemblies

* Make the switch

* Use Content.Server.deps.json instead

* Remove debug

* Rewrite

Now recursively fetches dependencies from Content.Server

Only copies dependencies not covered by Robust

This removes the need to manually specify most of the dependencies, even the content ones!

Also look at runtime key properly to figure out the proper dll name.

This actually removes some assemblies that were duplicated between the main directory and assemblies (various Microsoft.Extensions stuff)

* Fix test compile errors when updating dependencies

Ran across this while updating dependencies on the RT .NET 10 update. Should be fine to merge immediately.

* More .NET 10 prep

* Convert to SLNX

Hell yeah

* slnx now has size-2 indents

* Update SLNX with new RT system

* Remove reference to RT test in toolshed test

* Remove accidental usage of transitive RT dependencies

* Move Robust project references to RobustApi

* Update solution file

* Fix warnings in pow3r

* Fix nullable warnings in integration tests

idk where these came from

* gitignore binlog files

* Fix transitive dependency warnings in Content.Benchmarks

* Update slnx

* Okay, the Robust API thing didn't pan out. New plan.

It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible.

Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray!

This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard.

* Update RT to 269.0.0

* One last solution update

* Fix more data definition issues

* Update RT to 269.0.1

* Fix it again

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2025-12-22 01:24:24 +00:00
Sir Warock
f3f91e3f6b Miscellaneous Injector fixes + BorgHypo fill sprites. (#41932)
* Various fixes

* Fix Gorlex Hypo not showing visuals

* Give Borg Hypo Fill sprites

* Bluespace Syringe speed increase

* fix

* one whitespace change

* Undo debug change

* Replaced String Message with better

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-21 20:20:43 +00:00
Dmitry
4f4b71e8de merge remote wizden stable 2025-12-22 00:33:29 +07:00
Sir Warock
6932f28191 Merge Injector & Hypospray Systems & Components (#41833)
* Merge Injector & Hyposprays

* Fixes

* Requested Changes

* Preview

* Inclusion of Prototypes

* Fix

* small oversight

* Further fixes

* A few more fixes & Bluespacesyringe buff

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Final Commit, hopefully

* Merge conflict no more

* YML fix

* Add required changes

Co-Authored-By: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* cleanup warnings removal

* Bug fix & Maintainer Requests

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Adhere to requested changes

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

---------

Co-authored-by: āda <177162775+iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-20 23:58:26 +00:00
ArtisticRoomba
517b37698d Staging -> Master (#41929)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
2025-12-20 13:45:52 -08:00
Princess Cheeseballs
0444896603 [Staging/Hotfix] A couple bloodstream fixes. (#41906)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-20 12:54:14 -08:00
Perry Fraser
79f58a0314 Don't process paused MoverControllers (#39444)
* refactor: make MoverController use more queries

* perf: don't process paused MoverControllers

* perf: track active input movers via events

* Revert "place stored changeling identities next to each other (#39452)"

This reverts commit 9b5d2ff11b.

* perf: keep around the seen movers hashset

* fix: don't reintroduce wild wild west ordering

* style: use virtual method

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* docs: better ActiveInputMoverComponent motiviation

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* fix: pass through known comp

* fix: properly order relay movers for real

* perf: use proxy Transform() and inline it

Actually this might be a slight performance improvement since it avoids

the dictionary lookup until the case that its body status is on ground.

* style: switch an event handler to Entity<T>

* fix: just-in-case track for relay loops

* merg conflix

* borger

* whitespace moment

* whoops

* empty

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-20 19:24:04 +00:00
ScarKy0
e2ef727096 Log Station AI radial actions (#41911)
* fuck you and your anonymous zombie shocking

* ToUglyString

* because
2025-12-20 18:11:07 +00:00
SlamBamActionman
c4a798632a [Staging] Fix certain projectiles moving faster than intended (#41905)
Return to original value (25)
2025-12-19 11:28:06 -08:00
slarticodefast
3266c94eac Unify BatteryComponent and PredictedBatteryComponent (#41867)
* unify

* cleanup and merge conflicts

* floating points

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-19 18:18:12 +00:00
tau
1d0980991e Maxchars 30 -> 100 (#436) 2025-12-19 19:18:03 +03:00
Fildrance
1f2d80297c feat: RnD tech research console now have reroll feature (#32931)
* feat: RnD tech research console now have reroll feature

* fix: disable Rediscover button when there is not enough currency or user have no access

* refactor: xml-doc, extract method, minor simplify xaml

* minor cleanup after review

* refactor: change sending research server points amount into BUI from state to  ResearchServerComponent (using AfterAutoHandleStateEvent)

* feat: now tech rerolls will have cooldown to ensure no one can spam-spend all dept budget instantly

* refactor: revert unneeded code

* refactor: whitespaces

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-12-18 21:06:24 +00:00