Merge remote-tracking branch 'WD-core/master' into upstream-3

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "beaker"
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-			"name": "bottle"
+            "name": "bottle"
         },
         {
             "name": "box"
@@ -155,12 +155,12 @@
             "name": "writing_of_doom"
         },
         {
-			"name": "headset"
-		},
+            "name": "headset"
+        },
+        {
+            "name": "encryptokey"
+        },
         {
-			"name": "encryptokey"
-		},
-		{
             "name": "inhand-left",
             "directions": 4
         },
@@ -195,7 +195,7 @@
             "name": "shellpractice"
         },
         {
-            "name": "shellresin"
+            "name": "shellrubber"
         },
         {
             "name": "shellslug"
@@ -222,4 +222,4 @@
             "name": "ziplock"
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json

@@ -38,10 +38,10 @@
             "name": "improvised-spent"
         },
         {
-            "name": "resin"
+            "name": "rubber"
         },
         {
-            "name": "resin-spent"
+            "name": "rubber-spent"
         },
         {
             "name": "incendiary"
@@ -68,4 +68,4 @@
             "name": "depleted-uranium-spent"
         }
     ]
-}
+}