NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Strapable Supplybot (#43786)

Browse source 
* supplybot

* fix for being able to buckle to itself
This commit is contained in:
InsoPL 2026-10-04 15:29:52 +00:00 • committed by GitHub
parent cfd925d9e7
commit b383ea8504
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
View file

@ -260,7 +260,7 @@ public abstract partial class SharedBuckleSystem
if (!_container.IsInSameOrNoContainer((buckleUid, null, null), (strapUid, null, null)))
return false;
if (user != null && !HasComp<HandsComponent>(user))
if (user != null && !HasComp<HandsComponent>(user) && strapUid != user)
{
if (popup)
_popup.PopupEntity(Loc.GetString("buckle-component-no-hands-message"), user.Value, user);
@ -526,7 +526,7 @@ public abstract partial class SharedBuckleSystem
if (!_interaction.InRangeUnobstructed(user.Value, strap.Owner, buckle.Comp.Range, popup: popup))
return false;
if (user.Value != buckle.Owner && !ActionBlocker.CanComplexInteract(user.Value))
if (user.Value != buckle.Owner && !ActionBlocker.CanComplexInteract(user.Value) && user.Value != strap.Owner)
return false;
}

3
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
View file

@ -440,6 +440,9 @@
- Supply
- type: Puller
needsHands: false
- type: Strap
position: Down
rotation: -90
- type: entity
parent: [ MobSiliconBase, MobCombat ]