Change opossum sprites | Add new pet poppy the safety opossum (#21672)

* Its better then what we have at least?

* weh2

* oops

* Last of it

* among us

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c98de30c1f9f4a92f00d31bb766822cf2c2239e2..60663785a6b4678d7df06bd72faaaa0df8c6f346 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2030,6 +2030,25 @@
     tags:
     - VimPilot
 
+- type: entity
+  name: possum
+  parent: MobPossum
+  suffix: Old sprite
+  id: MobPossumOld
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Animals/possum_old.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: possum_old
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: possum_old
+      Dead:
+        Base: possum_dead_old
+
 - type: entity
   name: raccoon
   parent: SimpleMobBase

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index f06fa6704f1bbae5ea890e54aed86808417f7629..9e669d7646193f6d0fafcea710ed2ebbb5c5f935 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -421,6 +421,48 @@
     - CannotSuicide
     - VimPilot
 
+- type: entity
+  name: Morty
+  parent: MobPossumMorty
+  id: MobPossumMortyOld
+  suffix: Old sprite
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Animals/possum_old.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: possum_old
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: possum_old
+      Dead:
+        Base: possum_dead_old
+
+- type: entity
+  name: Poppy # the Safety Possum
+  parent: MobPossumMorty
+  id: MobPossumPoppy
+  description: It's an opossum, a small scavenging marsupial. It's wearing appropriate personal protective equipment.
+  components:
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Animals/possum.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: poppy
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: poppy
+      Dead:
+        Base: poppy_dead
+
 - type: entity
   name: Morticia
   parent: MobRaccoon

diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/meta.json b/Resources/Textures/Mobs/Animals/possum.rsi/meta.json
index fd9ad6a836c260362224ae2c9312fd26c092713c..16b2b338726a901778a74046e0d136de4f25fc65 100644 (file)
--- a/Resources/Textures/Mobs/Animals/possum.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/possum.rsi/meta.json
@@ -1,23 +1,27 @@
 {
   "version": 1,
-  "size":
-  {
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/blob/c7442716b52ce4edeef5eaf5d2fc7c57a08a3f01/icons/mob/simple_animal/possum.dmi",
+  "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-NC-SA-3.0",
-  "copyright": "https://github.com/goonstation/goonstation/commit/c98666f47a90d106c7a154cedffc747b3769e933",
-  "states":
-  [
+  "states": [
     {
       "name": "possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
+      "directions": 4
     },
     {
       "name": "possum_dead",
-      "directions": 1,
-      "delays": [[1]]
+      "directions": 4
+    },
+    {
+      "name": "poppy",
+      "directions": 4
+    },
+    {
+      "name": "poppy_dead",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/poppy.png b/Resources/Textures/Mobs/Animals/possum.rsi/poppy.png
new file mode 100644 (file)
index 0000000..941d7c9
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum.rsi/poppy.png differ

diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/poppy_dead.png b/Resources/Textures/Mobs/Animals/possum.rsi/poppy_dead.png
new file mode 100644 (file)
index 0000000..ebb08a2
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum.rsi/poppy_dead.png differ

diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/possum.png b/Resources/Textures/Mobs/Animals/possum.rsi/possum.png
index b4b5713862bb81da54212474a47a4964f5752579..975a769d0704b73deefe306de33bd840567239f3 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/possum.rsi/possum.png and b/Resources/Textures/Mobs/Animals/possum.rsi/possum.png differ

diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png b/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png
index e7297e74573f7bf3d5612819cbc50353e035a4a2..7d817c9e908dc58a205c9f082e923ef9e0a5e2b0 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png and b/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png differ

diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json b/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json
new file mode 100644 (file)
index 0000000..6b96976
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json
@@ -0,0 +1,21 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from goonstation https://github.com/goonstation/goonstation/commit/c98666f47a90d106c7a154cedffc747b3769e933",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "possum_old",
+            "directions": 4,
+            "delays": [[1],[1],[1],[1]]
+        },
+        {
+            "name": "possum_dead_old",
+            "directions": 1,
+            "delays": [[1]]
+        }
+    ]
+}

diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_dead_old.png b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_dead_old.png
new file mode 100644 (file)
index 0000000..e7297e7
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_dead_old.png differ

diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_old.png b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_old.png
new file mode 100644 (file)
index 0000000..b4b5713
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_old.png differ