Add belt slots for several items

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -17,8 +17,10 @@
     state: pda
   - type: Clothing
     QuickEquip: false
+    size: 10
     Slots:
     - idcard
+    - Belt
   - type: PointLight
     enabled: false
     radius: 3

Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml

@@ -7,17 +7,15 @@
   - type: Sprite
     sprite: Objects/Fun/bikehorn.rsi
     state: icon
-
-
-
-  - type: Item
-    size: 5
+  - type: Clothing
     sprite: Objects/Fun/bikehorn.rsi
+    size: 5
+    Slots:
+      - Belt
+    QuickEquip: false
   - type: ItemCooldown
-
   - type: EmitSoundOnUse
     sound: /Audio/Items/bikehorn.ogg
     semitoneVariation: 6
-
   - type: UseDelay
     delay: 0.5

Resources/Prototypes/Entities/Objects/Fun/instruments.yml

@@ -202,10 +202,12 @@
   - type: Sprite
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     state: icon
-
-  - type: Item
+  - type: Clothing
     size: 24
     sprite: Objects/Fun/Instruments/bike_horn.rsi
+    Slots:
+      - Belt
+    QuickEquip: false
 
 - type: entity
   name: super synthesizer

Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml

@@ -7,8 +7,12 @@
     - type: Sprite
       sprite: Objects/Tools/jaws_of_life.rsi
       state: jaws_pry
-    - type: Item
+    - type: Clothing
       sprite: Objects/Tools/jaws_of_life.rsi
+      size: 50
+      QuickEquip: false
+      Slots:
+        - Belt
     - type: TilePrying
     - type: Tool
       qualities:

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -40,8 +40,6 @@
     layers:
       - state: screwdriver-map
       - state: screwdriver-screwybits
-
-
   - type: Item
     sprite: Objects/Tools/screwdriver.rsi
   - type: ItemCooldown
@@ -126,8 +124,12 @@
   - type: Sprite
     sprite: Objects/Tools/multitool.rsi
     state: multitool
-  - type: Item
+  - type: Clothing
+    size: 10
     sprite: Objects/Tools/multitool.rsi
+    QuickEquip: false
+    Slots:
+    - Belt
   - type: Tool
     qualities:
       - Multitool
@@ -144,6 +146,7 @@
       state: drill_screw
     - type: Item
       sprite: Objects/Tools/drill.rsi
+      size: 20
     - type: Tool
       qualities:
         - Screwing
@@ -170,9 +173,13 @@
     delay: 1.0
   - type: Sprite
     sprite: Objects/Tools/rcd.rsi
-    state: rcd
-  - type: Item
+    state: icon
+  - type: Clothing
+    size: 20
     sprite: Objects/Tools/rcd.rsi
+    QuickEquip: false
+    Slots:
+    - Belt
 
 - type: entity
   name: RCD Ammo

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -13,7 +13,6 @@
       - state: mag-unshaded-4
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
@@ -53,7 +52,6 @@
       - state: mag-unshaded-4
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
@@ -134,10 +132,12 @@
       - state: mag-unshaded-0
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
-
-  - type: Item
-    size: 24
+  - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
+    size: 24
+    QuickEquip: false
+    Slots:
+    - Belt
     HeldPrefix: taser4
   - type: RangedWeapon
   - type: BatteryBarrel

Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml

@@ -9,8 +9,12 @@
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
-  - type: Item
+  - type: Clothing
+    sprite: Objects/Weapons/Grenades/grenade.rsi
     size: 5
+    QuickEquip: false
+    Slots:
+    - Belt
   - type: OnUseTimerTrigger
     delay: 3.5
   - type: Explosive
@@ -39,8 +43,12 @@
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
-  - type: Item
+  - type: Clothing
+    sprite: Objects/Weapons/Grenades/flashbang.rsi
     size: 5
+    QuickEquip: false
+    Slots:
+    - Belt
   - type: OnUseTimerTrigger
     delay: 3.5
   - type: FlashExplosive

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -4,28 +4,25 @@
   parent: BaseItem
   id: Stunbaton
   components:
-    - type: Sprite
-      sprite: Objects/Weapons/Melee/stunbaton.rsi
-      state: stunbaton_off
-
-
-
-    - type: Stunbaton
-      damage: 1
-      range: 0.75
-      arcwidth: 0
-      arc: default
-
-    - type: PowerCellSlot
-      slotSize: Medium
-      startingCellType: PowerCellMediumHigh
-
-    - type: Item
-      size: 10
-      sprite: Objects/Weapons/Melee/stunbaton.rsi
-      HeldPrefix: off
-
-    - type: ItemCooldown
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/stunbaton.rsi
+    state: stunbaton_off
+  - type: Stunbaton
+    damage: 1
+    range: 0.75
+    arcwidth: 0
+    arc: default
+  - type: PowerCellSlot
+    slotSize: Medium
+    startingCellType: PowerCellMediumHigh
+  - type: ItemCooldown
+  - type: Clothing
+    sprite: Objects/Weapons/Melee/stunbaton.rsi
+    HeldPrefix: off
+    QuickEquip: false
+    size: 20
+    Slots:
+    - Belt
 
 - type: entity
   name: flash
@@ -35,18 +32,12 @@
     - type: Sprite
       sprite: Objects/Weapons/Melee/flash.rsi
       state: flash
-
-
-
     - type: Flash
       damage: 0
       cooldownTime: 1
       arc: smash
       hitSound: /Audio/Weapons/flash.ogg
-
     - type: Item
       size: 2
       sprite: Objects/Weapons/Melee/flash.rsi
-
     - type: ItemCooldown
-

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

@@ -1,101 +1,183 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
+  "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,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "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,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "handcuff",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
+    },
+    {
+      "name": "horn",
+      "directions": 4
+    },
+    {
+      "name": "horn_gold",
+      "directions": 4
+    },
+    {
+      "name": "hypo",
+      "directions": 4
     },
     {
       "name": "injector",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "tank",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "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/ce.rsi/meta.json

@@ -8,8 +8,7 @@
   },
   "states": [
     {
-      "name": "icon",
-      "directions": 1
+      "name": "icon"
     },
     {
       "name": "equipped-BELT",

Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json

@@ -9,7 +9,7 @@
   "states": [
     {
       "name": "icon",
-      "directions": 1
+      "directions": 4
     },
     {
       "name": "equipped-EYES",

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

@@ -16,6 +16,10 @@
         ]
       ]
     },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
     {
       "name": "insert_overlay",
       "directions": 1,

Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json

@@ -51,6 +51,24 @@
           1
         ]
       ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
     }
   ]
 }

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

@@ -1 +1,60 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

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

@@ -45,39 +45,11 @@
     },
     {
       "name": "inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     }
   ]
 }

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

@@ -41,6 +41,24 @@
         ]
       ]
     },
+    {
+      "name": "equipped-BELT",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
     {
       "name": "multitool",
       "directions": 1,

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

@@ -43,7 +43,25 @@
             ]
         },
         {
-            "name": "rcd",
+            "name": "equipped-BELT",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon",
             "directions": 1,
             "delays": [
                 [
@@ -61,4 +79,4 @@
             ]
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json

@@ -22,4 +22,4 @@
             ]
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json

@@ -80,4 +80,4 @@
             "directions": 4
         }
     ]
-}
+}

Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json

@@ -26,6 +26,24 @@
                 ]
             ]
         },
+        {
+            "name": "equipped-BELT",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "off-inhand-right",
             "directions": 4,
@@ -140,4 +158,3 @@
 
     ]
 }
-