Merge remote-tracking branch 'upstream/master' into ups

2024-08-01 11:20:57 +03:00
parent c4307602d7 4a860c46b5
commit 26cd9ad80c
576 changed files with 102382 additions and 87280 deletions
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -303,7 +303,7 @@
  noSpawn: true
  components:
  - type: InstantAction
-    icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
+    icon: { sprite: White/Objects/Fun/bikehorn.rsi, state: icon }
    event: !type:ActivateImplantEvent
    useDelay: 1