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
7642f49b00
Merge branch 'master' into ed-27-05-2025-upstream-sync
2025-05-29 00:50:36 +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
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
Red
40246e9b13
Merge branch 'master' into ed-12-05-2025-upstream
2025-05-23 12:58:11 +03:00
K-Dynamic
0c7cfb528d
Evac Shuttle Wode update ( #37223 )
2025-05-21 16:26:57 -07:00
Spanky
524aa8bf0d
Reach Update ( #37669 )
2025-05-21 00:51:20 -07:00
Southbridge
5a3c59fd7f
Box Station - Added GenPop (Sec redesigned) ( #37663 )
2025-05-20 22:00:51 -07:00
Spanky
ecfbeb9834
Packed Update (Salvage Job Computer) ( #37656 )
2025-05-20 17:12:15 -07:00
Spanky
e134c57165
Omega Update (Salvage Job Computer) ( #37655 )
2025-05-20 16:35:59 -07:00
Spanky
dc6188000c
Marathon Update ( #37654 )
2025-05-20 16:29:45 -07:00
Spanky
a261f93550
Bagel Update (Salvage Job Computer) ( #37652 )
2025-05-20 16:27:57 -07:00
Spanky
11276b9a7b
Fland Update (Salvage Job Computer) ( #37653 )
2025-05-20 16:27:31 -07:00
Red
7b7a837cf8
City Gate fix + Comoss update ( #1289 )
...
* city gate fix
* Update comoss.yml
* fix
* Update migration.yml
2025-05-20 22:36:43 +03:00
TytosB
c3e6beed85
loop salvage job board ( #37618 )
2025-05-19 14:30:03 -07:00
Deerstop
5ad15acb19
Elkridge - Salv job board and overhaul ( #37600 )
2025-05-19 11:55:41 -07:00
Southbridge
8c786e8a6c
Box Station - Added Job board ( #37602 )
2025-05-19 01:16:47 -07:00
Spessmann
8d0855a153
Convex job board update ( #37579 )
2025-05-18 10:43:43 -07:00
Minemoder5000
a01ba3b7b1
Rebuild ATS Anchor room and add indestructible spine. ( #37560 )
2025-05-18 01:12:46 -07:00
Southbridge
f91d3a5788
Amber Station - Added Job Board ( #37565 )
2025-05-18 00:23:21 -07:00
Nox
93305c21df
Amber Station: armory restock ( #37432 )
2025-05-17 20:37:35 -07:00
Spangs04
9af1d69e30
Telecoms Resprite ( #35811 )
...
* Medical and Science Servers
Resprited medical and science servers
* Delete server-off-Recovered.png
* Telecoms and Camera Servers
* Add Copyright
* Fix Rsi
* Minor Stripe Displacement Fix
* Telecoms Sprites
* Telecoms Display Update
Partial Update of the Sprites, Copyright and some YML and JSON changes
* Fix Linter and YML and Finalize
* Remember Lost Router Child
Fix Linter Again (hopefully) and add sprite to entertainment and wireless camera routers
* Requested Review Changes and ect
Changed how the servers dictate how to display whether they have no keys or if they have a mix of keys.
* Re-Run Checks
* Handful of requested changes
* Fix?
* Revert Last
* old yeller
* pushforpr
* Remove Old Files
* Fix Json
* fix rsi for real...?
* Fix Camera Servers
Servers were still calling to telecoms instead of the server sprites
* New Telecom Darken Attempt #1
* Slight stripe change
* Random Whitespace fix
* Fix2boogaloo
2025-05-17 22:10:56 -04:00
Spessmann
8269ba66b0
Convex update ( #37533 )
2025-05-16 21:49:02 -07:00
Spanky
631bb6a4ed
Omega Update ( #37490 )
2025-05-15 19:10:07 -07:00
Tezzaide
47ff7f2e45
New Salvage Wrecks ( #36884 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-05-14 20:55:24 -07:00
Ed
be495f274c
Skill progression system ( #1263 )
...
* delete skill trees
* Revert "delete skill trees"
This reverts commit 9d7fae73c4😢
* skimitar gaming
* skimidi
* blacksmithing branch
* remove research restrictions
* remove species magic buff
* fix loc
* Update thaumaturgy.yml
* pip
* Delete skill_tree.yml
2025-05-14 12:43:43 +03:00
Ko4ergaPunk
72a9b0398a
[Maps] Dev rework ( #34708 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-05-12 23:30:05 -07:00
Ed
59e6435fe2
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
# Resources/Prototypes/Procedural/vgroid.yml
2025-05-12 14:25:42 +03:00
Deerstop
8f01cc6884
Elkridge - Botany Update ( #37206 )
2025-05-10 17:49:26 -07:00
Southbridge
129204b54e
Amber Station - Security and AI Sat Overhaul ( #37262 )
2025-05-07 18:39:09 -07:00
Spessmann
a4b50db5e1
Convex genpop update ( #37216 )
2025-05-05 23:56:34 -07:00
Ed
0fc9e28637
Demiplane maps aftertest tweaks ( #1256 )
...
* admin info panel in demiplane map
* fix core chasm destruction
* dimensit resource, more resources in demiplanes
* more fixes
2025-05-06 08:29:09 +03:00
Spanky
962c5c0822
Fland Update (Genpop) ( #37207 )
2025-05-05 18:29:17 -07:00
Ed
aeedff5caa
Demiplane exploration map ( #1251 )
...
* dehardcode nodeTreeControl part 1
* finish
* demiplane map system setup
* link map entity with station data!
* random demiplane map generation
* redesign demiplane map node tree
* center
* map generate v2
* location generation
* modifier generation
* missing location icons
* ui polish
* data refactor
* fix line color
* ejectabling
* split demiplane component into two
* blocker attempt
* revoking
* fix frontier calculation
* dimensit
* demiplane core room spawning
* demiplane cool destruction
* Update round_end.yml
* progression works now!
* Update CP14NodeTree.cs
* Update CP14NodeTree.cs
* documentation pass
* fix abusing, some balance pass
* demiplane naming fix
* см
* location names
* delete old keys
* Update buy.yml
* Update migration.yml
* fix guidebook
* Update misc.yml
* Update misc.yml
2025-05-05 15:19:44 +03:00
Deerstop
90fd66c3d4
Salv Ruins Again ( #37193 )
2025-05-04 23:33:18 -07:00
Southbridge
6926fa1ad3
Bagel Station - Removed Gamer Loot ( #37171 )
2025-05-04 00:20:33 -07:00
Spessmann
f9825e1f96
Add more ruins ( #37161 )
2025-05-03 16:44:53 -07:00
Spanky
6d6ae95914
Omega Update (Genpop) ( #37157 )
2025-05-03 14:19:07 -07:00
Southbridge
d35c755685
New Salvage Ruin - Atmos Interchange ( #37115 )
2025-05-02 08:45:46 -07:00
Ed
ef6d973301
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
...
# Conflicts:
# Content.Client/Parallax/ParallaxControl.cs
# Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/Labels/Label/LabelSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/Pools/deathmatch.yml
# Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
LaCumbiaDelCoronavirus
c96a5ad990
add new salv ruin: telesci ( #36653 )
2025-04-30 07:49:36 -07:00
TytosB
a0e0072bd1
new salv ruins ( #36947 )
2025-04-30 07:40:45 -07:00
IProduceWidgets
ebb1f92027
feex oasis portal ( #37058 )
2025-04-29 19:55:45 -07:00
IProduceWidgets
23d835b4b6
oasis genpop ( #37031 )
2025-04-29 02:04:07 -07:00
slarticodefast
c6bdce3b0c
merge staging into master ( #37009 )
2025-04-28 20:14:39 +02:00
keronshb
0a394d4af5
Wizard Teleport Scroll (Teleport Location ECS) ( #36424 )
2025-04-28 19:42:24 +02:00
Southbridge
2e8291cecb
Amber Station - Added Genpop ( #36997 )
2025-04-27 23:56:39 -07:00
IProduceWidgets
0043bde402
Add some salvage ruins ( #36814 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
2025-04-27 22:33:40 -07:00
Ed
e7e55cdb5e
fix viator
2025-04-26 18:09:44 +03:00
Viator-MV
834fad0533
fixes ( #1223 )
2025-04-26 12:21:01 +03:00
