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
Princess Cheeseballs
d488ca96b2
Alerts Cleanup and API ( #39544 )
...
* alert cleanup and API
* I expect update loops to be at the top.
* Address review
* Address review x 2
* Merg my PR
* Fix
* Update Content.Shared/Alert/AlertsSystem.cs
webedit
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
* FIX THAT TEST FAIL!!!!
* Me when I forget to actually give you alerts
* Hammedborgar
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
2025-09-05 12:45:48 +03: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
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
Princess Cheeseballs
ac895a0db4
Stun and Stamina Visuals ( #37196 )
...
* Stun animation
* Commit 2
* Almost working commit
* Best commit
* Minor cleanup and value adjustments
* Fix animation data getting wasted and cleaned up some stuff
* Don't animate if dead
* AppearanceSystem is for chumps
* Cleanup
* More cleanup
* More cleanup
* Half working commit
* Documentation
* Works
* ComponentHandleState my beloved
* AppearanceComp compatibility
* Address review
* Borgar
* AND NOW THE END IS NEAR
* AppearanceSystem compliance (Real)
* Don't need to log missing there
* I actually hate mob prototypes so much you don't even know
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
2025-07-11 14:13:11 +02:00
Ed
a06144b083
fix second wind alert
2025-06-29 19:15:12 +03:00
Ed
59e6435fe2
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
# Resources/Prototypes/Procedural/vgroid.yml
2025-05-12 14:25:42 +03:00
Princess Cheeseballs
9c165cb5a0
StaminaSystem to SharedStaminaSystem ( #37199 )
...
* Init Commit
* Partial class
* Hands system slipped through
2025-05-06 12:39:05 -04:00
