Ed
5f7600b6a2
Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/CargoTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
# Content.Shared/Storage/Components/EntityStorageComponent.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/game_presets.yml
2025-09-08 13:12:50 +03:00
Princess Cheeseballs
6b73d320b9
[NEW STATUS SYSTEM] Drunkenness, Stuttering, Slurred Speech, and Bloodloss ( #38678 )
...
* The only commit that matters
* I had to stop playing with my cat to push this change
* Yaml removal
* Proper drunk status effect and remove shitcode
* Review changes
* whoops
* Whoops x2
* Update master fix merge conflicts
* Fix merge conflicts
* Dunk Component kill
* MORE RELAYS
* Holy fucking breaking changes
* Ough
* 46 file diff
* Fix bad commits
* Erm what the test fail?
* Fix those last two
* Merge conflicts
* Me when I fix the merge conflicts
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2025-08-18 16:26:29 -04:00
Ed
f2d9608a62
Merge remote-tracking branch 'upstream/stable' into ed-04-08-2025-upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Eye/VisibilityFlags.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
# Resources/Prototypes/Recipes/Reactions/chemicals.yml
# Tools/actions_changelogs_since_last_run.py
2025-08-04 12:44:29 +03:00
Perry Fraser
b0e1ce7c0c
feat: add a component for rejuvenateable status effects ( #39025 )
...
* feat: add a component for rejuvenateable effects
* feat: let god mode'd entities get buffs
* fix: handle old status effect system
Didn't realize BeforeStatusEffectAddedEvent was called by both systems,
oops.
* refactor: rename to RejuvenateRemovedStatusEffect
* fix: make forced sleeping a debuff again
Missed in rebase.
* refactor: make BeforeStatusEffectAdded two events
2025-07-24 17:13:29 +02:00
Princess Cheeseballs
e85bc1bb8c
Stunnable New Status and Cleanup ( #38618 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-07-21 19:22:11 +02:00
Ed
f59de85047
Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync
...
# Conflicts:
# Content.Client/Overlays/StencilOverlay.Weather.cs
# Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
# Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
2025-07-21 11:27:53 +03:00
Princess Cheeseballs
dec2d42a1d
Crawling Part 1: The Knockdownening ( #36881 )
...
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: ScarKy0 <scarky0@onet.eu >
2025-07-20 01:54:42 +02:00
Perry Fraser
dbfe05d5cc
refactor: rework the new status effect system to use containers ( #38915 )
2025-07-12 19:49:58 +03:00
Red
5b4440d18d
Merge pull request #1516 from crystallpunk-14/ed-08-07-2025-shader-sea
...
Status effect spells
2025-07-09 09:16:49 +03:00
Red
283d0863a0
New Status Effects system: Relay events ( #38579 )
2025-06-26 23:05:58 +03:00
