Commit graph

15 commits

Author SHA1 Message Date
Dmitry
871b3b3123 upstream 2025-09-07 22:54:54 +07: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
Dmitry
60c835f02c master 21.7 syns 2025-07-21 00:27:46 +07: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
Morb0
429c0c2f9e Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
2023-10-22 18:36:48 +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
Morb0
22283a01f1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Nuke/NukeSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Content.Shared/Chat/SharedChatSystem.cs
2023-08-15 00:08:39 +03:00
Vordenburg
7582474f1a
Lint more const string prototypes (#18922) 2023-08-13 20:26:59 -04:00
Ilushkins33
f8f1b492df
Support Cyrillic stuttering (#955) 2023-04-05 02:00:28 -07: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