Dmitry
c682eb80b4
merge remote master, upstream
2025-10-26 22:31:58 +07:00
Princess Cheeseballs
4aac3dbc9d
Fix Being Drunk! ( #41002 )
...
* Drunk moment
* push
* fix test fails + a smidge of cleanup
* two smidges of cleanup
* Unpredicted so don't need the workaround
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-21 20:12:36 +00:00
Princess Cheeseballs
c455386ce3
Fix Cryptobolin and make it use NewStatusEffectSystem. ( #40675 )
...
* Push
* Mercury too I guess???
* Update comment
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-14 02:18:53 +00:00
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
Tayrtahn
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId ( #38814 )
...
* The easy ones
* For certain values of easy
* Easy test
* Hair
* Fix sandbox violations
* Sort usings
2025-07-07 21:57:05 +02:00
lzk
814202b277
Slurred accent tweaks ( #1539 )
2023-11-02 18:19:33 +03:00
Morb0
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Waylon Cude
9cbcf67b1a
Metabolism fixes ( #20402 )
...
* In-progress commit for fixing metabolism system
* Commit with all debugging in there
In case I have to revert or something
* Cleanup debug commands
2023-09-22 15:01:42 -05:00
lzk
ae29a31113
localize slurred accent ( #1419 )
2023-09-19 22:52:13 +03:00
Vordenburg
7582474f1a
Lint more const string prototypes ( #18922 )
2023-08-13 20:26:59 -04:00
Leon Friedrich
c25f2e6283
Drunk Shader ( #8910 )
...
Co-authored-by: Kara D <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-23 14:33:25 +10:00
