Commit graph

10831 commits

Author SHA1 Message Date
Myra
2ef4f158cd
stable merge 2026 01 17 (#42508) 2026-01-18 23:35:49 +01:00
Vasilis The Pikachu
ff9798a0ca
Merge remote-tracking branch 'upstream/stable' into stable-merge-2026-01-17-2 2026-01-18 22:37:45 +01:00
pathetic meowmeow
0f28c568a1
Make sure simplemobs ghost on movement when dead (#42506) 2026-01-18 21:25:34 +00: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
Vasilis The Pikachu
e247ea5850
Revert "Fix RCD light spam, bypass of indestructible tiles and some plating fixes (#42432)"
This reverts commit 7d58e42ade.

Required to revert 418b2b70b0 via maintainer vote due to code quality issues.
2026-01-18 21:53:21 +01:00
pathetic meowmeow
af3547fd33
Let vox eat trash again (#42503) 2026-01-18 20:29:17 +00:00
ScarKy0
1a5d13fcac
[Hotfix] Delivery console unanchorable (#42499) 2026-01-18 16:30:55 +01:00
Kowlin
4e3cc7b7be
Adjust the role timers for certain roles. (#42372) 2026-01-17 20:10:25 +00:00
pathetic meowmeow
d0c2734dad
Nubody (#42419)
* Nubody

* fix test fails

* gibbing

* lung test returns

* doc comment

* hand organ test

* giblet test

* yaml formatting

* returning

* relocate

* trimming

* re-smite

* oops thusd tweak

* arachnids have slower metabolism i guess

* never mind the old behaviour is bad actually

* rider whyyy

* style changes and allat

* fix collision

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-17 00:39:35 +00:00
Velken
8a59ead61e
Admin Anomaly Scanner (#42443)
* admin anom scanner

* improvement

* green

* sprite
2026-01-16 22:08:52 +00:00
pathetic meowmeow
0d75154385
Fix core pinpointer pieces having a 5-pointer recipe (#42446) 2026-01-16 01:53:25 +00:00
ScarKy0
897a2d40bc
Add Mortar and Handheld Juicer (#42019)
* init

* API

* testing

* review

* return

* good enough, fix later

TODO:
Proper prototype
DoAfter
Sounds

* "proper" prototype

TODO
DoAfter
Sprite

* proper protos, mortar sprite

* juicer sprites

TODO:
Juicer sounds
Makeshift crafting recipes
Add regular to vendors

* sprite tweak

* juicing sound, cleanup, construction

* vendors

* line end

* attribution newline

* small balance tweak

* Let it be known id never webedit

* meta

* item size

* review

* handhelds

* partial review

* cache solution, looping

* graph

* review

* popup

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-01-16 00:19:42 +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
Velken
7d58e42ade
Fix RCD light spam, bypass of indestructible tiles and some plating fixes (#42432)
* No more light spam, and some plating fixes

* fixed test
2026-01-15 20:22:54 +00:00
ScarKy0
c7e8bbbf87
Add Paper Centrifuge (#42040)
* init

* sound

* sprite, half functional construction

* proper recipe

* oops

* loop sound

* inhands

* review

* review squared
2026-01-15 19:45:20 +00:00
āda
fdeb5a736d
Rebase vials to DrinkBase, closeable vials, mini vials (#36132)
* .rsi

* mini vial

* try stop TryStopNukeOpsFromConstantlyFailing from failing

* slight sprite change

* mail and lathe recipe

* real test fail

* resolve arbitrage

* cleanup

* always forgetting something

* always forgetting something

* drink no more

* remove integrated vial

* initial port

* Rename the rsi states

* Rename the rsi states

* up to standards

* finish

* testfail

* minor touchup

* arby

* op

* mix meta

* small changes to the vials

* commit

* commit

* style nit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-01-15 18:32:37 +00:00
rumaks
766f429fd9
Make chemicals not react inside pills (and stomachs) (#41457)
no reactions in pills
2026-01-15 17:52:24 +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
Samuka
bd096a044b
Make heavy xenoborg able to "swim" in space (#42415)
MovementAlwaysTouching
2026-01-15 16:54:20 +00:00
Connor Huffine
aa8a61b6ae
Make cancer mice actually hurt (#42298)
* Update animals.yml

* That was a bit too much
2026-01-15 16:30:07 +00:00
ArtisticRoomba
7532171090
Increase TEG power generation by 75% (#42421)
increase TEG power by 75%
2026-01-15 05:25:07 +00:00
SnappingOpossum
5d929533fc
Move artifact random spawners to entity table spawners. (#42422)
* Move artifact random spawners to entity tables

* That's a pretty big thing to miss

* This is embarassing

* Apply review
2026-01-15 04:27:16 +00:00
Samuka
e5ce73a471
Xenoborgs now drop pieces of pinpointer (#42295)
* add sprites

* update sprite

* repaired sprite

* repaired pinpointer

* different id

* piece of pinpointer core

* borgs drop the piece

* end of file new line

* typo

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

* make the tape darker

* four variations

* same variation in the crafting menu

---------

Co-authored-by: āda <ss.adasts@gmail.com>
2026-01-14 20:22:28 +00: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
ScarKy0
2399b61ca7
EmpResistance cleanup (#42402)
* init

* yeah

* Update SharedEmpSystem.cs
2026-01-14 00:59:19 +00:00
Sir Warock
7540c8f152
Pry open critical Borgs (#42319)
* One commit ops

* Please the maintainer gods

* More requested changes

* review

* actually this is probably a good idea

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-01-13 22:08:45 +00:00
ScarKy0
c860502e66
Viper High Capacity Ammo (#42392)
* yeah

* Fix sprite & let mk58 use the mag

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2026-01-13 18:17:22 +00:00
ScarKy0
f8a6a79928
Buff throwing knives kit (#42391)
init
2026-01-13 16:50:30 +00:00
War__Prophet
f0f0871609
WYA to Where you at (#42350)
* god is dead

* bro

* Update speech-chatsan.ftl
2026-01-13 14:07:20 +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
alexalexmax
738f55c456
Adds EMP Resistance component, gives it to ninja suit and headset (#42334)
* add comp and apply to ninja gear

* cleanup

* requested changes

---------

Co-authored-by: seanpimble <149889301+seanpimble@users.noreply.github.com>
2026-01-13 13:30:53 +00:00
ScarKy0
4d16565c2a
Lower smuggler's satchel price to 1TC (#42381)
Update uplink_catalog.yml
2026-01-13 10:02:29 +00:00
ScarKy0
6cbd19adfa
Lower hyperzine injector cost (#42383)
I love TC
2026-01-13 07:37:27 +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
Kowlin
de10a3a948
Allow the admin door remote to toggle overcharge (#42370)
* Allow the admin door remote to toggle overcharge

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-01-13 00:48:41 +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
Princess Cheeseballs
c9ec5e81f0
Medical Cyborg Modules Rework. (#42123)
* PUSH!!!

* Femtanyl

* eh swap em back

* My PR is ruined!!!

* review 2 electric boogaloo

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-12 20:56:37 +00:00
Kyle Tyo
06a962559a
Fix holywater locale string usage. (#42378)
Update chemistry-bottles.yml
2026-01-12 14:24:32 +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
ScarKy0
5025e0d286
Janiborg Module Cleanup (#42330)
init
2026-01-11 04:06:06 +00:00
ScarKy0
5d9371931a
Predict Mind State Examine (#42253)
* init

* review

* i might be stupid

* docs

* datafieldn't

* update comments
2026-01-10 23:02:56 +00:00
SolidSyn
32dafcf2ea
Foldable wig on clowns mask (#42208)
* Clowns base mask now has the ability to toggle the wig on and off.

* Changes the clown mask to have a foldable wig.

* Adds my credit for the wigless sprites in the meta.json

* Redid the description.

* Added an a to the description. Smiles.

* Resolved changes, thanks beck!
2026-01-10 16:48:33 +00:00
SlamBamActionman
a7fc17dfc4
Add the Syndicate Delivery Console + Corpsman Medicine Bundle (#41201)
* Initial commit

* Add a note to not abuse the darrrrn machine

* Remove nukie planet (hopefully) and fix duffelbag

* jug solution name

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-01-10 02:07:35 +00:00
Hitlinemoss
d7fcb03336
BUGFIX: Cabbage placed on taco shells no longer turns into a carrot (#42326)
BUGFIX: Cabbage places on tacos no longer looks like a carrot
2026-01-09 23:11:08 +00:00
B_Kirill
96d2339345
Fix projectile deceleration (#42320) 2026-01-09 18:31:49 +00:00
ScarKy0
85b3dcc9cc
Stake Admin Alert (#42324)
i forgot this is a thing
2026-01-09 17:48:46 +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
āda
019268b056
Remove battery from the handheld health analyzer (#42292)
* commit

* review

* review 2

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-01-08 19:25:15 +00:00
Princess Cheeseballs
e27ae3d428
Goliath Hardsuit Fixes (#42303)
goliath hardsuit fixes

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-08 10:51:47 +00:00
JackspajfMain
142ce2a59b
Fix Capitalization on HoP's Fountain Pen (#42300)
capitalization
2026-01-08 05:50:59 +00:00