juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
Ed
2025-05-12 14:25:42 +03:00
parent 9e409a1eaf c261cc21a0
commit 59e6435fe2
1224 changed files with 155650 additions and 65383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -547,7 +547,7 @@ public abstract partial class InventorySystem
RaiseLocalEvent(itemUid, itemAttemptEvent, true);
if (itemAttemptEvent.Cancelled)
{
reason = attemptEvent.Reason ?? reason;
reason = itemAttemptEvent.Reason ?? reason;
return false;
}