5678 Commits

Author SHA1 Message Date
Litogin
5236701ffc Revert "Заговорщики (#474)" (#480)
This reverts commit 51e8e5c3b0.
2026-02-07 20:53:38 +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
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
Nuxs
1932daf402 skill confirm button rework (#461) 2026-01-14 15:34:53 +03:00
Litogin
be81cf4b4c Return color UI WL (#455)
* add wl tones

* Return color UI WL
2026-01-10 21:34:03 +03:00
Dmitry
37c4e15d32 0 sourse fix 2026-01-08 20:01:57 +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
Princess Cheeseballs
5207c0694a Fix admin loc spam 2 (#42265) 2026-01-06 20:29:10 +01:00
Centronias
4d9c25098b Fix localization missing spam from Admin Overlay (#42244)
playerInfo.StartingJob is already localized
2026-01-05 03:01:00 -08: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
3ab84443f9 [STAGING] Staging Chat Fix (#42206)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-04 01:24:18 +01:00
Princess Cheeseballs
267357a4b0 Fix all currently known markup issues (#42032)
* fix 1

* fafa

* remove

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-01 21:17:43 +01:00
Jessica M
41234b7eb1 Move borg module remove button to the left side (#42119)
Move module remove button to the left side

Co-authored-by: Jessica M <jessica@maybe.sh>
2025-12-30 23:13:59 +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
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
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
eoineoineoin
b436e2a937 Fix missing scrollbars in Admin Player List window (#40525)
* Fix missing scrollbars in Admin Player List window

* Revert "Fix missing scrollbars in Admin Player List window"

This reverts commit c5aea1a0550deb1d1d7aae4e2dec964e93d2d8ae.

* Invalidate cached item height when item generation callback changes
2025-12-22 16:41: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
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
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
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
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
slarticodefast
19126949c3 wallmount debug overlay (#38495)
* wallmount debug overlay

* make circles a little smoother

* add permissions

* Update Resources/Locale/en-US/commands/show-wallmounts-command.ftl

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* fix

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-16 19:19:37 +00:00
Samuka
0fb6f26edb Xenoborg door control module (#41546)
* add door control module

* some commentary

* can't eject stuff anymore

* make xenoborg door remote eletrify doors

* clean yml

* anchors and aliases

* not show stuff about id in xenoborg access config

* engi xenoborg can see eletrified doors
2025-12-16 01:24:54 +00:00
JunJun
ae8d7ab59d Thermal and Night Vision update (#429)
* base

* fix

* fix

* fix2

* xeno

* xenoborg + locale
2025-12-15 14:19:24 +03:00
beck-thompson
42e7bad3df Fix news console formatting and pda news formating (#41799)
* Fix news console formatting

* another fix

* Fix review

Un-copy-paste. Twice. *sigh*

---------

Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-12-15 03:19:41 +00:00
Pieter-Jan Briers
a0817cdbb3 Fix ColorExtensions math (#41717)
All of this was doing sRGB -> OkLAB conversions without linearizing the sRGB first, so it was broken. I could have sworn I pointed this out in review but I guess that got lost.

Also, add a gamut clipping step since we have out-of-gamut colors and I don't want random negative values causing weird nightmare bugs somewhere. Shouldn't change anything in regular rendering.
2025-12-15 03:07:32 +01:00
Pupchansky
b7763588aa Musical automat changes (#400)
* рефакторинг JukeboxSystem и добавление новых треков

* МИНИ ФИКСЫ

* еще фиксы

* чучучут

* мир фиксов

* фиксы от кодрэббита

* TinTinOnTheMoonRemix добавлена в лобби

* добавлены треки от MRX и mrjajkes. +чучут отредачены attributions.yml

* забыл убрать тире

* добавлены почему-то не добавленные раньше wl-changes теги

* ебал в рот названия коммитов

* трек фури добавлен в лобби
2025-12-15 00:14:31 +03:00
JrInventor05Next
cc510eecff Alert level rework (#424)
* start

* stage

* delete trash

* cleanup

* comments

* fix

* code rabbit review

* review changes

review by Pupchansky
2025-12-15 00:03:54 +03:00
Borsh
6fc13a5875 Adding a random gate (#41627)
* Added random gate

* minor edit

* cleaning up my shit after trying to do something faster

* new lines

* some changes

* joke

* UI

* Long Division

* Dont use ctrl + x in 3 am

* I hope these are the final touches

* One thing, I don't know why

* noname commit

* no way, 1kk of code lines edit

* sudo rm -rf ... and something there...

* update

* sometimes its sad
2025-12-14 19:15:22 +00:00
ScarKy0
40ae49bb85 Killsign cleanup (#41845)
* init

* rsi

* review

* scale

* it

* cat, dog, nerd

* rsi

* I just microbalanced animation speed

* raider, stinky resprite

* review

* HideFromOwner

* hidden smite

* copyright

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-12-14 02:04:28 +00:00
Pok
19bad6266f Predict RootableSystem (#41729)
RootableSystem-move-to-shared
2025-12-10 12:27:06 +00:00
Dmitry
8eb0cdde41 merge remote upstream 2025-12-10 03:12:01 +07:00
slarticodefast
0031beca4b Reapply "Trip APCs when they exceed a power limit (#41377)" (#41789)
Revert "Merge stable into master"
2025-12-08 10:35:11 +00:00
slarticodefast
406231cdb3 Merge stable into master (#41781)
Revert "Trip APCs when they exceed a power limit (#41377)" (#41766)

This reverts commit a5c223c0

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-08 11:14:13 +01:00
ArtisticRoomba
c867adb937 Revert "Trip APCs when they exceed a power limit (#41377)" (#41766)
This reverts commit a5c223c0
2025-12-08 04:23:45 +01:00
Princess Cheeseballs
34f60c115e Add GenPop Enter/Leave to ID Card Computer. Add shuffle the accesses a bit. (#41739)
fixe

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-07 16:14:38 +00:00
Pupchansky
b3230ae3e1 Фикс языка ниан (#416)
* фикс emoteObfusctation логики + небольшой рефакторинг

* еще фиксы
2025-12-06 21:42:35 +03:00
B_Kirill
fca8d95f03 Cleanup warnings: CS0114, CS0414, CS0618 (#41578)
* Cleanup

* Revert
2025-12-05 15:53:07 +00:00
Pieter-Jan Briers
3944268fe4 Fix shuttle FTL with UI scale (#40933)
Fixed click inputs being broken

Fixed rendering of background parallax.
2025-12-05 14:53:35 +00:00
Pieter-Jan Briers
da3e331366 C# 14 fixes (#41708)
Necessary for the move to .NET 10 & C# 14. Actual PR to change SS14 to C# 14 will be separate.
2025-12-05 12:37:02 +00:00
Pok
737bd3e22c Predict BedSystem (#41686)
* BedSystem-move-to-shared

* dependency

* dirty!!!
2025-12-03 19:44:17 +00:00
SlamBamActionman
d0a784b9e6 Add status effect support to Traits, change PainNumbness to be a status effect (#41646)
* Initial commit

* Review comments

* Jobify

* Prototype(effect)
2025-12-03 11:55:29 +00:00
Pok
ae55204f9f Move some admin components to shared (#41677)
* AdminSystem-move-to-shared

* review
2025-12-02 19:39:21 +00:00