More DoAfter Changes (#14609)
* DoAfters * Compact Clone() * Fix mice and cuffables * Try generalize attempt events * moves climbabledoafter event to shared, fixes issue with climbable target * Fix merge (cuffing) * Make all events netserializable * handful of doafter events moved * moves the rest of the events to their respective shared folders * Changes all mentions of server doafter to shared * stop stripping cancellation * fix merge errors * draw paused doafters * handle unpausing * missing netserializable ref * removes break on stun reference * removes cuffing state reference * Fix tools * Fix door prying. * Fix construction * Fix dumping * Fix wielding assert * fix rev * Fix test * more test fixes --------- Co-authored-by: keronshb <keronshb@live.com>
This commit is contained in:
@@ -18,7 +18,7 @@ namespace Content.Server.Cuffs
|
||||
|
||||
private void OnHandcuffGetState(EntityUid uid, HandcuffComponent component, ref ComponentGetState args)
|
||||
{
|
||||
args.State = new HandcuffComponentState(component.OverlayIconState, component.Cuffing);
|
||||
args.State = new HandcuffComponentState(component.OverlayIconState);
|
||||
}
|
||||
|
||||
private void OnCuffableGetState(EntityUid uid, CuffableComponent component, ref ComponentGetState args)
|
||||
@@ -33,7 +33,6 @@ namespace Content.Server.Cuffs
|
||||
TryComp(component.LastAddedCuffs, out cuffs);
|
||||
args.State = new CuffableComponentState(component.CuffedHandCount,
|
||||
component.CanStillInteract,
|
||||
component.Uncuffing,
|
||||
cuffs?.CuffedRSI,
|
||||
$"{cuffs?.OverlayIconState}-{component.CuffedHandCount}",
|
||||
cuffs?.Color);
|
||||
|
||||
Reference in New Issue
Block a user