crystall-punk-14

Files

Ed 59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml

2025-05-12 14:25:42 +03:00

Components

Mjollnir and Singularity Hammer for Wizard (#34446 )

2025-02-20 18:38:52 -05:00

EnergySword

Make hacking energy swords predicted (#34877 )

2025-02-05 20:48:28 +01:00

Events

Melee Executions (#30104 )

2024-08-11 13:05:54 +10:00

MeleeSoundSystem.cs

Power stuff (#31314 )