juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,652 Commits 57 Branches 0 Tags
581ca2f5efefe8aeb53397af1f02bdf52012abea
Commit Graph

2 Commits

Author SHA1 Message Date
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
Princess Cheeseballs
9c165cb5a0 StaminaSystem to SharedStaminaSystem (#37199) 
* Init Commit

* Partial class

* Hands system slipped through
 2025-05-06 12:39:05 -04:00