Merge pull request #86 from Corvax-Frontier/sprites

Corvax Resprites
Corvax-Frontier · Apr 28, 2024 · 45f542e · 45f542e
2 parents bfc7568 + ca68f7c
commit 45f542e
Show file tree

Hide file tree

Showing 51 changed files with 104 additions and 57 deletions.
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/signs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/signs.yml
@@ -28,7 +28,6 @@
   - type: Sprite
     sprite: Nyanotrasen/Structures/Wallmounts/conspiracy_board.rsi
     state: icon
-    offset: "0.5,0"
 
 - type: entity
   parent: BaseSign

diff --git a/.../Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png b/.../Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
@@ -1,41 +1,49 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser, resprited by fazan_saverg (842350861123452948) on discord.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "equipped-FEET",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser, resprited by fazan_saverg (842350861123452948) on discord. Sprite reptilian created by ugog",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "on-equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "icon-on"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-FEET-reptilian",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET-reptilian",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/...xtures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png b/...xtures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png
diff --git a/...ures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png b/...ures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png
diff --git a/...urces/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png b/...urces/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by Nimfar11 (GitHub) for Space Station 14",
+    "copyright": "Made by Nimfar11 (GitHub) for Space Station 14 & edited by github:Morb0",
     "size": {
         "x": 32,
         "y": 32
@@ -24,12 +24,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ]
             ]
         },
@@ -47,12 +47,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ]
             ]
         }

diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/representative_door.png b/Resources/Textures/Structures/Storage/closet.rsi/representative_door.png
diff --git a/...xtures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET-reptilian.png b/...xtures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/equipped-FEET-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy. Sprite reptilian created by ugog",
     "size": {
         "x": 32,
         "y": 32
@@ -11,10 +11,18 @@
             "name": "equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "on-equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "on-equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "icon"
         },

diff --git a/...res/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET-reptilian.png b/...res/_NF/Clothing/Shoes/Boots/magboots-combat.rsi/on-equipped-FEET-reptilian.png
diff --git a/...ures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/equipped-FEET-reptilian.png b/...ures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/equipped-FEET-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by Dvir001 (GitHub)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by Dvir001 (GitHub). Sprite reptilian created by ugog",
     "size": {
         "x": 32,
         "y": 32
@@ -11,10 +11,18 @@
             "name": "equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "on-equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "on-equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "icon"
         },

diff --git a/...s/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-equipped-FEET-reptilian.png b/...s/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/on-equipped-FEET-reptilian.png
diff --git a/...res/_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/equipped-FEET-reptilian.png b/...res/_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/equipped-FEET-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy | Resprited for mercenary by erhardsteinhauer (discord)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy | Resprited for mercenary by erhardsteinhauer (discord). Sprite reptilian created by ugog",
     "size": {
         "x": 32,
         "y": 32
@@ -11,10 +11,18 @@
             "name": "equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "on-equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "on-equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "icon"
         },

diff --git a/.../_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/on-equipped-FEET-reptilian.png b/.../_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/on-equipped-FEET-reptilian.png
diff --git a/...Textures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi/equipped-FEET-reptilian.png b/...Textures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi/equipped-FEET-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "Content created by GhostPrince for Frontier Server",
+    "copyright": "Content created by GhostPrince for Frontier Server. Sprite reptilian created by ugog",
     "size": {
         "x": 32,
         "y": 32
@@ -11,10 +11,18 @@
             "name": "equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "on-equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "on-equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "icon"
         },

diff --git a/...tures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi/on-equipped-FEET-reptilian.png b/...tures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi/on-equipped-FEET-reptilian.png
diff --git a/...xtures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/equipped-FEET-reptilian.png b/...xtures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/equipped-FEET-reptilian.png
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy. Sprite reptilian created by ugog",
     "size": {
         "x": 32,
         "y": 32
@@ -11,10 +11,18 @@
             "name": "equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "on-equipped-FEET",
             "directions": 4
         },
+        {
+            "name": "on-equipped-FEET-reptilian",
+            "directions": 4
+        },
         {
             "name": "icon"
         },

diff --git a/...res/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-equipped-FEET-reptilian.png b/...res/_NF/Clothing/Shoes/Boots/magboots-pirate.rsi/on-equipped-FEET-reptilian.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png
diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png
diff --git a/Resources/Textures/_NF/Structures/Holo/nfsd.rsi/icon.png b/Resources/Textures/_NF/Structures/Holo/nfsd.rsi/icon.png
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/broken.png
diff --git a/...xtures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/normal-unshaded.png b/...xtures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/normal-unshaded.png
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtech.rsi/off.png
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/mercenary_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/mercenary_door.png