Commit Graph

34595 Commits

Author SHA1 Message Date
Ed
3f7bb1f5c6 ADAPTATION 2025-07-08 11:46:35 +03:00
Ed
7a8326d41e Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
2025-07-08 00:40:30 +03:00
SlamBamActionman
2181585030 Add Breach of Permanent Confinement to Space Law (#38663)
* Initial commit

* Fix category in text
2025-07-07 19:01:52 +02:00
slarticodefast
a03c35a9bc sanitize MIDI parser (#38806)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2025-07-07 14:23:45 +02:00
CrystallEdge Server
e7b73354ab Automatic changelog update 2025-07-07 11:51:43 +03:00
paige404
99812387ac Birch Furniture by Sable (#1438)
* Add birch furniture construction to the wooden furniture graphs. Birch versions of the bed, table, counter, chair, bench, window, and roof are included.

* Fix malformed licenses

* Add birch table frame to fix failing integration tests. Sprite still required

* Add sable's birch table frame.
2025-07-07 11:50:38 +03:00
Hannah Giovanna Dawson
5f7db3b151 Scurret displacement map fixes (#38775) 2025-07-07 00:42:13 +02:00
Hannah Giovanna Dawson
f5fd2dcb76 Scurret naming fixes (#38776)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-07 00:30:44 +02:00
Vasilis The Pikachu
575694e5b5 Changelog removal 2025-07-07 00:10:04 +02:00
Vasilis The Pikachu
87b8f1c7df Revert "Readds the Hypereutactic Blade for traitors, adds Hypereutatic blade for Nukies (#37182)"
This reverts commit c03afeb29c.

Please check the maintainer meeting for details
2025-07-07 00:02:16 +02:00
Vasilis The Pikachu
b650d3298e Revert "HoP's beret (#38601)"
This reverts commit e9c90fe66d.

Please check the maintainer meeting for details
2025-07-07 00:01:55 +02:00
CrystallEdge Server
54bf6028c3 Automatic changelog update 2025-07-06 17:38:48 +03:00
Red
b0594f563d New MRP ruleset for server (#1334)
* rules

* Update Dev.toml

* github feedback applied

* ru feedback applied

* gogenych part feedback

* мукиф
2025-07-06 17:37:43 +03:00
CrystallEdge Server
595eb5418d Automatic changelog update 2025-07-06 17:36:56 +03:00
Red
30d7da4b2b Ed 06 07 2025 guards trading (#1505)
* guard trading

* Refactor trading reputation special and update guard assets

Renamed CP14AddGlobalReputationSpecial to CP14AddTradingReputationSpecial and updated its logic to use a configurable set of factions. Updated job prototypes for guard, guard commander, investigator, and merchant to use the new special and specify relevant factions. Also updated guard helmet textures and metadata.
2025-07-06 17:35:49 +03:00
Hannah Giovanna Dawson
654a459351 Scurrets get emergency EVA suit access (#38778)
* Scurrets - spacing protection via adorable outfits

* ALPHABETIZATION!!
2025-07-06 15:08:56 +02:00
CrystallEdge Server
2a187659ba Automatic changelog update 2025-07-06 14:30:03 +03:00
Red
6b6d6ae3f9 return guards to Comoss (#1504)
* return guards to Comoss

* salary system

* Update Frigid_Coast.yml

* Update migration.yml
2025-07-06 14:28:57 +03:00
CrystallEdge Server
a45ba883af Automatic changelog update 2025-07-06 00:10:08 +03:00
Red
6570b1b4b6 Public market + Solutions requests (#1503)
* Add platform markup to trading platform prices

Introduces a PlatformMarkupProcent field to CP14TradingPlatformComponent and applies it to price calculations in both client and server logic. Adds a new public trading platform entity with a higher markup and updates related sprites and metadata.

* Add platform markup percent to selling platforms

Introduces a PlatformMarkupProcent field to CP14SellingPlatformComponent, allowing selling platforms to apply a markup or markdown to item prices. Updates server logic to use this value when calculating payouts and UI state. Adds a new public selling platform entity with a lower markup in the trade_platform.yml prototype.

* Add Brad Potions trading requests prototype

Introduces a new YAML prototype defining multiple cp14TradingRequest entries for the BradPotions faction, each specifying requirements for various potion effects with minimum purity and amount.

* Apply platform markup to selling prices and payouts

Updated the selling request control and platform window to factor in the platform's markup percentage when displaying prices. Adjusted the server-side payout logic to multiply the payout by the platform markup percentage, ensuring consistency between client display and server rewards.

* replace mapping to public platforms

* bug + remove eepy potions request

* Clarify purity requirement in workbench reagent text

Updated the reagent requirement string in both English and Russian locale files to indicate that the required purity is '{$purity}%+' instead of just '{$purity}%'. This clarifies that the purity must be at least the specified percentage.
2025-07-06 00:09:03 +03:00
Hannah Giovanna Dawson
3540e2e44a Scurret PDA slot fix (#38777) 2025-07-05 22:15:54 +02:00
CrystallEdge Server
ae89cb8821 Automatic changelog update 2025-07-05 20:45:43 +03:00
Red
14b0fc5b4a Workbench and crystals (#1502)
* solutionResource

* fuck research system + QoL workbench update

* colorful quartz returns

* Refactor workbench skill requirements handling

Replaces the SkillRequired requirement with a direct RequiredSkills field on CP14WorkbenchRecipePrototype. Updates client and server logic to check skills directly, simplifying recipe skill checks and related UI logic.

* Initial commit

Add initial project files and setup.
2025-07-05 20:44:38 +03:00
CrystallEdge Server
c01351c1ef Automatic changelog update 2025-07-05 17:39:11 +03:00
gogenych
ab26a9b127 first (#1501) 2025-07-05 17:38:05 +03:00
CrystallEdge Server
70c0a2255e Automatic changelog update 2025-07-05 14:55:15 +03:00
Red
a68da0eacd Magotech (#1498)
* Add brass material, bars

Introduces the new brass material, including its prototype, stack, and bar entities, along with associated sprites. Updates English and Russian localization files to include brass and adds a new construction condition for mana power. Also moves glass sheet entities to the correct file.

* Add CP14ManaFilled construction condition

Introduces a new construction condition that checks if an entity's mana container is fully filled. Includes examination feedback and construction guide entry for user clarity.

* electromancy respawn

* Update T2.yml

* Update meta.json

* ffif

* Update speed_ballade.yml

* Update thaumaturgy.yml

* Update undead.yml
2025-07-05 14:54:09 +03:00
CrystallEdge Server
82876b2c6f Automatic changelog update 2025-07-05 10:08:20 +03:00
Kit
84ec067d57 grer terra (#1500) 2025-07-05 10:07:15 +03:00
Ed
a5dd7f3a68 Update CP14RoundEndSystem.CBT.cs 2025-07-04 21:49:52 +03:00
CrystallEdge Server
63d02d8325 Automatic changelog update 2025-07-04 18:33:49 +03:00
Kit
17873f415b Solutions tweaks (#1497)
* soothing cooling

* warming well warming

* incind buff

* Ice cooling unsafe

* blood potions nerfs

* Stamina Chromium slime
2025-07-04 18:32:44 +03:00
CrystallEdge Server
b681c41f79 Automatic changelog update 2025-07-04 17:37:04 +03:00
Nim
cb01a6b66c Reprise of doors, vials, and labeler (#1495)
* birch door

* hand labeler

* vial

* fix door

* vials

* frame
2025-07-04 17:35:59 +03:00
CrystallEdge Server
50862d7045 Automatic changelog update 2025-07-04 17:30:25 +03:00
Kit
94455f55f2 Saturating and moisture recipes (#1496)
* Bestia Essence

* Target Recipies

* Essence bestia stuff

* Magic type fix
2025-07-04 17:29:20 +03:00
Leon Friedrich
32f0ba340a Fix TextLinkTag (#32203) 2025-07-03 21:11:21 +02:00
PJBot
f6946f1db7 Automatic changelog update 2025-07-03 18:52:49 +00:00
SlamBamActionman
44617ae841 Exo - Minor balance changes and fixes (#38689) 2025-07-03 11:51:40 -07:00
Pieter-Jan Briers
e99fc501a6 Revert biome rework (#38724)
* Revert "Fix world generation (#38713)"

This reverts commit 10fa6ff4af.

* Revert "Biome rework (#37735)"

This reverts commit fe7b96147c.
2025-07-03 20:48:04 +02:00
PJBot
047a49a505 Automatic changelog update 2025-07-03 16:01:46 +00:00
ArtisticRoomba
f874459092 Pressure Relief Valve (#36708)
* initial system (this math is probably WRONG)

* General code cleanup and OnExamined support
(holy moly this code sucks)

* UICode and related events foundation
TODO:
- Actually write the XAML UI and the underlying system
- Un-shitcode the entire thing
- Actually test everything...

* Working UI code
TODO: Make predicted, as this certainly isn't predicted. Even though I said it was. It isn't.

* Remove one TODO for unshitcoding the examine code

* Add reminder
yea

* Make predicted (defenitely isn't)
(also defenitely isn't a copypaste from pressure pump code)

* It's predicted!
TODO:
- Give it snazzy predicted visuals!
- Have a different field for pressure entry, lest it gets bulldozed every UI update.

* Improve gas pressure relief valve UI
TODO: Reminder to reduce amount of dirties using deltafields

* Implement DirtyField prediction

* Entity<T> cleanup
A lot of Entity<T> conversions and lukewarm cleanup.

Also got caught copy pasting code in 4K UHD but it's not like you couldn't tell.

* More cleanup and comments

* Remove TODO comment on bulldozing window title

* """refactoring"""
- Move appearance out of shared and finally fix it. Pointless to predict appearance in this instance.
- More Entity<T> conversions because I like them.
- Move UI creation handling over entirely to the ActivatableUI system.
- Fix a hardcoded locale string (why????).

* Add visuals

* Revert debugging variable replacememt
yea

* Revert skissue

* Remove unused using directives and remove TODO

* Localize, cleanup, document

* Fix adminlogging discrepancy

* Add ability to construct, add guidebook entry

* Clear up comment

* Add guidebook tooltip to valve

* Convert GasPressureReliefValveBoundUserInterface declaration into primary constructor

* Adds more input handling and adds autofill on open

* Un-deepfry input validator shitcode
Genuinely what was I smoking

* improve visuals logic

* Refactor again
- Update math to the correct implementation
- Moved code that could be re-used in the future into a helper method under AtmosphereSystem.Gases.cs

* I'm sorry but I hate warnings

* Remove unused using directive in AtmosphereSystem.Gases.cs

* Review and cleanup

* Lukewarm UI glossup

* Maintainer for the upstream project btw

* Remove redundant state sets and messy logic

* Unduplicate valve updater code

* Redo UI (im sorry Slarti)

* run tests

* Test refactored UI messaging

* Second round of UI improvements
- God please find a way to improve this system. Feels bad.

* Update loop implementation

* Further predict UI

* Clear up SetToCurrentThreshold

* cleanup

* Update to master + pipe layers and bug fixes
want to run tests

* fixes

* Deploy rename pipebomb

* Documentation and requested changes

* Rename the method that wiggled away

* Undo rounding changes

* Fix comment

* Rename and cleanup

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-03 18:00:34 +02:00
Hannah Giovanna Dawson
1bc3d37d40 Scurrets - Audio Improvements (#38482)
* Scurret audio tuning

* Add new sfx

* Update sneezing sfx

* YAML support

* Rename a folder
2025-07-03 17:28:44 +02:00
Ed
18f58c9fe5 move speed ballade to electro 2025-07-03 18:16:03 +03:00
Kowlin
10fa6ff4af Fix world generation (#38713)
* Fix world generation

* Remove unused impoty
2025-07-03 16:44:37 +02:00
Winkarst-cpu
433ef5dd27 Fix: Don't deploy foldables when clicking on items inside containers (#38709)
* Fix

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-03 14:10:20 +02:00
metalgearsloth
fe7b96147c Biome rework (#37735)
* DungeonData rework

Back to fields, serializes better, just make new layers dumby.

* wawawewa

* Fix this

* Fixes

* Port the work over

* wawawewa

* zoom

* Kinda workin

* Adjust wawa

* Unloading work

* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* wawawewa

* Fixes

* true

* Fixes

# Conflicts:
#	Content.Server/Procedural/DungeonJob/DungeonJob.cs

* wawawewa

* Fixes

* Fix

* Lot of work

* wawawewa

* Fixing

* eh?

* a

* Fix a heap of stuff

* Better ignored check

* Reserve tile changes

* biome

* changes

* wawawewa

* Fixes & snow

* Shadow fixes

* wawawewa

* smol

* Add layer API

* More work

* wawawewa

* Preloads and running again

* wawawewa

* Modified

* Replacements and command

* Runtime support

* werk

* Fix expeds + dungeon alltiles

* reh

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-07-03 00:36:06 -04:00
Emisse
fdf3d6715e Centcomm update (#38697) 2025-07-02 19:31:19 -07:00
PJBot
f432943625 Automatic changelog update 2025-07-03 01:09:14 +00:00
Mora
752957a819 Switch HSV to the default colorspace for character customization (#38434)
* Made HSV default for character editor

* Adds/fixes comments to HSV defaulting

* Added dropbox fix, potentially cursed

* Revert "Added dropbox fix, potentially cursed"

This reverts commit a709883366fbee813e839742125e70844672af29.

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-07-02 21:08:06 -04:00