Commit Graph

2714 Commits

Author SHA1 Message Date
Red
b1a9fca5ee Trading request system (#1460)
* mapping public stores update

* base selling platform update

* basic UI setup

* Update coin icon textures

Refreshed the c, g, p, and s coin images in the interface textures. This likely improves their appearance or corrects previous visual issues.

* parse requests data into UI

* selling platform UI state now include price

Updated the selling platform UI to display the calculated price of placed items. Moved the UpdateSellingUIState logic from the shared system to the server system, and modified the CP14SellingPlatformUiState to include a price field. The client window now uses the state-provided price instead of a hardcoded value.

* Update selling UI state on item placed or removed

Added event subscriptions for ItemPlacedEvent and ItemRemovedEvent to update the selling UI state when items are placed or removed from the selling platform. Refactored UpdateSellingUIState to remove the user parameter, as it is no longer needed.

* sell button works now

Replaces the previous sell request mechanism with a new CP14TradingSellAttempt message for selling items on the platform. Updates client and server logic to use this new message, adds a CanSell helper for item validation, and refactors related UI and event handling code for improved clarity and maintainability.

* auto pricing requirements

* Refactor reputation reward to use cashback rate

Reputation rewards for selling requests are now calculated as a percentage (cashback) of the sale price, rather than a fixed value. Updated the relevant UI, server logic, and prototype fields to reflect this change. Also cleaned up the brad_potions.yml prototype file by removing a duplicate entry and correcting an ID.

* request rerolling
2025-06-23 01:21:25 +03:00
Ed
8c13d854ee movedgrid and physicsMap purge 2025-06-16 01:10:17 +03:00
Ed
62cd6bfe9b Merge branch 'master' into ed-10-06-2025-upstream-sync 2025-06-15 21:44:16 +03:00
Red
04f6627e16 Lumera patron (#1427)
* mind upgrade works only on followers

* wrath of lumera, removing memory points

* enable lumera for players

* add lumera to maps

* job desc update

* guidebook
2025-06-15 15:00:18 +03:00
Ed
42d39a7c67 Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Lock/LockSystem.cs
2025-06-10 11:33:34 +03:00
Viator-MV
bcbbd6e31b cooldown (#1401)
Your personal Viator has overheated, and the cooldown will last until active PR's are approved.
2025-06-08 10:03:53 +03:00
Red
3e78962d91 Venicialis new map (#1397)
* venec map

* venec udate

* venicialis fort

* Update PostMapInitTest.cs
2025-06-07 14:04:41 +03:00
Red
d16b9c8de7 Kill guards with sharpened blade (#1386)
* disable guard

* sharpening

* remove mithril from trading

* merchants remap

* Update guard_commander.yml
2025-06-05 00:58:04 +03:00
Spanky
694b0093c2 Fland Update (#38068)
Add turrets to Fland
2025-06-04 17:41:38 -04:00
Spanky
b2d54c510e Omega Update (#38066) 2025-06-04 13:37:11 -07:00
Red
e6188a3fbf Golden balance touch (#1382)
* gold refactor

* Update ore_veins.yml

* remove gold and mithril from maps
2025-06-04 14:34:08 +03:00
Spessmann
a3550d0f8f Convex AI turret update (#38053)
convex update
2025-06-03 19:08:53 -04:00
TheKittehJesus
4c7b035c9c New belt controls (#1298)
* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-03 14:39:39 +03:00
JpegOfAFrog
fdc8aa8e89 Adds air atmospherics markers to emergency_plasma.yml (#37768)
Co-authored-by: GuyThatFawkes <212874941+GuyThatFawkes@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-02 22:58:25 -07:00
Mixelz
89bb7e9ade Plasma genpop (#38028)
* 1st Draft

1st Genpop Draft

* Draft 2

* Tile Fixes

Curse you Spanky

* Added Salv Board & Turrets

* Spanky Change Requests

See Plasma Discord Thread for details

* Variantize + Fix Rotations

:godo:
2025-06-03 00:30:22 -04:00
Boaz1111
ddb4c8f034 Marathon Update - Genpop (#37687)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-01 12:38:39 -07: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
K-Dynamic
ada5c4f3dd Elkridge: Turrets (#37961)
* skub

* turrets
2025-05-30 08:52:06 -04:00
Southbridge
41d638cc36 Box Station - Added Turrets (#37860) 2025-05-30 00:25:30 -07:00
Spessmann
3b96d643bc Random maints update to decal spawners (#37916) 2025-05-28 22:03:46 -07: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
metalgearsloth
ea7350f3f1 Content changes required for physicsmap purge (#37878)
* PhysMap changes

* Fix call

* Avoid tilefriction resolve

yummy

* a
2025-05-28 19:38:47 +10:00
ArtisticRoomba
6368baf96e Fix ATS (#37896) 2025-05-28 01:37:43 -07:00
ArtisticRoomba
6331a4ba6b ATS update (#37891) 2025-05-28 00:52:52 -07:00
Southbridge
7aa393cfdb Amber Station - Added Sentry Turrets (#37859) 2025-05-27 16:08:34 -07: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
Southbridge
318d817cff Amber Station - Added Sec Beacons (#37700) 2025-05-26 00:29:58 -07:00
deltanedas
d56c0d0610 remove actions from maps (#37457)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-05-24 13:37:10 -07: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