Merge branch 'master' into 2021-07-16/windoors

Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json

@@ -1,86 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "crowbar"
-    },
-    {
-      "name": "crowbar_brass"
-    },
-    {
-      "name": "crowbar_large"
-    },
-    {
-      "name": "crowbar_red"
-    },
-    {
-      "name": "cutters_brass"
-    },
-    {
-      "name": "cutters_red"
-    },
-    {
-      "name": "cutters_yellow"
-    },
-    {
-      "name": "drill_bolt"
-    },
-    {
-      "name": "drill_screw"
-    },
-    {
-      "name": "flashbang"
-    },
-    {
-      "name": "jaws_cutter"
-    },
-    {
-      "name": "jaws_pry"
-    },
-    {
-      "name": "multitool"
-    },
-    {
-      "name": "multitool_red"
-    },
-    {
-      "name": "multitool_yellow"
-    },
-    {
-      "name": "screwdriver"
-    },
-    {
-      "name": "screwdriver_brass"
-    },
-    {
-      "name": "screwdriver_head"
-    },
-    {
-      "name": "screwdriver_nuke"
-    },
-    {
-      "name": "stunbaton"
-    },
-    {
-      "name": "stunbaton_active"
-    },
-    {
-      "name": "stunbaton_nocell"
-    },
-    {
-      "name": "wrench"
-    },
-    {
-      "name": "wrench_brass"
-    },
-    {
-      "name": "wrench_medical"
-    }
-  ]
-}

Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json

@@ -1,183 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f3fdb19c606ea11786ebcad0350198f52ede17a3",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "analyzer",
-      "directions": 4
-    },
-    {
-      "name": "baton",
-      "directions": 4
-    },
-    {
-      "name": "beaker",
-      "directions": 4
-    },
-    {
-      "name": "c4",
-      "directions": 4
-    },
-    {
-      "name": "cigpack",
-      "directions": 4
-    },
-    {
-      "name": "clipboard",
-      "directions": 4
-    },
-    {
-      "name": "coil",
-      "directions": 4
-    },
-    {
-      "name": "crowbar",
-      "directions": 4
-    },
-    {
-      "name": "crowbar_red",
-      "directions": 4
-    },
-    {
-      "name": "cutters",
-      "directions": 4
-    },
-    {
-      "name": "drill",
-      "directions": 4
-    },
-    {
-      "name": "electronic",
-      "directions": 4
-    },
-    {
-      "name": "flare",
-      "directions": 4
-    },
-    {
-      "name": "flashbang",
-      "directions": 4
-    },
-    {
-      "name": "flashlight",
-      "directions": 4
-    },
-    {
-      "name": "geiger_counter",
-      "directions": 4
-    },
-    {
-      "name": "grenade",
-      "directions": 4
-    },
-    {
-      "name": "gun",
-      "directions": 4
-    },
-    {
-      "name": "handcuff",
-      "directions": 4
-    },
-    {
-      "name": "horn",
-      "directions": 4
-    },
-    {
-      "name": "horn_gold",
-      "directions": 4
-    },
-    {
-      "name": "hypo",
-      "directions": 4
-    },
-    {
-      "name": "injector",
-      "directions": 4
-    },
-    {
-      "name": "jawsoflife",
-      "directions": 4
-    },
-    {
-      "name": "knife",
-      "directions": 4
-    },
-    {
-      "name": "lighter",
-      "directions": 4
-    },
-    {
-      "name": "medipen",
-      "directions": 4
-    },
-    {
-      "name": "minibomb",
-      "directions": 4
-    },
-    {
-      "name": "painter",
-      "directions": 4
-    },
-    {
-      "name": "plasmatank",
-      "directions": 4
-    },
-    {
-      "name": "rcd",
-      "directions": 4
-    },
-    {
-      "name": "rolling_pin",
-      "directions": 4
-    },
-    {
-      "name": "rpd",
-      "directions": 4
-    },
-    {
-      "name": "rped",
-      "directions": 4
-    },
-    {
-      "name": "screwdriver",
-      "directions": 4
-    },
-    {
-      "name": "spade",
-      "directions": 4
-    },
-    {
-      "name": "spraybottle",
-      "directions": 4
-    },
-    {
-      "name": "spraycan",
-      "directions": 4
-    },
-    {
-      "name": "tele_baton",
-      "directions": 4
-    },
-    {
-      "name": "tray",
-      "directions": 4
-    },
-    {
-      "name": "welder",
-      "directions": 4
-    },
-    {
-      "name": "wrench",
-      "directions": 4
-    },
-    {
-      "name": "x4",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json

@@ -0,0 +1,166 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bottle"
+    },
+    {
+      "name": "bottle_spray"
+    },
+    {
+      "name": "crowbar"
+    },
+    {
+      "name": "crowbar_brass"
+    },
+    {
+      "name": "crowbar_red"
+    },
+    {
+      "name": "cutters_brass"
+    },
+    {
+      "name": "cutters_red"
+    },
+    {
+      "name": "cutters_handle"
+    },
+    {
+      "name": "cutters_blade"
+    },
+    {
+      "name": "cutters_yellow"
+    },
+    {
+      "name": "drill"
+    },
+    {
+      "name": "flashbang"
+    },
+    {
+      "name": "hatchet"
+    },
+    {
+      "name": "hoe"
+    },
+    {
+      "name": "hydro"
+    },
+    {
+      "name": "hypo"
+    },
+    {
+      "name": "jaws"
+    },
+    {
+      "name": "multitool"
+    },
+    {
+      "name": "pill"
+    },
+    {
+      "name": "plantbgone"
+    },
+    {
+      "name": "screwdriver"
+    },
+    {
+      "name": "screwdriver_brass"
+    },
+    {
+      "name": "screwdriver_head"
+    },
+    {
+      "name": "screwdriver_nuke"
+    },
+    {
+      "name": "secateurs"
+    },
+    {
+      "name": "spray_med"
+    },
+    {
+      "name": "spray_brute"
+    },
+    {
+      "name": "spray_burn"
+    },
+    {
+      "name": "spray_synth"
+    },
+    {
+      "name": "stunbaton"
+    },
+    {
+      "name": "wrench"
+    },
+    {
+      "name": "wrench_brass"
+    },
+    {
+      "name": "wrench_medical"
+    },
+    {
+      "name": "analyzer-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "c4-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "electronic-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "geiger_counter-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "injector-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "lighter-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "medipen-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "painter-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "plasmatank-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "rolling_pin-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "rpd-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "rped-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "tele_baton-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "tray-equipped-BELT",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Belt/plant.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3fd95ab2a061459c881eeab6dbecaae5a8884f0a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json

@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json

@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json

@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json

@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Fun/spraycans.rsi/meta.json

@@ -54,6 +54,10 @@
     },
     {
       "name": "spray_colors"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json

@@ -296,6 +296,10 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "clipboard-equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Misc/flare.rsi/meta.json

@@ -45,6 +45,10 @@
     {
       "name": "unlit-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

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

@@ -38,6 +38,10 @@
     },
     {
       "name": "beaker6"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

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

@@ -23,6 +23,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json

@@ -26,6 +26,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json

@@ -17,6 +17,10 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json

@@ -69,6 +69,22 @@
     },
     {
       "name": "coilall-30"
+    },
+    {
+      "name": "coil-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "coillv-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "coilmv-equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "coilhv-equipped-BELT",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Tools/crowbar.rsi/meta.json

@@ -17,6 +17,10 @@
     },
     {
       "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
     }
   ]
 }