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
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
367ff79006
Accents Event to Shared ( #38948 )
...
* 27 file diff
* 27 file diff 2
* Apply suggestions from code review
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-07-12 22:52:51 +02:00
Token
d54d27cda4
stuttering on bloodloss and electricity damage ( #294 )
2024-07-03 14:17:34 +03:00
Vasilis
9ea8e03c23
Social a-anxiety/st-st-stuttering t-trait. ( #20500 )
...
* This was supposed to be a challenge
* Component magik
* Add documentation
2023-10-21 13:09:54 -07:00
Vordenburg
7582474f1a
Lint more const string prototypes ( #18922 )
2023-08-13 20:26:59 -04:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
Acruid
5b1cd2dd96
ECSatize AlertsSystem ( #5559 )
2022-01-05 19:19:23 +11:00
pointer-to-null
07c6f39a6f
Stuttering time accumulation fix. ( #5817 )
2021-12-19 16:27:07 -07:00
pointer-to-null
090e74792c
Status effects fix. Refresh the status effect cooldown. ( #5708 )
2021-12-06 23:18:07 -07:00
Vera Aguilera Puerto
3001ea38cc
Add-d-ds s-s-stut-ttering t-to the g-gam-me ( #4901 )
2021-10-17 01:23:31 +02:00
