Merge pull request #59 from lzk228/04-24-sprites

Port some sprites

Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json

@@ -5,7 +5,7 @@
 		"y": 32
 	},
 	"license": "CC-BY-SA-3.0",
-	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+	"copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
 	"states": [
 		{
 			"name": "icon",
@@ -32,4 +32,4 @@
 			]
 		}
 	]
-}
+}

Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json

@@ -1 +1,25 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json

@@ -5,13 +5,21 @@
 		"y": 32
 	},
 	"license": "CC-BY-SA-3.0",
-	"copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+	"copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
 	"states": [
 		{
 			"name": "icon"
 		},
 		{
 			"name": "icon_open"
-		}
+		},
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        }
 	]
-}
+}

Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Potato1234x (github) for SS14",
+  "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam])",
+  "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+  "copyright": "https://github.com/tgstation/tgstation/blob/e10fd978b89bbc951d3f3546426aa7e4191c6967/icons/obj/drinks/soda.dmi",
   "states": [
     {
       "name": "icon"

Resources/Textures/Objects/Devices/swapper.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/71a1fee2f13730adee5302d34bfa0f0262314d63",
+    "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/71a1fee2f13730adee5302d34bfa0f0262314d63, resprite by KREKS",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json

@@ -1,15 +1,15 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, christmaslamp by Alekshhh (Github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046, christmaslamp by Alekshhh (Github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
         "name": "lamp",
-        "directions": 4
+		"directions": 4
     },
     {
       "name": "christmaslamp"
@@ -19,7 +19,7 @@
     },
     {
         "name": "lamp-on",
-        "directions": 4
+		"directions": 4
     },
     {
       "name": "off-inhand-left",

Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json

@@ -1,19 +1,19 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
         "name": "lampgreen",
-        "directions": 4
+		"directions": 4
     },
     {
         "name": "lampgreen-on",
-        "directions": 4
+		"directions": 4
     },
     {
       "name": "off-inhand-left",

Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json

@@ -1,19 +1,19 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
         "name": "bananalamp",
-        "directions": 4
+		"directions": 4
     },
     {
         "name": "bananalamp_on",
-        "directions": 4
+		"directions": 4
     },
     {
       "name": "floodlight"

Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305",
+  "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305, resprite by mureixlol",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+    "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/pull/970/commits/6f0a020e35a78b997420ca8ffff2c1de4bad3428",
     "states": [
         {
             "name": "cart",

Resources/Textures/Objects/Specific/Medical/hypospray.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/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/23601a50d2c733122dc76e188984ed3e57aaa470",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Homegrown by @ninruB#7795, inhand sprites by лазік#7305",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe, inhand sprites by лазік#7305",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version":1,
     "license":"CC-BY-SA-3.0",
-    "copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi",
+    "copyright":"assembly.png, closed.png, closing.png, open.png, opening.png taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/639e77f6e957bce88d9734b4b97b249738af42b1, other from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi",
     "size": {
         "x":32,
         "y":32
@@ -156,6 +156,10 @@
             "name":"bolted_unlit",
             "directions":4
         },
+        {
+            "name":"bolted_open_unlit",
+            "directions":4
+        },
         {
             "name":"welded",
             "directions":4
@@ -167,6 +171,10 @@
         {
             "name": "emergency_unlit",
             "directions": 4
+        },
+        {
+            "name": "emergency_open_unlit",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, off.png taken from /tg/station commit ede31369cfa5ea1bed9262b5ef4bbef85f60fe26 and edited by @Flareguy",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/pull/71788/commits/2f94363d12aae96e757cb052d0f7846d7e11d1066",
   "size": {
     "x": 32,
     "y": 32
@@ -17,17 +17,21 @@
       "name": "deny-unshaded",
       "delays": [
         [
-          0.1,
-          0.1
+          0.2,
+          0.2,
+          0.2,
+          0.2
         ]
       ]
     },
     {
       "name": "normal-unshaded",
       "delays": [
         [
-          0.1,
-          0.1
+          0.2,
+          0.2,
+          0.2,
+          0.2
         ]
       ]
     },

Resources/Textures/Structures/Machines/electric_grill.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "license": "CC0-1.0",
-  "copyright": "Original base by deltanedas (github) for SS14. Resprited by (DISCORD)@ps3moira#9488",
+  "copyright": "Original base by deltanedas (github) for SS14. Resprited by (DISCORD)@ps3moira#9488. Resprited by KREKS",
   "size": {
     "x": 32,
     "y": 32