Merge branch 'master' into Revert-New-Shotgun-Sprites

DeltaV-Station · Dec 31, 2023 · c8e30b9 · c8e30b9
2 parents 3829196 + 2a16108
commit c8e30b9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -8,6 +8,10 @@
     sprite: Objects/Tools/scissors.rsi
     state: icon
   - type: MagicMirror
+    AddSlotTime: 20
+    RemoveSlotTime: 20
+    SelectSlotTime: 20
+    ChangeSlotTime: 20
   - type: ActivatableUI
     key: enum.MagicMirrorUiKey.Key
     closeOnHandDeselect: true
@@ -22,4 +26,4 @@
       types:
         Piercing: 6
     soundHit:
-      path: "/Audio/Weapons/bladeslice.ogg"
+      path: "/Audio/Weapons/bladeslice.ogg"