Misc sprite changes (#15011)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c9c98b949ebe6c7e3579fe43c331df22f8d0845c..7383dca91d40c6e8834084bf78a7be8591d92a95 100644 (file)
--- 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 de2d6083ca5abc453ad89332a61aa1a5d154e4de..fc6d09bffac7a14b2629f3012b0c1ce0b0083988 100644 (file)
--- 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 309f2a9f5686305a05529babee8356e9b5800831..37a47342a6a0fadd153c1abb049caefe51b50e43 100644 (file)
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 9ad556d3c410e821a591bba5bb9247e61d12f70a..6e7958ee47550265c5d43aacdb943bbcaad816c2 100644 (file)
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 740bb752d022cc6012650f42133536adf71b2d1f..c5a4600a0022df1eb9fc6c063bda6c842fba972c 100644 (file)
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 395f115b50f129fb0c2fa76917eb73f943c11907..e1347199ea1a0c67c6900655547ff5442d383a27 100644 (file)
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 557e0302b1e6f953a9b12b26c98c11887b0db16e..1a8856301d52afcf75755dfee20832e5cd4ab624 100644 (file)
--- 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 9c51ad8d124d9f62c35002f31da374eb734a965b..a80691cdde55c7278b48ea9d1ad3e9df003627ef 100644 (file)
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 f35714867be56cb9657cd91923da944fef139d4e..e3d7f1dbd1c3c90bd0dbb3c1367d16c6763767d0 100644 (file)
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 539dec1e565abf8079ee65dee9275377b0a65ff0..6f0256e3f1f435bc09697446f808e909f849f455 100644 (file)
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 f30e8365a1d37cb53472155d5535d9a705b21948..c12582f36e578df8a86aa1bfddbbfe473e849058 100644 (file)
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 c990794c86a7520cc67e00edaa6b3f1f60a75eb6..d11d1d8f124398f138158832bc93726d53f5f73e 100644 (file)
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 4a5c1c74f1c6b311ae14225c3587a7b946ccb71a..3480c524fb4ab62b192f2faa6f04b95959d6ae58 100644 (file)
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 e6d4c04a8fa0ec0b2af9685f9abed67c77590a6e..8f449561cac126b6027c40d961171e77b483f5f0 100644 (file)
--- 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 2243cb263a273e9ce16f7e89c98db4bef1e7d765..059bf3abc261aa4727818fc603ed447515e31208 100644 (file)
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 54e903e22a339064dbcb131ef83ae0bcfcbc67fa..a64f85689e355201658cf830edb099256b2f067a 100644 (file)
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 2f819c90b9c6ccc8c11ed799a7ce275bcc518dfe..7a9d025c27724a5b12abec990adf106d353d4749 100644 (file)
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 158649e3448237e6a57632692643747ce8b65811..c9fe6b551c8ccd27ed97ad965c4fb5a6d7ad3afc 100644 (file)
--- 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 6a5db9ca3062767b21778b29fe5075b1e9813ec9..0a258654c0a4f7aae37693675a717e72982e9c4f 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png differ