From: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:43:49 +0000 (+1000)
Subject: Misc sprite changes (#15011)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=41f8b401dab98e6764119c663ecb1a0b8aeced06;p=space-station-14.git

Misc sprite changes (#15011)
---

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c9c98b949e..7383dca91d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -902,11 +902,11 @@
   - type: DamageStateVisuals
     states:
       Alive:
-        Base: mouse-1
+        Base: mouse-2
       Critical:
-        Base: dead-1
+        Base: dead-2
       Dead:
-        Base: splat-1
+        Base: splat-2
   - type: Bloodstream
     bloodMaxVolume: 50
   - type: DiseaseCarrier
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index de2d6083ca..fc6d09bffa 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -2,7 +2,7 @@
     "version": 1,
 
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/1dc83191daf55d54f5e1285c2f8b1af8c2c99b75",
+    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00",
 
     "size": {
         "x": 32,
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
index 309f2a9f56..37a47342a6 100644
Binary files a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png and b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
index 9ad556d3c4..6e7958ee47 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
index 740bb752d0..c5a4600a00 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
index 395f115b50..e1347199ea 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
index 557e0302b1..1a8856301d 100644
--- a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/695aafae161eebebdea00d4a5d624ec154d06be2",
+  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/tree/23b5c47245804dd24507b75f250de5e87d34e294",
   "size": {
     "x": 32,
     "y": 32
@@ -14,18 +14,10 @@
       "name": "idle",
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.4,
+          0.4,
+          0.4,
+          0.4
         ]
       ]
     },
@@ -33,25 +25,18 @@
       "name": "inserting",
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
         ]
       ]
     },
@@ -59,31 +44,22 @@
       "name": "printing",
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          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
         ]
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
index 9c51ad8d12..a80691cdde 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png differ
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png
index f35714867b..e3d7f1dbd1 100644
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png
index 539dec1e56..6f0256e3f1 100644
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png
index f30e8365a1..c12582f36e 100644
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png differ
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png
index c990794c86..d11d1d8f12 100644
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png differ
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png
index 4a5c1c74f1..3480c524fb 100644
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png differ
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json b/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json
index e6d4c04a8f..8f449561ca 100644
--- a/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/vgstation-coders/vgstation13/raw/78a32d846158a67dcd0ca2375e408fec298b46a0/icons/obj/power.dmi",
+    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/4f88b9314336631929c9cdddb1567fc08f83bf9e and modified by potato1234x (github) for ss14",
     "states": [
         {
             "name": "light-off"
@@ -23,10 +23,10 @@
             "name": "light-charging",
             "delays": [
                 [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
                 ]
             ]
         },
@@ -34,8 +34,8 @@
             "name": "light-charged",
             "delays": [
                 [
-                    0.5,
-                    0.5
+                    0.6,
+                    0.6
                 ]
             ]
         },
@@ -43,8 +43,8 @@
             "name": "light-empty",
             "delays": [
                 [
-                    0.5,
-                    0.5
+                    0.8,
+                    0.8
                 ]
             ]
         }
diff --git a/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png
index 2243cb263a..059bf3abc2 100644
Binary files a/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png and b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
index 54e903e22a..a64f85689e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
index 2f819c90b9..7a9d025c27 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
index 158649e344..c9fe6b551c 100644
--- a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/crates.dmi",
+  "copyright": "Taken from YogStation at commit https://github.com/yogstation13/Yogstation/commit/fa832b902f5130c41b21973e7e8b60b4d7a795b4 and modified by potato1234x (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
index 6a5db9ca30..0a258654c0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png differ