Wieldable/two-handed weapons (#4554)
* wielding kinda works * rough out all the edges, wielding works nicely * popups + loc * increase damage & extra damage against whitelist * small fixes * forgot to actually do that * reviews * reviews + thing * use resistances and not extradamageagainstwhitelist * slashy * make increasedamageonwield and melee hit events work with modifiersets * Silly individual
This commit is contained in:
@@ -122,6 +122,8 @@ namespace Content.Shared.Pulling.Components
|
||||
}
|
||||
}
|
||||
|
||||
valuePuller.Pulling = Owner;
|
||||
|
||||
// Continue with pulling process.
|
||||
|
||||
var pullAttempt = new PullAttemptMessage(pullerPhysics, _physics);
|
||||
@@ -241,7 +243,7 @@ namespace Content.Shared.Pulling.Components
|
||||
|
||||
Puller = puller;
|
||||
|
||||
if (Puller != puller)
|
||||
if(Puller != puller)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -266,6 +268,11 @@ namespace Content.Shared.Pulling.Components
|
||||
_physics.RemoveJoint(_pullJoint);
|
||||
}
|
||||
|
||||
if (user != null && user.TryGetComponent<SharedPullerComponent>(out var puller))
|
||||
{
|
||||
puller.Pulling = null;
|
||||
}
|
||||
|
||||
_pullJoint = null;
|
||||
Puller = null;
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user