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 |
|