Allow changing instrument style while playing them (#9946)

* Properly dirty changes when calling "SetInstrumentProgram" method * Allow using swappable instrument verbs even while playing the instrument. It's funnier this way
space-wizards · Jul 24, 2022 · cb5f051 · cb5f051
1 parent 16a08a6
commit cb5f051
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Content.Server/Instruments/SwappableInstrumentSystem.cs b/Content.Server/Instruments/SwappableInstrumentSystem.cs
@@ -25,9 +25,6 @@ private void AddStyleVerb(EntityUid uid, SwappableInstrumentComponent component,
         if (!TryComp<SharedInstrumentComponent>(uid, out var instrument))
             return;
 
-        if (instrument.Playing) //no changing while playing
-            return;
-
         var priority = 0;
         foreach (var entry in component.InstrumentList)
         {

diff --git a/Content.Shared/Instruments/SharedInstrumentSystem.cs b/Content.Shared/Instruments/SharedInstrumentSystem.cs
@@ -20,8 +20,10 @@ public virtual void EndRenderer(EntityUid uid, bool fromStateChange, SharedInstr
 
     public void SetInstrumentProgram(SharedInstrumentComponent component, byte program, byte bank)
     {
-        component.InstrumentProgram = program;
         component.InstrumentBank = bank;
+        component.InstrumentProgram = program;
+        component.DirtyRenderer = true;
+        Dirty(component);
     }
 
     private void OnGetState(EntityUid uid, SharedInstrumentComponent instrument, ref ComponentGetState args)