]> git.smokeofanarchy.ru Git - space-station-14.git/commit
New status effect system (#37238)
authorRed <96445749+TheShuEd@users.noreply.github.com>
Wed, 25 Jun 2025 11:41:35 +0000 (14:41 +0300)
committerGitHub <noreply@github.com>
Wed, 25 Jun 2025 11:41:35 +0000 (07:41 -0400)
commit78a94730bea427661e6e147b2bd76b6de4b2512a
tree01d3fc837686f597cd9ff14db1ac548091dbff34
parent8be0b7a614083758bd79a940c9741210ae75cf84
New status effect system (#37238)

* spectra

* documentation

* added into liquid anomaly

* Update TemporaryStealthComponent.cs

* Update TemporaryStealthComponent.cs

* integrated

* new system

* mark old status effect system as obsolete

* ForcedSleeping new status effect

* work with reagents

* networking???

* Revert "integrated"

This reverts commit bca02b82bae18ae131af593d7eb86e6de2745157.

* Revert "Update TemporaryStealthComponent.cs"

This reverts commit 4a5be8c4b704a0d1ff9544b2e245d8b2701ec580.

* Revert "Update TemporaryStealthComponent.cs"

This reverts commit a4875bcb41347638854bd723d96a51c3e6d38034.

* Revert "added into liquid anomaly"

This reverts commit df5086b14bb35f1467158a36807c0f2163a16d99.

* Revert "documentation"

This reverts commit 3629b9466758cbdfa4dd5e67ece122fa2f181138.

* Revert "spectra"

This reverts commit 2d03d88c16d16ad6831c19a7921b84600daeb284.

* drowsiness status effect remove

* reagents work

* polish, remove test changes

* first Fildrance review part

* Update misc.yml

* more fildrance review

* final part

* fix trailing spaces

* sleeping status effect

* drowsiness status effect

* Create ModifyStatusEffect.cs

* some tweak

* Yay!!! Manual networking

* minor nitpick

* oopsie

* refactor: xml-docs, notnullwhen attributes, whitespaces

* fildrance and emo review

* refactor: simplify check in SharedStatusEffectsSystem by using pattern matching, TryEffectsWithComp now returns set of Entity<T, StatusEffectComponent>

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
35 files changed:
Content.Client/Drowsiness/DrowsinessOverlay.cs
Content.Client/Drowsiness/DrowsinessSystem.cs
Content.Client/StatusEffectNew/ClientStatusEffectsSystem.cs [new file with mode: 0644]
Content.Server/Drowsiness/DrowsinessSystem.cs
Content.Server/StatusEffectNew/StatusEffectsSystem.cs [new file with mode: 0644]
Content.Server/Traits/Assorted/NarcolepsySystem.cs
Content.Shared/Bed/Sleep/ForcedSleepingComponent.cs [deleted file]
Content.Shared/Bed/Sleep/ForcedSleepingStatusEffectComponent.cs [new file with mode: 0644]
Content.Shared/Bed/Sleep/SleepingSystem.cs
Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
Content.Shared/Drowsiness/DrowsinessStatusEffectComponent.cs [moved from Content.Shared/Drowsiness/DrowsinessComponent.cs with 56% similarity]
Content.Shared/Drowsiness/DrowsinessSystem.cs
Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs [new file with mode: 0644]
Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
Content.Shared/StatusEffect/StatusEffectsSystem.cs
Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs [new file with mode: 0644]
Content.Shared/StatusEffectNew/Components/StatusEffectContainerComponent.cs [new file with mode: 0644]
Content.Shared/StatusEffectNew/SharedStatusEffectsSystem.cs [new file with mode: 0644]
Content.Shared/StatusEffectNew/StatusEffectNewSystem.API.cs [new file with mode: 0644]
Resources/Locale/en-US/entity-categories.ftl
Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
Resources/Prototypes/Entities/Mobs/Species/base.yml
Resources/Prototypes/Entities/StatusEffects/misc.yml [new file with mode: 0644]
Resources/Prototypes/Entities/categories.yml
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
Resources/Prototypes/Reagents/gases.yml
Resources/Prototypes/Reagents/medicine.yml
Resources/Prototypes/Reagents/narcotics.yml
Resources/Prototypes/Reagents/toxins.yml
Resources/Prototypes/status_effects.yml