Merge branch 'master' into races

Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6, inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "equipped-BACKPACK",
       "directions": 4
     },
     {
@@ -23,4 +23,4 @@
       "directions": 4
     }
   ]
-}
+}

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "created by IProduceWidgets",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Kevin Zheng 2022",
+  "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,10 @@
     {
       "name": "icon"
     },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+  "copyright": "Created by IProduceWidgets",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/CrystallPunk/Mobs/Customization/eyes.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "eyes",
+      "directions": 4
+    },
+    {
+      "name": "no_eyes"
+    }
+  ]
+}

Resources/Textures/CrystallPunk/Mobs/Species/Human/parts.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "head_f",
+      "directions": 4
+    },
+    {
+      "name": "head_m",
+      "directions": 4
+    },
+    {
+      "name": "l_arm",
+      "directions": 4
+    },
+    {
+      "name": "l_foot",
+      "directions": 4
+    },
+    {
+      "name": "l_hand",
+      "directions": 4
+    },
+    {
+      "name": "l_leg",
+      "directions": 4
+    },
+    {
+      "name": "r_arm",
+      "directions": 4
+    },
+    {
+      "name": "r_foot",
+      "directions": 4
+    },
+    {
+      "name": "r_hand",
+      "directions": 4
+    },
+    {
+      "name": "r_leg",
+      "directions": 4
+    },
+    {
+      "name": "torso_f",
+      "directions": 4
+    },
+    {
+      "name": "torso_m",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by Hemo (Discord) for CrystallPunk",
   "size": {
     "x": 32,
     "y": 32
@@ -10,10 +10,6 @@
     {
       "name": "icon"
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
@@ -21,6 +17,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
     }
   ]
 }

Resources/Textures/CrystallPunk/Objects/keys.rsi/meta.json

@@ -8,7 +8,79 @@
   "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
   "states": [
     {
-      "name": "base"
+      "name": "key1"
+    },
+    {
+      "name": "key2"
+    },
+    {
+      "name": "key3"
+    },
+    {
+      "name": "key4"
+    },
+    {
+      "name": "key5"
+    },
+    {
+      "name": "key6"
+    },
+    {
+      "name": "key7"
+    },
+    {
+      "name": "key8"
+    },
+    {
+      "name": "key9"
+    },
+    {
+      "name": "key10"
+    },
+    {
+      "name": "key11"
+    },
+    {
+      "name": "key12"
+    },
+    {
+      "name": "key13"
+    },
+    {
+      "name": "key14"
+    },
+    {
+      "name": "key15"
+    },
+    {
+      "name": "key16"
+    },
+    {
+      "name": "key17"
+    },
+    {
+      "name": "key18"
+    },
+    {
+      "name": "lock"
+    },
+    {
+      "name": "lockpick"
+    },
+    {
+      "name": "keyring"
+    },
+    {
+      "name": "ring-0"
+    },
+    {
+      "name": "ring-1"
+    },
+    {
+      "name": "ring-2"
+    },
+    {
+      "name": "ring-3"
     }
   ]
 }

Resources/Textures/CrystallPunk/Structures/Decoration/bonfire.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from /tg/station at commit 28b476ab6d17014e6f9e18a748d7c96be28de9a1, recolor and edited by TheShuEd for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bonfire"
+    },
+    {
+      "name": "bonfire_extinguished"
+    },
+    {
+      "name": "burning",
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/CrystallPunk/Structures/Walls/TEMPLATE_LONG.rsi/meta.json

@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 48
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (Discord) for CrystallPunk14",
+  "states": [
+    {
+      "name": "wood0",
+      "directions": 4
+    },
+    {
+      "name": "wood1",
+      "directions": 4
+    },
+    {
+      "name": "wood2",	
+      "directions": 4
+    },
+    {
+      "name": "wood3",
+      "directions": 4
+    },
+    {
+      "name": "wood4",
+      "directions": 4
+    },
+    {
+      "name": "wood5",
+      "directions": 4
+    },
+    {
+      "name": "wood6",
+      "directions": 4
+    },
+    {
+      "name": "wood7",
+      "directions": 4
+    },
+    {
+      "name": "full"
+    }
+  ]
+}