Merge branch 'Fansana:master' into Xenospawners

Fansana · Aug 27, 2024 · 4d73f92 · 4d73f92
2 parents 7764766 + 06bce61
commit 4d73f92
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 5 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -725,3 +725,7 @@ Entries:
       message: added Vibrators
   id: 98
   time: '2024-08-27T02:25:12.0000000+00:00'
+- author: fenndragon
+  changes: []
+  id: 99
+  time: '2024-08-27T20:07:59.0000000+00:00'
diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/slimes.yml
@@ -9,7 +9,7 @@
     color: "#FFFDFB"
   - type: Sprite
     drawdepth: Mobs
-    sprite: Mobs/Aliens/elemental.rsi
+    sprite: Floof/Mobs/Animals/elemental.rsi
     layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
@@ -26,7 +26,7 @@
     color: "#45072f"
   - type: Sprite
     drawdepth: Mobs
-    sprite: Mobs/Aliens/elemental.rsi
+    sprite: Floof/Mobs/Animals/elemental.rsi
     layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
@@ -43,7 +43,7 @@
     color: "#ae0072"
   - type: Sprite
     drawdepth: Mobs
-    sprite: Mobs/Aliens/elemental.rsi
+    sprite: Floof/Mobs/Animals/elemental.rsi
     layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
@@ -60,7 +60,7 @@
     color: "#c90084"
   - type: Sprite
     drawdepth: Mobs
-    sprite: Mobs/Aliens/elemental.rsi
+    sprite: Floof/Mobs/Animals/elemental.rsi
     layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive

diff --git a/Resources/Textures/Floof/Mobs/Animals/elemental.rsi/alive.png b/Resources/Textures/Floof/Mobs/Animals/elemental.rsi/alive.png
diff --git a/Resources/Textures/Floof/Mobs/Animals/elemental.rsi/dead.png b/Resources/Textures/Floof/Mobs/Animals/elemental.rsi/dead.png
diff --git a/Resources/Textures/Floof/Mobs/Animals/elemental.rsi/meta.json b/Resources/Textures/Floof/Mobs/Animals/elemental.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for Space Station 14. Edited by Fenndragon",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "alive",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "DakoDragon, discord ID: 56038550335922176",
+    "copyright": "Created by Fenndragon, discord ID: 190763499276861440",
     "size": {
         "x": 64,
         "y": 64