Red
581ca2f5ef
OP Ballades ( #1372 )
2025-06-03 12:43:21 +03:00
TheKittehJesus
a070db91be
Changed cashconverter to be anchorable on tables ( #1371 )
2025-06-03 09:41:17 +03:00
ArZarLordOfMango
72735a627d
fix moral ( #1368 )
2025-06-03 01:04:33 +03:00
paige404
881a504334
Reorganize slime ymls, adjust damage resistances and vulnerabilities for slimes ( #1300 )
2025-06-03 00:59:07 +03:00
Red
43913d9d11
cozy ( #1367 )
2025-06-03 00:38:19 +03:00
Red
d80ab67391
Update fire.yml ( #1365 )
2025-06-02 23:00:16 +03:00
Red
2b1cef9d72
Update fire.yml ( #1357 )
2025-06-02 21:16:07 +03:00
Red
acc8093f9a
More economy fixes ( #1356 )
...
* fic
* Update base_instruments.yml
* fix
* Update chests.yml
2025-06-02 18:06:56 +03:00
Viator-MV
c939761737
skelemake ( #1276 )
...
* skelemake
* sharded
* mastery
* Not so slow cast
* ok no demi deipletion
* skillstorage and Species
* ressurection dead
* fixed
---------
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com >
2025-06-02 14:20:45 +03:00
Nim
5a2ccc3e08
Resprite ( #1328 )
...
* well resprite
* broken well
* Campfire
* meta
* Quantity
2025-06-02 14:16:42 +03:00
Ed
483a82fdd4
Update grasshighbush.yml
2025-06-02 11:34:01 +03:00
Ed
e953410205
Update peace_ballade.yml
2025-06-02 11:32:01 +03:00
Kit
c35052b9fa
STOP POSTING ABOUT THE THING ALL MY FRIENDS ON TIK TOK SENT ME "THE THING" ( #1353 )
2025-06-02 10:21:51 +03:00
Red
f6dd89ea7a
d ( #1351 )
2025-06-01 21:55:20 +03:00
Red
5c5a473ec0
More merchant content ( #1349 )
...
* energy crystals
* thaumaturgy trading
2025-06-01 19:21:41 +03:00
Ed
6fce9dcdaa
Update trade_platform.yml
2025-06-01 16:14:08 +03:00
Ed
da45b9bba8
fixes
2025-06-01 15:56:38 +03:00
Red
a3ae67a762
Trade reputation rework + Merchants back + Mining contract ( #1347 )
...
* refactor unlocking
* fix contract debug crashing
* Update dev_map.yml
* bugfixes and content rebalance
* ore buy contract
2025-06-01 15:10:36 +03:00
Red
a99f2fcd50
Remove random reaction system ( #1345 )
...
* wow
* d
2025-06-01 15:01:32 +03:00
Alexsey Bezyuk
759e7c73d9
furnace radius ( #1346 )
2025-06-01 12:33:38 +03:00
Ed
bd783f9ec0
Update herbals.yml
2025-05-31 22:04:20 +03:00
Ed
1818f253ae
chest fix
2025-05-31 18:07:14 +03:00
Red
10090292a1
Master fix ( #1342 )
...
* Update web.yml
* cocoon loot
* Update web.yml
2025-05-31 17:50:01 +03:00
Red
71527bb4eb
Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web
...
Spider content update
2025-05-31 14:31:44 +03:00
Ed
0dd379dec3
Merge branch 'master' into ed-27-05-2025-upstream-sync
2025-05-30 23:24:23 +03:00
Nim
b28c5605b9
zombie speed ( #1337 )
2025-05-30 18:22:39 +03:00
Red
7d658de8a1
Merge branch 'master' into ed-27-05-2025-upstream-sync
2025-05-30 14:54:06 +03:00
Ed
df9c7e4439
try fix new lines
2025-05-30 14:52:00 +03:00
Ed
66022d1312
Update onion.yml
2025-05-30 14:39:47 +03:00
Ed
d8e4698191
return vanilla vgroid gen
2025-05-30 14:38:35 +03:00
Ed
44149a6db8
global whitelist fix
2025-05-30 14:04:04 +03:00
Ed
f78b1e07c5
cs fix, demiplane fix
2025-05-30 13:28:08 +03:00
Kit
2c5655ee69
Update Blood healing and blood absorpsion ( #1331 )
2025-05-30 01:59:48 +03:00
Ed
5e6d1d0b3a
dungenore wawa
2025-05-29 22:14:14 +03:00
Ed
8006578845
fix #1311
2025-05-29 00:57:12 +03:00
Red
7642f49b00
Merge branch 'master' into ed-27-05-2025-upstream-sync
2025-05-29 00:50:36 +03:00
Ed
9b6ceb8d18
caves fix
2025-05-29 00:45:41 +03:00
Fr0goo
3d964cbf04
Goblin Speech noise ( #1304 )
...
* Goblin Speech noise
added some goblin speech noises using various already existing goblin sounds. just cropped and stuff
* Fixed capitalization
* Apply suggestions from code review
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com >
---------
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com >
2025-05-29 00:24:21 +03:00
Red
cde388f5dd
Another Merchant gameplay attempt ( #1308 )
...
* setup UI
* setup debug data
* graph control setup
* reputation trade component
* unlocking logic
* smoe real reputation costing
* remove sponsors part, add trading specific UI nodes
* port to default pricing system
* buy cooldown
* fuck off trading cabinets
* real good cooldown UI
* Cool unlock sound
* reputation earning
* cool purchare sound
* coin & sprite work
* delete old guidebooks
* cool purcharing VFX
* better ui
* victoria gardens
* Update migration.yml
* Update migration.yml
* cooldown removed
* contracts
* Update migration.yml
* remove CP14Material
* materials appraise
* food appraise
* auto economy pricing system
* alchemy reagents appraise
* coins resprite
* alchemy appraise 2
* modular weapon appraise
* selling platform
* Update PricingSystem.cs
* Update CP14TradingPlatformSystem.cs
* merchants returns + map update
* Update CP14StationEconomySystem.Price.cs
2025-05-29 00:22:47 +03:00
Lucson1337
0551caf98f
Eye patch/глазная повязка ( #1329 )
2025-05-29 00:22:20 +03:00
Aisu9
995429d041
Small healing magic rebalance. ( #1323 )
...
* Healing small rebalance
* Healing spell small rebalance 2
* Healing Spell Rebalance 3
* Update cure_wounds.yml
* Update cure_poison.yml
* Update cure_wounds.yml
* Update cure_poison.yml
* Update cure_heat.yml
* Update cure_wounds.yml
2025-05-29 00:21:31 +03:00
Ignaz "Ian" Kraft
33bb537f81
make heat and freeze work on reagents ( #1314 )
...
* make heat and freeze work on reagents
* has to run before AdjustTemperature
* implement suggested changes
* almost missed this edge case
* 0k is the limit
* cleanup
2025-05-28 00:24:01 +03:00
Nim
2607eaeddd
Polymorph return ( #1327 )
...
* polymorph return
* AliveTarget
2025-05-28 00:08:58 +03:00
Ed
f509f0e152
entityloottable conflicts fix
2025-05-27 12:42:46 +03:00
Ed
d5fbdbdec0
Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
# Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
# Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
# Resources/Prototypes/Entities/Effects/chemistry_effects.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/GameRules/meteorswarms.yml
# Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
Kit
89dd70d7cd
Iceshard nerf ( #1324 )
2025-05-27 11:38:03 +03:00
Sefaia
f77a2c55c3
Added Guidebook entry for Locks, Keys and Lockpicking ( #1307 )
...
* Added Guidebook entry for Locks, Keys and Lockpicking
* Created a Mechanics Catagory for the Guidebook and allocated the two entries to it.
* Reorganized Lock and Lockpicking along adding TODO on mechanics
* Oops! Correcting a mistake at Lockpicking 101. Thank you @Woolpix18!
* Added a small fun fact about Lockpicks.
* Added Guidebook entries for Russian (IN NEED OF TRANSLATION) and simplified the guidebook entries for ease of reading.
* Update mechanics.yml
* Update mechanics.yml
---------
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com >
2025-05-27 11:32:13 +03:00
Errant
02fe5b4ac5
HOTFIX Cryochem revert ( #37844 )
...
* Revert "Traumoxadone (#37236 )"
This reverts commit 55ec2632a8#37132 )"
This reverts commit 406bfa3308#37131 )"
This reverts commit f415ad51c3
2025-05-26 16:49:34 +02:00
Nim
a1323c7b29
Tavernkeeper's Sandwich ( #1280 )
...
* burger
* Sandwich
* Separator
* CP14Sandwich
2025-05-26 12:53:07 +03:00
Nim
91cebc07c4
Merge pull request #1278 from Nimfar11/books
...
Books sprite
2025-05-26 12:52:58 +03:00
