Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

Markings

Long human ears (#30490)

2024-08-21 17:44:43 -06:00

Prototypes

Elf species (#205)

2024-06-03 23:50:05 +03:00

HairStyles.cs

Lint more const string prototypes (#18922)

2023-08-13 20:26:59 -04:00

HumanoidAppearanceComponent.cs

Fix lizard snouts disappearing when wearing masks (#25716)

2024-04-19 15:39:47 +10:00

HumanoidCharacterAppearance.cs

New tiefling hue (#155)

2024-05-18 17:46:19 +03:00

HumanoidProfileExport.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

HumanoidVisualLayers.cs

Long human ears (#30490)

2024-08-21 17:44:43 -06:00

HumanoidVisualLayersExtension.cs

Female bodies support (#350)

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

ICharacterAppearance.cs

Humanoid appearance refactor (#10882)

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

NamingSystem.cs

Edgefication (#590)

2024-11-18 14:40:52 +03:00

Sex.cs

Audible emotes (#12708)

2023-01-25 08:29:41 -08:00

SharedHumanoidAppearanceSystem.cs

Move CloneAppearance to Shared (#35017)

2025-02-10 04:13:27 +01:00

SharedHumanoidMarkingModifierSystem.cs

Update trivial components to use auto comp states (#20539)

2023-09-28 16:20:29 -07:00

SkinColor.cs

New tiefling hue (#155)

2024-05-18 17:46:19 +03:00