Commit Graph

31842 Commits

Author SHA1 Message Date
Vortebo
14c94968fc is this better? i cannot tell if it is better 2025-03-03 19:31:29 -06:00
Tayrtahn
50f7846bb1 Delete SolutionContainerVisualsComponent.InitialName (#35654) 2025-03-03 23:58:04 +01:00
PJBot
67b8f35a3c Automatic changelog update 2025-03-03 22:05:32 +00:00
DuckManZach
ff6c212335 Made butter require less milk (#35650)
made butter take less milk
2025-03-03 23:04:26 +01:00
Vortebo
f41c98b053 i dont have anything clever to say for this one 2025-03-03 15:08:23 -06:00
Ed
b7b52e664d Update Dev.toml 2025-03-03 23:59:32 +03:00
Ed
b202897c36 Merge pull request #968 from crystallpunk-14/ed-2025-03-03-upstream-stable-2
Stable upstream sync
2025-03-03 23:40:02 +03:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
Nim
2855cc906b Мелкий фикс перевода (#966)
* fix

* a

* ehh

* yep
2025-03-03 23:17:00 +03:00
Ed
81b9cdfff7 Alchemy integration test (#967)
* Update TryAllReactionsTest.cs

* test drive

* fix traveling ship roundremove

* Update CP14RoundRemoveShuttleSystem.cs

* Dev map update
2025-03-03 23:15:40 +03:00
PJBot
3f7a9cad7c Automatic changelog update 2025-03-03 16:38:35 +00:00
rokudara-sen
8b7f175f84 Added decelerator percentage drain (#35643)
* Added variable PercentageDrain to SinguloFoodComponent

* Set percentageDrain to 0.03 (3%) for anti particles

* Added percentageDrain logic in public OnConsumed

* Simplify SinguloFoodComponent and set percentageDrain to negative

* EnergyFactor now applies to positive values too

* Better commenting on EnergyFactor

* Update Content.Server/Singularity/Components/SinguloFoodComponent.cs

* Documentation of EnergyFactor

* Fixing spelling mistake

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-03-03 11:37:28 -05:00
PJBot
69115870ea Automatic changelog update 2025-03-03 15:55:50 +00:00
Velken
7a89fe5d33 Wizard's Magical Pen (#35623)
* wizard pen

* description change
2025-03-03 16:54:43 +01:00
Ed
3fb7cc0cd7 minor balance tweak 2025-03-03 18:43:44 +03:00
Ed
a0b190fd97 Update vials.yml 2025-03-03 16:55:12 +03:00
Ed
719ee50c96 CP14AreaEffectBehavior 2025-03-03 16:07:19 +03:00
Ed
c7c2e7265b Update essence_collector.yml 2025-03-03 14:37:13 +03:00
PJBot
ee690d9ee4 Automatic changelog update 2025-03-03 11:13:05 +00:00
Coolsurf6
913894a041 Changed Damage Overlay to check Burn Damage (#34535)
* updated BruteLevel to be PainLevel with burn damage checks in DamageOverlayUiController.cs

* dehardcoded pain level by adding damage groups to paindamagegroups to affect

* re-added the name for painDamageGroups

* fixed overlay default and added minimum limit to component check first

* renamed to PainDamageGroups and removed obsolete tag
2025-03-03 12:11:58 +01:00
Ed
bef78c62c0 Alchemical bomb (#965)
* smoke bomb system

* collector fixes

* bomb integration

* fix

* tweak
2025-03-03 14:06:50 +03:00
PJBot
f42c1bc933 Automatic changelog update 2025-03-03 10:05:42 +00:00
Hannah Giovanna Dawson
78b2b361e8 Save Space Station 14 from the Toilet Gibber Forever (#35587)
* The evil is defeated

* Tag body bags

* uwu, cwush me cwusher-chan

* absolute 18+ sloggery

* botos binted? 👽
2025-03-03 11:04:33 +01:00
VideoKompany
bab794e68f Added 'arrow' to the names of the arrowheads (#964)
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
2025-03-03 10:37:36 +03:00
Errant
184edfe71d Merge stable to master (#35640) 2025-03-03 08:04:07 +01:00
Errant
3d9ce10f58 Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new players" (#35639)
Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new playe…"

This reverts commit 4dfd3e5740.
2025-03-03 07:49:13 +01:00
Nim
9ea547d8be Перевод на RU (#949)
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
2025-03-03 09:38:09 +03:00
Tayrtahn
7e7d12d437 Add GetBaseName method to NameModifierSystem (#35633)
* Add GetBaseName method to NameModifierSystem

* Use Name
2025-03-03 02:03:16 +01:00
PJBot
36021f1702 Automatic changelog update 2025-03-02 20:59:22 +00:00
HTML/Crystal
8fc78f63d9 Better Insectoid Glasses (#31812)
Sprites and file changes

Adds the variants for arachnid and moth glasses, adds the code for those in the meta.json files, and adds the speciesID tag in both arachnid and moth prototype files.
2025-03-02 15:58:15 -05:00
Emisse
5b078e3978 centcomm update (#35627) 2025-03-02 13:53:56 -07:00
slarticodefast
6f1df2b62f Merge stable into master (#35626) 2025-03-02 21:36:14 +01:00
beck-thompson
4dfd3e5740 [HOTFIX] - Players with unknown playtimes now are tagged as new players (#35564)
* Players with unknown playtimes now are tagged as new players

* Fix

* I'm silly it was in the same file

* Cavar update
2025-03-02 20:45:54 +01:00
Errant
7bf09bfdb5 add altered silicon to rules (#35455)
* add altered silicon to rules

* skreee

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>

---------

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
2025-03-02 20:41:07 +01:00
SlamBamActionman
08cb26dbf0 Hotfix: Fix uplinks allowing buying conditionally restricted items (#35334)
* Initial commit

* I just compressed the code

* Actually address review
2025-03-02 20:40:57 +01:00
creamybag
a16dd2fd3e Shirts in pants #2 (#934)
* New shirt, all fix

* merchant,chainmail
2025-03-02 22:16:34 +03:00
PJBot
469bb1a9ec Automatic changelog update 2025-03-02 15:51:20 +00:00
slarticodefast
ceff2bea00 Cloning Refactor and bugfixes (#35555)
* cloning refactor

* cleanup and fixes

* don't pick from 0

* give dwarves the correct species

* fix dna and bloodstream reagent data cloning

* don't copy helmets

* be less redundant
2025-03-02 16:50:12 +01:00
creamybag
8bbb0dad84 lute (#962) 2025-03-02 17:03:40 +03:00
Myra
02d3595faa Stable merge (#35620) 2025-03-02 13:58:59 +01:00
PJBot
ce7bb813d2 Automatic changelog update 2025-03-02 12:56:18 +00:00
Myra
51754f09ce #32209 changelog (#35619)
Since it was merged into staging no changelog was made, but we should at least have it for next release. (And vulture)
2025-03-02 13:55:10 +01:00
Myra
98cca7b0f8 Change Phalanximine to be more complex, increase Arithrazine damage (#32209) 2025-03-02 13:47:11 +01:00
Ed
8652e71b39 Essence nodes (#961)
* essence nodes

* Update essence_nodes.yml
2025-03-02 15:13:21 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
2025-03-02 13:28:13 +03:00
PJBot
7ea586cc1c Automatic changelog update 2025-03-02 02:49:00 +00:00
metalgearsloth
a8ebcac5c9 Predict vending machine UI (#33412) 2025-03-02 13:47:52 +11:00
PJBot
ba1504d0d6 Automatic changelog update 2025-03-02 02:31:03 +00:00
metalgearsloth
d9e86b3e81 Revert "Make radioactive material radioactive" (#35330) 2025-03-02 13:29:54 +11:00
deltanedas
66e926843f fix cluwne pda pen slot (#35611)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-02 00:33:24 +01:00