Commit Graph

24712 Commits

Author SHA1 Message Date
Kit
fa2c1968f8 Requested changes 2025-09-22 17:44:54 -04:00
Kit
d6d6fa86a9 guidebook change 2025-09-17 21:02:30 -04:00
Kit
43b8c8dbb9 wow buffs 2025-09-17 20:52:57 -04:00
Ed
3501e12ff2 Set sound to null and remove unused sprite in spells
Set the 'sound' property to null for hell_ballade and mana_ballade spell actions to explicitly disable sound. Removed an unused Sprite component from water_creation.yml to clean up the configuration.
2025-09-18 00:28:48 +03:00
Red
930caa30b3 Magic spell refactor part 2 (#1757)
* DoAfter support for Actions (#38253)

* Adds Action DoAfter Events

* Adds DoAfterArgs fields to DoAfterComp

* Adds a base doafter action

* Adds Attempt action doafter logic

* Adds doafter logic to actions

* Changes Action Attempt Doafter and action doafter to take in Performer and the original use delay. Use delay now triggers when a repeated action  is cancelled.

* Readds the TryPerformAction method and readds request perform action into the action doafter events

* Adds a force skip to DoAfter Cancel so we can skip the complete check

* Adds a Delay Reduction field to the comp and to the comp state

* Fixes doafter mispredict, changes doafter comp check to a guard clause, sets delay reduction if it exists.

* Cancels ActionDoAfter if charges is 0

* Serializes Attempt Frequency

* Comment for rework

* Changes todo into a comment

* Moves doafterargs to doafterargscomp

* Adds DoAfterArgs comp to BaseDoAfterAction

* Removes unused trycomp with actionDoAfter

* Replaces DoAfterRepateUseDelay const with timespan.zero

* Removes unused usings

* Makes SharedActionsSystem partial, adds DoAfter partial class to ActionSystem, moves ActionDoAfter logic to the SharedActionsSystem.DoAfter class

* Cleanup and prediction

* Renames OnActionDoAfterAttempt to OnActionDoAfter, moves both to Shared Action DoAfter

* Removes ActionAttemptDoAfterEvent and moves its summaries to ActionDoAfterEvent. Converts OnActionDoAfterAttempt into TryStartActionDoAfter

* Removes Extra check for charges and actiondoafters

* Sloptimization

* Cleanup

* Cleanup

* Adds param descs

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Refactor CP14 action emote and speech handling

Moved emote and speech logic from magic spell components to dedicated CP14 action components and systems. Removed CP14MagicEffectEmotingComponent and related event handling, introducing CP14ActionEmotingComponent and updating event subscriptions. Updated resource consumption and performed logic to use new action-based components. Adjusted affected prototypes and removed obsolete code.

* kicking in

* Refactor athletic spell actions and remove mana cost calc

Reworked dash and sprint spell YAMLs to use modular effect events and updated their action properties. Removed the unused CalculateManacost method from CP14SharedMagicSystem.cs. Also removed the startDelay property from the kick action.

* fix cooldown and resource cost

* casting visuals adapt

* telegraphy adapt

* slowdown adaption

* Remove Lumera and Merkas demigod spells and skills

Deleted all spell and skill prototypes related to the Lumera and Merkas demigods, including their actions, effects, and skill trees. Updated athletic sprint and second wind spells, and refactored portal_to_city spell to use modular effects. Also added a debug category to the admin skill reset verb.

* fuck...

* done

* some refactor hell

* light + lurker process

* meta process

* mobs process

* vampire

* finish

* no clientside

* Update water_creation.yml

* fixes

* Update ice_ghost.yml

* а

* viator review

* fix lurker

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 22:13:10 +03:00
CrystallEdge Server
c1a13c6757 Automatic changelog update 2025-09-17 17:52:56 +03:00
SenorJaba
a370bc19b0 Guild berets and signs (#1786)
* Guild berets and signs

* Naming fix

* Small fix

* Russ
2025-09-17 17:51:51 +03:00
CrystallEdge Server
53208457b0 Automatic changelog update 2025-09-17 13:59:17 +03:00
TheKittehJesus
c99dee4928 Fix staff wideswing direction (#1788) 2025-09-17 09:45:46 +03:00
CrystallEdge Server
17302c4dcd Automatic changelog update 2025-09-16 18:12:52 +03:00
Viator-MV
565d8eb0fe passive heal (#1769) 2025-09-16 18:11:46 +03:00
Red
5377dd6926 fix skin coloring (#1781) 2025-09-16 14:39:46 +03:00
CrystallEdge Server
5b912f1ece Automatic changelog update 2025-09-15 22:31:59 +03:00
CrystallEdge Server
4a73ff41a3 Automatic changelog update 2025-09-15 19:02:18 +03:00
Nim
3630ac156a Bone hound (#1718)
* bone hound

* fix

* fix2

* fix3

* fix4
2025-09-15 19:01:13 +03:00
CrystallEdge Server
03159992b9 Automatic changelog update 2025-09-15 17:46:47 +03:00
Kit
d0322972ad Merge pull request #1777 from KittyCat432/Deconstruction
Various changes again
2025-09-15 17:45:42 +03:00
Ed
9bd4fee694 Update tools.yml 2025-09-15 17:26:14 +03:00
Ed
8ddfba60a7 Update tools.yml 2025-09-15 17:11:37 +03:00
Ed
d3716300f8 Update tools.yml 2025-09-15 17:02:43 +03:00
Ed
d807c83a9c fix injectors 2025-09-15 16:51:58 +03:00
Ed
9425908ef2 adapt codebase 2025-09-15 14:49:58 +03:00
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)"
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
2025-09-14 20:42:51 +02:00
Kit
28308cee08 NLR!!!!! (#1771)
* NLR!!!!!

* remove from RU side
2025-09-14 18:43:28 +03:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175)
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-13 22:30:17 -07:00
CrystallEdge Server
239bd2aafd Automatic changelog update 2025-09-13 15:23:07 +03:00
Nim
fbef31dfa6 return simple armour (#1770) 2025-09-13 15:22:02 +03:00
CrystallEdge Server
f5bf4457e7 Automatic changelog update 2025-09-12 17:26:58 +03:00
CrystallEdge Server
4b619f5d56 Automatic changelog update 2025-09-12 17:25:23 +03:00
Nim
62a9ca1cfc nerf fire trap (#1768) 2025-09-12 17:24:18 +03:00
ApolloVector
8cc1b29ba4 Clake frag round fix (#40294)
make the frag work
2025-09-11 18:36:10 -07:00
PJBot
d8c55aef3c Automatic changelog update 2025-09-11 22:08:44 +00:00
UpAndLeaves
1245487c9a storage and inventory toolshed commands (#39046)
* First commit

* CommandImplementation on singletons is die, a la moony

* Fix duplicated thingy because yes

* Prototypes, bugfixes, refactoring oh my

* Remember to actually stage your ftl changes next time, leaf
2025-09-11 15:07:37 -07:00
PJBot
bb970970c9 Automatic changelog update 2025-09-11 20:00:29 +00:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
PJBot
77eca4a570 Automatic changelog update 2025-09-11 16:00:24 +00:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
ScarKy0
1f1c71919b Remove unused BulletTennis (#40285)
init
2025-09-11 16:36:39 +02:00
SlamBamActionman
9519eb5f7a Fix Linter errors (#40283)
Fix yoml
2025-09-11 15:17:37 +02:00
SlamBamActionman
b3e06de0e5 They're milk jugs, not milk cartons! 2025-09-11 14:02:05 +02:00
PJBot
b9920cbdcb Automatic changelog update 2025-09-11 11:38:33 +00:00
SlamBamActionman
8a4a6ec7ab Food Item Size Adjustment (#39203) 2025-09-11 13:37:25 +02:00
PJBot
5acc1633cb Automatic changelog update 2025-09-11 10:58:38 +00:00
IProduceWidgets
276e4df749 No take; Only throw. (#40143)
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-11 12:57:30 +02:00
CrystallEdge Server
02835be768 Automatic changelog update 2025-09-11 12:34:09 +03:00
Kit
ab0add0f32 Condense (#1765) 2025-09-11 12:33:03 +03:00
GeneralGaws
a7eb5dd22b Fix darts inhand sprites (#40207)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
2025-09-10 23:50:57 -04:00