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
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
Ed
bef78c62c0
Alchemical bomb ( #965 )
...
* smoke bomb system
* collector fixes
* bomb integration
* fix
* tweak
2025-03-03 14:06:50 +03: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
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
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
creamybag
8bbb0dad84
lute ( #962 )
2025-03-02 17:03:40 +03: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
Ed
2225de9ce4
switch to ru CBT
2025-03-01 14:13:46 +03:00
Nim
2d4ace0b10
Tip sprite ( #954 )
...
* tip sprite
* fix
* heh
* solution
2025-03-01 01:26:36 +03:00
Ed
b8c2d662b6
English OBT setup ( #956 )
...
* fix
* Update Dev.toml
2025-02-28 20:18:28 +03:00
Nim
310c711adf
tweak ( #953 )
2025-02-28 17:03:23 +03:00
Ed
3fd47443ae
Essence collector ( #952 )
...
* collector attract essence
* collector
* Update magic-essence.yml
* Update essence_collelctor.yml
2025-02-28 15:55:47 +03:00
ActiveMammmoth
cec05d697e
Staff of Animation Fixes ( #35491 )
...
* staff of animation fixes and system
* requested changes
* size back to normal
* Update AnimateSpellSystem.cs
---------
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
2025-02-27 20:11:57 +01:00
slarticodefast
3c20f63292
fix subwizard gamerule ( #35562 )
2025-02-27 14:01:20 -05:00
PJBot
439e1c6dc0
Automatic changelog update
2025-02-27 17:58:34 +00:00
SlamBamActionman
41c51e2905
Implanter draw rework ( #32136 )
...
* Initial commit
* Clean-up
* Fix ftl, new damage
* ftl fix for real
* Updates based on feedback
* Child implant fix
* Make the UI only open when implanter is in draw mode
* Review fixes
* shunting
2025-02-27 18:57:28 +01:00
PJBot
5fdf702e3c
Automatic changelog update
2025-02-27 17:45:02 +00:00
SlamBamActionman
c7b9a76342
Prevent crates, pet carriers and other things from going into disposals ( #35557 )
...
* Initial commit
* Solve underlying bug, readd to disposals
* Apply suggestions from code review
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-02-27 18:43:56 +01:00
PJBot
19c23682b0
Automatic changelog update
2025-02-27 17:26:20 +00:00
Aisu9
2db57f11ac
Sap-Syrup balance ( #32996 )
...
Sap-Pancake balance
Change the conversion rate from 12:1 to 2:1
2025-02-27 09:25:12 -08:00
Ed
f2c9fb6503
ballade balance
2025-02-27 17:30:39 +03:00
PJBot
3f014d2b77
Automatic changelog update
2025-02-27 13:48:23 +00:00
deltanedas
7520d8a2c8
add button to print logprobe logs ( #32255 )
...
* add EntityName at the bottom of LogProbe
* pass User into CartridgeMessageEvent
* add button to print logprobe logs
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-27 14:47:16 +01:00
PJBot
4d0e63caeb
Automatic changelog update
2025-02-27 12:45:17 +00:00
āda
f80f305d1d
Add filters to uniform printer ( #34316 )
...
* uniform
* missing category
* lint
* bedsheets
* carpets
* typo
* indent
2025-02-27 13:44:10 +01:00
PJBot
e705d04a12
Automatic changelog update
2025-02-27 12:41:05 +00:00
kosticia
a5aab8b8a1
Fire resist now can be examined. ( #35183 )
2025-02-27 23:39:55 +11:00
slarticodefast
0c6081fe10
Fix egg cooking and make microwave code a little less bad ( #35459 )
2025-02-27 23:39:06 +11:00
Ed
3d398e89ab
integration whistler poison into alchemy ( #950 )
2025-02-27 15:12:30 +03:00
āda
3127f73c48
Multiple categories for lathe recipes ( #34315 )
...
* first
* lint
* changes
* change null comparison
* linq
* indent
* fix indent
---------
Co-authored-by: Milon <milonpl.git@proton.me >
2025-02-27 12:33:39 +01:00
Dora
53dc27cb1e
Adding sorting to chem master ( #34763 )
...
* Adding sorting to chem master
* Chem Master can now sort based on following categories
- Alphabetical
- Quantity
- Time Added to Machine
* Sorting is disabled by default and persist in the machine for everyone
* Removed some pointless code from Chem Master's UI
* Changed None and Time Added's text to reflect what they do better
* Minor adjustments to the code requested by maintainers
2025-02-27 12:19:52 +01:00
Nim
15d9657139
Invisible whistler ( #941 )
...
* invisible whistler
* Parts
* spike
* flavor
* flavor
* filter
* sprite
* demiplan
2025-02-27 14:02:30 +03:00
Ed
5524e029f4
Essence splitter ( #948 )
...
* disable rotting
* pipipi
* essence storage
* energy splitter
* Update essence_splitter.yml
* Update impact.png
* visual fixes
* sound fix
* Update twoHandedStaffs.yml
* unhardcode
* Update meta.json
* fix
2025-02-27 13:48:38 +03:00
PJBot
c20fb21ac1
Automatic changelog update
2025-02-27 10:47:17 +00:00
qwerltaz
7b0b401312
t-ray reveal for entities and draw depth fix ( #33012 )
...
* t-rays show above catwalk
* a
* RevealSubfloorComponent
* revealSubfloorOnScan, add it to catwalk
* TrayScanReveal sys and comp
* Rr
* handle anchoring
* use tile indices for vector2i
* fix IsUnderRevealingEntity reset on pvs pop in reanchor
* fix exception on TrayScanRevealComponent remove
* fix IsUnderRevealingEntity not updating on pvs enter
* update to ent
* make subfloor retain respect for their relative draw depth
* fix carpets not revealing subfloor on plating
* chapel carpet
* ??
* draw depth gap for subfloor entities.
* revert alpha change
* remove abs from draw depth difference
* move TrayScanReveal to client
* delete old refactor
* let's show them above puddles too
* Remove superfluous component classes
---------
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com >
2025-02-27 11:46:09 +01:00
PJBot
9a12bfd4e8
Automatic changelog update
2025-02-27 10:06:37 +00:00
MilenVolf
1c62e335b9
Add breakdown recipes for Insect and Ammonia blood ( #33614 )
2025-02-27 11:05:29 +01:00
