crystall-punk-14

Files

Ed c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml

2024-08-19 19:06:38 +03:00

EyeColorPicker.cs

Humanoid appearance refactor (#10882 )

2022-09-22 17:19:00 -05:00

HumanoidAppearanceSystem.cs

Female bodies support (#350 )

2024-07-24 09:11:31 +03:00

HumanoidMarkingModifierBoundUserInterface.cs

Reapply "Remove some BUI boilerplate" (#30214 ) (#30219 )

2024-07-21 14:48:13 +10:00

HumanoidMarkingModifierWindow.xaml

Shuttle console + FTL rework (#24430 )