Merge pull request #741 from Darki255/issue

Issue
AdventureTimeSS14 · Jun 1, 2024 · f719964 · f719964
2 parents 65c8994 + 804c520
commit f719964
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 27 deletions.
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
@@ -571,7 +571,7 @@
   description: Incredibly cute Mio, so soft and little shadowkin.
   components:
   - type: Sprite
-    sprite: Objects/Fun/toys.rsi
+    sprite: ADT/Objects/Fun/toys.rsi
     state: plusie_mio
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -528,6 +528,7 @@
   description: An adorable stuffed toy resembling the exceedingly rare magicarp.
   components:
   - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
     state: magicplush
 
 - type: entity
@@ -537,6 +538,7 @@
   description: An adorable stuffed toy resembling the legendary rainbow carp.
   components:
   - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
     state: rainbowcarpplush
   - type: PointLight
     radius: 1.5
@@ -551,6 +553,7 @@
   description: A holographic stuffed toy resembling science's nemesis - the holocarp.
   components:
   - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
     state: holoplush
 
 - type: entity
@@ -1070,11 +1073,11 @@
   description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
   components:
   - type: Sprite
-    sprite: Objects/Fun/toys.rsi
+    sprite: ADT/Objects/Fun/toys.rsi
     state: ntb
   - type: Item
     size: Small
-    sprite: Objects/Fun/toys.rsi
+    sprite: ADT/Objects/Fun/toys.rsi
     heldPrefix: ntb
   - type: Damageable
     damageContainer: Inorganic

diff --git a/...xtures/Objects/Fun/toys.rsi/holoplush.png → ...es/ADT/Objects/Fun/toys.rsi/holoplush.png b/...xtures/Objects/Fun/toys.rsi/holoplush.png → ...es/ADT/Objects/Fun/toys.rsi/holoplush.png
diff --git a/...tures/Objects/Fun/toys.rsi/magicplush.png → ...s/ADT/Objects/Fun/toys.rsi/magicplush.png b/...tures/Objects/Fun/toys.rsi/magicplush.png → ...s/ADT/Objects/Fun/toys.rsi/magicplush.png
diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
@@ -16,6 +16,9 @@
         {
             "name": "plushie_darina"
         },
+        {
+            "name": "plusie_mio"
+        },
         {
             "name": "plushie_iohan"
         },
@@ -147,6 +150,26 @@
         },
         {
             "name": "plushie_ursus"
+        },
+        {
+            "name": "ntb"
+        },
+        {
+            "name": "holoplush"
+        },
+        {
+            "name": "magicplush"
+        },
+        {
+            "name": "ntb-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "ntb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rainbowcarpplush"
         }
     ]
 }
diff --git a/.../Objects/Fun/toys.rsi/ntb-inhand-left.png → .../Objects/Fun/toys.rsi/ntb-inhand-left.png b/.../Objects/Fun/toys.rsi/ntb-inhand-left.png → .../Objects/Fun/toys.rsi/ntb-inhand-left.png
diff --git a/...Objects/Fun/toys.rsi/ntb-inhand-right.png → ...Objects/Fun/toys.rsi/ntb-inhand-right.png b/...Objects/Fun/toys.rsi/ntb-inhand-right.png → ...Objects/Fun/toys.rsi/ntb-inhand-right.png
diff --git a/...ces/Textures/Objects/Fun/toys.rsi/ntb.png → ...Textures/ADT/Objects/Fun/toys.rsi/ntb.png b/...ces/Textures/Objects/Fun/toys.rsi/ntb.png → ...Textures/ADT/Objects/Fun/toys.rsi/ntb.png
diff --git a/...tures/Objects/Fun/toys.rsi/plusie_mio.png → ...s/ADT/Objects/Fun/toys.rsi/plusie_mio.png b/...tures/Objects/Fun/toys.rsi/plusie_mio.png → ...s/ADT/Objects/Fun/toys.rsi/plusie_mio.png
diff --git a/...Objects/Fun/toys.rsi/rainbowcarpplush.png → ...Objects/Fun/toys.rsi/rainbowcarpplush.png b/...Objects/Fun/toys.rsi/rainbowcarpplush.png → ...Objects/Fun/toys.rsi/rainbowcarpplush.png
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -12,12 +12,9 @@
         },
         {
             "name": "plushie_penguin"
-        },
-            {
-            "name": "plushie_moth"
         },
         {
-            "name": "plusie_mio"
+            "name": "plushie_moth"
         },
         {
             "name": "plushie_rouny",
@@ -335,26 +332,6 @@
         {
             "name": "beachb-inhand-right",
             "directions": 4
-        },
-        {
-            "name": "ntb"
-        },
-        {
-            "name": "holoplush"
-        },
-        {
-            "name": "magicplush"
-        },
-        {
-            "name": "ntb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "rainbowcarpplush"
-        },
-        {
-            "name": "ntb-inhand-right",
-            "directions": 4
         }
     ]
 }