Commit Graph

9499 Commits

Author SHA1 Message Date
Ed
b581f5d132 Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
# Conflicts:
#	.github/workflows/check-trailing-whitespace.yml
#	Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
#	Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Maps/Pools/default.yml
2025-06-23 16:37:22 +03:00
Red
9c1c1c4456 modular fix (#1462) 2025-06-23 12:19:02 +03:00
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
Red
44ba300a91 serverization??? (#1457) 2025-06-21 20:51:07 +03:00
Red
f4abe1cf35 Fix lumera actions (#1446)
* ZLevelMover

* fix

* Update CP14ReligionSystem.cs
2025-06-21 02:46:01 +03:00
Ed
869af43f31 Refactor Demiplane map node state and update core entity 2025-06-19 18:33:54 +03:00
Kyle Tyo
ca72ca1464 Command resolves and LEC conversions batch 4 (#38382)
* reeeecolllaaaaaaaa

* gonna convert these to public while I'm here for consistency sake

* requested changes.
2025-06-19 02:03:28 +02:00
Kyle Tyo
d36a45a57f Relocate SetOutfit method to ServerClothingSystem and LEC setoutfit command. (#38391)
* that'll do

* requested changes.

* missed this.
2025-06-19 01:50:10 +02:00
beck-thompson
72ea94a233 Fix stacks only recycling one instead of the stack amount (#38433)
* fix

* Fixes
2025-06-18 23:14:01 +02:00
Red
3a4bbcb289 Area of influence depends on followers MobState (#1439)
* simple anti-religion zone shader

* observers refactor
2025-06-18 21:46:58 +03:00
Red
322a3f11c1 Mini fix pack (#1440)
* Update CP14PriceScannerSystem.cs

* Update CP14PriceScannerSystem.cs

* fix #1435

* fix #1393
2025-06-18 12:37:18 +03:00
Kyle Tyo
284cf25905 Command resolves (#38415)
touchups
2025-06-18 01:40:33 +02:00
Tayrtahn
d61704df33 Convert AtmosphereSystem sound path strings to SoundSpecifiers (#38403)
* Convert AtmosphereSystem sound path strings to SoundSpecifiers

* Convert to SoundCollections
2025-06-17 22:52:11 +02:00
Kyle Tyo
3485450ffa Command resolve mega pr batch 5 (#38389)
* commit progress

* requested changes
2025-06-17 22:49:58 +02:00
Kyle Tyo
0e1ff2644f Command resolve killing and LEC conversions batch 2 (#38367)
commit progress
2025-06-17 20:01:28 +02:00
Kyle Tyo
57babe15ee Command resolve mega pr 6 (#38398)
commit progress
2025-06-17 19:22:03 +02:00
Whatstone
b73943b04b Add directionality to cable terminal port nodes (#38394) 2025-06-17 19:05:48 +02:00
Simon
9bab47ea32 Switch Discord integration to use NetCord instead of Discord.Net (#38400) 2025-06-17 19:03:24 +02:00
Perry Fraser
3c297d0620 fix: erase expedition disks when their map is deleted (#38322)
* fix: erase expedition disks when their map is deleted

* fix: include paused entities in disk query, add dirty
2025-06-17 18:32:14 +02:00
Kyle Tyo
d316fa3483 Command resolve and LEC conversion batch 3 (#38378)
* I'm just a silly goober

* requested changes

* Update Content.Server/Interaction/TilePryCommand.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-17 11:39:42 +02:00
Whatstone
53a01bfb46 Fix adjacent north/south cable terminals breaking east/west HV cable (#38377) 2025-06-17 02:13:35 -07:00
kosticia
f64505bea1 predicted hyposprays (#38046)
* G O I D A

* how

* now proper

* a

* Update HypospraySystem.cs

* good catch

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-17 02:08:08 +02:00
beck-thompson
a48c390854 Objectives that do not fit requirements are now deleted (#38365)
* Fix

* Update Content.Server/Objectives/ObjectivesSystem.cs

Thanks Tayrathn!

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-06-16 18:54:11 -04:00
Red
637cfe4be8 nerf gods (#1436) 2025-06-17 01:19:09 +03:00
Tayrtahn
4cca55cecc Cleanup duplicate dependency in AddActionCommand (#38360)
Cleanup duplicate dependency in AddActionCommand
2025-06-16 21:02:35 +02:00
ScarKy0
4cc6cb95dc Commands for adding and removing actions (#38317) 2025-06-16 13:25:44 +03:00
Helix-ctrl
1d4cf48c31 Add hints towards flash protection to all items which provide it (#37267)
* Update welding.yml

* Update FlashSystem.cs

Add subscriber event for flash immunity examine text

* Create flash-immunity-component.ftl

* Removed changed description text

* change to use entity version

* fixed mistake
2025-06-15 18:38:36 -04:00
Ed
ab8a5c3afd Sharedization of entityEffects and crystals slots system 2025-06-15 21:58:33 +03:00
Ed
62cd6bfe9b Merge branch 'master' into ed-10-06-2025-upstream-sync 2025-06-15 21:44:16 +03:00
Ed
5328714752 fix c# 2025-06-15 21:43:58 +03:00
Ed
5046ad1aeb longer weather 2025-06-15 21:34:33 +03:00
Red
b24ec5bc80 Bugfixes (#1432)
* fix #1428

* CodTenAlt review

* fix map tests

* real this time

* fix #1429

* add wheat and cotton into victorian gardens trade faction

* Update PostMapInitTest.cs
2025-06-15 21:25:58 +03:00
ScarKy0
208b245dcb Retractable items system + Arm Blade action (#38150) 2025-06-14 21:29:06 +03:00
nikitosych
1bbf094c79 Fix for holoparasite's ability to attack the host through mech (#36659) 2025-06-14 20:22:45 +03:00
Red
71abce8db8 Skill scanning + bugfixes (#1424) 2025-06-14 19:04:33 +03:00
SyaoranFox
0518be5d38 Zombies won't attack Initial Infected (#38128)
* Added Zombie faction roles everywhere that makes sense for initial infected to be associated with Zombies.

* Adding faction component to round start zombie. (not hopeful)

* Removed stupid attempts and added zombie faction component to the zombie system when the player is given the ability to force themself to zombify.

* Changed use of "zombie" for ProtoId<NpcFactionPrototype>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Removed faction component from ZombieOutbreak event. Shouldn't cause problems with the event as II gets component with their ability to self zombify.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-13 17:56:57 -07:00
Red
fc0beb5ccf Gods part 3 (#1421)
* apprice action, dead notice

* fix refollowing

* mist lumera action
2025-06-14 02:11:36 +03:00
Red
b932d56f15 Gods part 2 (#1420)
* spooky scary patreons

* Update CP14ReligionSystem.cs

* goodbye radio channel

* gods? no! Mana parasites! Muahahaha

* Update gods.yml

* Update primordial.yml
2025-06-13 19:21:09 +03:00
slarticodefast
ae8fdbfa51 Fix puncturase cauterizing bleeding (#38289)
fix puncturase cauterizing bleeding
2025-06-13 12:11:15 -04:00
Red
422a0c5e10 Gods and religions (#1405)
* basic religion vision

* block god interactions

* skill tree mob specify

* silvania setup??

* clustering shader optimization

* gods department & job

* random gods jobs

* Luxian god

* Update Nature.png

* Update sphere_of_light.yml

* god chat

* Update ChatSystem.cs

* OBSERVATION

* public observation and basic follower api

* shader tweaks

* improve shaders

* spawning and praying on altars

* altars ppvs override

* move pvs overridiation from altars to observers

* shader coloration

* spectral z mover

* god magic radius restricted

* guide how to believe in god

* sends messages to god when smoeone wanna become follower

* follower doAfter

* goodbye luxian, welcome lumera

* goodbye silvania, welcome merkas

* som polish and renamings

* gods fast travel

* Update altar.ftl

* some lumera sfx

* renouncing patrons!

* renounce followers

* followewr percentage calculation

* remove from player-facing

* fix

* Update sphere_of_light.yml

* Update base.yml
2025-06-13 14:15:48 +03:00
SenorJaba
8ab0939698 Merchant's monocle and ability (#1413)
* New trading stuff

* Crafts skill tree

* More trading fixes, baby!

* Last trading fix I hope

* Merchants' supremacy

* Gimme money

* Readonly
2025-06-13 12:24:36 +03:00
themias
19271e6bc9 Fix gas analyzer and anom scanner wrong state (#38285)
* Fix gas analyzer and anomaly scanner UI activation issue

* save

* fix comment

* milkalyzer
2025-06-12 14:16:07 -07:00
Perry Fraser
570accb102 fix: Correct respath for lizard smite icon (#38288) 2025-06-12 22:37:44 +02:00
Perry Fraser
e09b7debe2 Fix some popup issues with pipe layer changes (#38244)
* fix: only show pipe layer popups to the user changing them

* fix: don't show pipe layer subfloor popup when not using a screwdriver

* fix: properly pass down user and used for serverside pipe layer changes

Technically this doesn't matter as the Shared codepath for this method
doesn't actually use these on the server: only the user is used for a
clientside popup. Still, will be good to have these for future changes
that might need them.
2025-06-11 22:31:48 -07:00
RedBookcase
a8801e4abf Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189)
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-11 16:29:27 -07:00
Simon
f5fbef7ccc Add the instrument names to the MIDI channel selector (#38083)
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
2025-06-11 20:32:48 +02:00
Tayrtahn
d612c56aab Forbid string literals for SharedToolSystem methods (#38250)
* Forbid string literals for ToolSystem methods

* Cleanup violations

* Sort usings
2025-06-11 03:58:21 +02:00
Ed
c0f4098ca9 spell fixes 2025-06-10 11:49:35 +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
Tayrtahn
264573b9e1 Cleanup unused fields in DrinkSystem (#38181)
Cleanup unused fields in DrinkSystem
2025-06-09 19:56:12 +02:00