Commit Graph

35079 Commits

Author SHA1 Message Date
nukkuminen
d439f56ebf backpack tweak (#1622) 2025-08-07 01:18:54 +03:00
Morb
08691f8435 typo fixes for key ids (#1629) 2025-08-06 23:11:46 +03:00
CrystallEdge Server
daf5e14c4e Automatic changelog update 2025-08-06 22:34:58 +03:00
Red
bca971223c fix generation dublication (#1627) 2025-08-06 22:33:53 +03:00
CrystallEdge Server
96bcfb3716 Automatic changelog update 2025-08-06 13:19:14 +03:00
Red
5690c94ee2 light returns (#1621) 2025-08-06 13:18:09 +03:00
CrystallEdge Server
a4cdcf0a1f Automatic changelog update 2025-08-06 12:53:57 +03:00
Red
3b04b1f002 Merge pull request #1613 from crystallpunk-14/ed-04-08-2025-upstream-sync
Crawling upstream sync
2025-08-06 12:52:51 +03:00
Ed
22b020011d Update EntityTest.cs 2025-08-06 12:38:45 +03:00
Ed
be1d0f7359 Update EntityTest.cs 2025-08-06 12:20:27 +03:00
Ed
7136479b3e Revert "Update build-test-debug.yml"
This reverts commit 92f6e9e2bc.
2025-08-06 00:40:25 +03:00
Ed
92f6e9e2bc Update build-test-debug.yml 2025-08-06 00:11:11 +03:00
Ed
3694baca58 revert fail fast 2025-08-05 17:15:19 +03:00
Ed
0018728990 Update build-test-debug.yml 2025-08-05 16:57:59 +03:00
Ed
05138740e8 Update build-test-debug.yml 2025-08-05 16:57:46 +03:00
CrystallEdge Server
312e2b5ac1 Automatic changelog update 2025-08-05 14:32:24 +03:00
Alexsey Bezyuk
878aea4e29 Backpacks tweaks (#1618)
* speed reinform

* bear hide

* quiver and pouch craft

* speed rebalance

* fix ooops
2025-08-05 14:31:18 +03:00
CrystallEdge Server
fa99ac78e3 Automatic changelog update 2025-08-05 13:02:38 +03:00
Red
174abacead Safe chasms (#1458)
* Update chasm.yml

* Update chasm.yml
2025-08-05 13:01:32 +03:00
Red
b60ceb38ca Demiplanes redesign again (#1616)
* global demi refactor

* rebalance, smaller demiplanes

* remove outdated connections

* audio design + room coords fix

* Update CP14Rooms.cs

* Update wastelands.yml

* hotfixes

* Update CP14SpellThrowFromUser.cs

* Update sky_lightning.yml
2025-08-05 12:15:24 +03:00
Red
9c3fe601e2 Merge branch 'master' into ed-04-08-2025-upstream-sync 2025-08-05 11:52:43 +03:00
Red
4f431f9b70 Comment out integration tests in multiple files (#1617)
All test methods in several integration test files have been commented out, effectively disabling these tests. This may be for temporary troubleshooting, refactoring, or to address failing or unstable tests.
2025-08-05 11:52:29 +03:00
CrystallEdge Server
4a02a34637 Automatic changelog update 2025-08-05 01:52:42 +03:00
Alexsey Bezyuk
60ca45a846 Leather working and backpacks (#1378)
* backpacks

* suffix

* grid fix

* fix grid explorer

* recipes

* small rebalance at backpack

* leathers and butcher drop

* thin hide and prob scrap

* Leather Working

* T3 backpack grid update

* salt

* workbench

* tanner table sprite

* leather workbench construction

* Trading Position and Salt Stack

* sizes and shapes

* Revert "sizes and shapes"

This reverts commit f317a047f3.

* tiny buckle

* Ingredients and buckle icon

* ingridients json

* price and fur

* Resprite tanner table

* Rough => Rugged

* coarse, rigged leather

* icons files

* chance for fur drop

* Price down

* leather, fur, hide icons

* shape and size

* loadout tiers back

* Rename

* T3 explorer rename

* upstream

* rsi fix

* rename, descriptions, guards backpacks

* backpacks icons

* Sprites

* slots and modifiers

* missed

* belt and flipped pouches

* goblin sprites

* prices, loadouts, icons marked

* craft fix

* метка

* sprite mark

* satchels sprint normalize

* reinf too

* Crafts with low tier backpacks

* butchers hide positions

* Back Clothing

* linter fixes

* small prices rebalance

* Back loadout fix

* craft fixes

* Iron Buckle fix

* fixes

* fixes

* fix sound error

* clear

* another linter fixes

* move Salt to ores

* fixes

* localization

* moved

* salt stone god help me

* linter fix

* Ooops, linter fix

* Speed modifiers

* materials rework

* PhysicalComposition and commented cost

* fix path

* localization material unit

* leather crafting from hide increase

* salt in craft increase

* explorer commented back

* backpacks upgrade required less leather

* clear

* missed string in cost

* commented

* static price to backpacks

* no map touch...

* strap cost back

* leather - no stack entity anymore

* cost...

* return venicialis satchel back

* migration fix

* migration?

* migration again

* backpack satchel upgrade lowered

* CP14ThinToNormalLeatherRecipe

* Leather Strap Recipe

* Failed CheckRecipePricingReduction

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-08-05 01:51:37 +03:00
Red
70bf2e1cf3 Merge branch 'master' into ed-04-08-2025-upstream-sync 2025-08-04 13:38:49 +03:00
CrystallEdge Server
133c927f0f Automatic changelog update 2025-08-04 13:37:04 +03:00
Red
6b5c27125b Gathering resourses redesign (#1594)
* Add Crash to Windlands survival gamemode and map

Introduces the CP14CrashToWindlandsRule and its component for a new survival gamemode where a ship crashes into wildlands. Adds the 'nautilus_ship' map, updates English and Russian locale files with new gamemode titles and descriptions, and modifies relevant prototype and map pool files to support the new mode.

* fix FTL map

* firebombing is real

* fix biome dungen all grid overriding

* Update PostMapInitTest.cs

* Update DungeonJob.CP14Biome.cs

* Refactor demiplane generation and crash rules

Replaces the old demiplane job system with a new procedural location generation system (CP14LocationGenerationSystem and CP14SpawnProceduralLocationJob). Splits the crash-to-windlands rule into CP14CrashingShipRule (handles explosions) and CP14ExpeditionToWindlandsRule (handles map generation and FTL), with corresponding new components. Updates roundstart game rule prototype and moves/renames several files for clarity and modularity.

* Refactor location generation to support optional seed and position

Updated the GenerateLocation method to accept an optional seed and position, defaulting to a random seed if none is provided. Adjusted all call sites and the procedural job to support these changes, improving flexibility and consistency in procedural location generation.

* procedural integration into game map

* Demiplanes deletion

* clear demiplane content

* remapping procedural + frigid coast deletion

* clear demiplane guidebook

* dungeons generations

* Refactor procedural location configs and add ComossIsland

Consolidated and renamed procedural location and dungeonConfig prototypes for demiplane locations, replacing T1-prefixed and legacy IDs with new, consistent names. Updated map YAMLs to reference new location IDs and configs. Added a new ComossIsland location and dungeonConfig. Refactored code to support passing custom dungeon layers and removed unused ExamineProb field from CP14ProceduralLocationPrototype.

* Enhance procedural world gen and location configs

Improved procedural world generation by adding location generation probability, adjusting level ranges, and refining modifier uniqueness. Updated CP14ProceduralLocationPrototype and CP14ProceduralModifierPrototype, refactored node data generation logic, and made related test and map changes. Added new venicialis_fort station map and updated several procedural location and modifier YAMLs for consistency.

* fix

* connections room spawners

* track finishing global world generation

* real connection

* Update PostMapInitTest.cs

* Update venicialis.yml

* Update venicialis.yml

* fix raids, decrease city island sizes

* Update migration.yml

* Update migration.yml

* fix shutdowning

* Update CP14SpawnProceduralLocationJob.cs
2025-08-04 13:35:55 +03:00
Ed
e9199b4e77 fixes 2025-08-04 12:56:12 +03:00
Ed
e059ba05ad Update mana_vision.yml 2025-08-04 12:44:58 +03:00
Ed
f2d9608a62 Merge remote-tracking branch 'upstream/stable' into ed-04-08-2025-upstream-sync
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Eye/VisibilityFlags.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Resources/Prototypes/Recipes/Reactions/chemicals.yml
#	Tools/actions_changelogs_since_last_run.py
2025-08-04 12:44:29 +03:00
Vasilis The Pikachu
ecf96d85f4 Changelog removal of reverted PR's 2025-08-03 22:03:43 +02:00
Vasilis The Pikachu
978c51e73d Revert "Added utility belt function to scrap armor (#39233)"
This reverts commit 7852b52f85.

Revert suggested due to the utility toolbelt may be considered too overpowered and passed

<https://youtu.be/8RmeZKz-i_w?t=2548>

@ToastEnjoyer
2025-08-03 22:03:43 +02:00
Vasilis The Pikachu
2a72e30e0e Revert "Added Kill Tome (Death Note). (#39011)"
This reverts commit d0c104e4b0.

Revert suggested due to code issues and passed the voting.

@ScarKy0 has interest in fixing it

@xsainteer

<https://youtu.be/8RmeZKz-i_w?t=2151>
2025-08-03 22:03:43 +02:00
Princess Cheeseballs
6ffec751ee Flesh Stun Fix (#39324) 2025-08-02 00:44:55 +03:00
CrystallEdge Server
35206a003b Automatic changelog update 2025-08-01 14:10:11 +03:00
Red
9384623604 Non-gibbing demiplanes (#1607)
* safe demiplanes

* damage
2025-08-01 14:09:05 +03:00
CrystallEdge Server
e31f3a7d77 Automatic changelog update 2025-08-01 12:00:11 +03:00
AnyTap
de9019c408 Removed the recipe for the copper armour (#1571)
* Removed the recipe for the copper armour

* remove armor

* Removed the recipe for the copper armour

* Update Frigid_Coast.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-08-01 11:59:05 +03:00
CrystallEdge Server
487aeba8ee Automatic changelog update 2025-08-01 11:58:22 +03:00
Red
1488f5dfc7 Add Air Saturation spell and skill to Life magic (#1603)
Introduces the Air Saturation spell, which heals suffocation damage, including its entity definition, visual effects, and icon. Adds the spell to the Healing skill tree and updates the healing.rsi texture set with a new icon and metadata. Also cleans up the plant_growth spell by removing unused telegraphy effects and sprite references.
2025-08-01 11:57:16 +03:00
Deserty0
e637747b06 Chatsan Пустыня эдишн (#1592)
* оп

* Update speech-chatsan.ftl
2025-08-01 00:36:13 +03:00
CrystallEdge Server
5cc3d24901 Automatic changelog update 2025-08-01 00:35:41 +03:00
Red
7d0392478b Fix barrels (#1600)
* Update bucket and barrel solution components

Replaces SolutionTransfer with Injector for buckets, adjusting transfer parameters and solution handling. Enables RefillableSolution for barrels, allowing them to be refilled. These changes improve consistency and functionality for liquid transfer between containers.

* 1306

* fix lobby audio
2025-08-01 00:34:36 +03:00
CrystallEdge Server
bb9c8e865e Automatic changelog update 2025-07-31 23:45:51 +03:00
Red
f17779812f Bugfixes (#1599)
* fix #1593

* fix #1236

* fix #1561
2025-07-31 23:44:45 +03:00
CrystallEdge Server
25823cbe06 Automatic changelog update 2025-07-31 22:29:58 +03:00
Red
821f74766a Mob reparent + Atmos disabled (#1597)
* mob mob

* temperature

* delete resurrection spell

* Update base.yml

* Update base.yml

* Update migration.yml

* Update demiplane.yml

* fix

* delete air mixtures from alchemy

* Update herbals.yml

* Update herbals.yml

* Update brad_potions.yml

* Update GhostSystem.cs

* healing spell refactor

* return airloss

* Revert "Update herbals.yml"

This reverts commit 86870e0390.

* Revert "Update herbals.yml"

This reverts commit 8fdb01881d.

* Revert "delete air mixtures from alchemy"

This reverts commit 0fddb2febd.

* fix

* fix mobs suffocation

* Update base.yml
2025-07-31 22:28:52 +03:00
Mr. 27
66f64bc952 Allow EmoteSoundsPrototype to have parents (#38890)
* inital

* Update Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* ProtoId

* Unneeded

* Update Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs

* Update Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-07-31 15:22:33 +02:00
PJBot
c3374d86e4 Automatic changelog update 2025-07-31 04:09:13 +00:00
Spanky
31773e64f4 Adds Wizard's Den (Replaces Wizard Shuttle) (#37701) 2025-07-30 21:08:05 -07:00