diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index f39b7d6e0d..f9f9e45a31 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index 3960275bc8..fc7d15bf67 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index 6656842ab9..b7a46f8b1a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml similarity index 92% rename from Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml rename to Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index eaf81c2e3f..79d0dc5eca 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws-of-life.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index b9fdc3a66f..6c65076cb0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 43d4ee7eb9..45fb22a070 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml index 5c4f59e934..acc315f254 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 222a3b788b..362a32f6b2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/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 - diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png new file mode 100644 index 0000000000..6dd438fa90 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png new file mode 100644 index 0000000000..a5fecd02e0 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png new file mode 100644 index 0000000000..451d520dc1 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png new file mode 100644 index 0000000000..27285e1e94 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png new file mode 100644 index 0000000000..58a3c686c1 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png new file mode 100644 index 0000000000..ecd28e1402 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png new file mode 100644 index 0000000000..e512032624 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png new file mode 100644 index 0000000000..5f5347c2c5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png new file mode 100644 index 0000000000..a8a2e745c7 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png new file mode 100644 index 0000000000..5c8b0666f1 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png new file mode 100644 index 0000000000..ad5c2cc557 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png new file mode 100644 index 0000000000..6fc9244667 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png new file mode 100644 index 0000000000..ca7c75907d Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png new file mode 100644 index 0000000000..eb1d2ae1c0 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png new file mode 100644 index 0000000000..912f5aebce Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png new file mode 100644 index 0000000000..4cd6eea346 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png new file mode 100644 index 0000000000..95ff4de420 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png new file mode 100644 index 0000000000..ad53beead5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png new file mode 100644 index 0000000000..44eddad1f5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png new file mode 100644 index 0000000000..288f9fbce5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png new file mode 100644 index 0000000000..1603b67f4c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png new file mode 100644 index 0000000000..658024aefe Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json index cdfd58956c..4930783ae7 100644 --- a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png new file mode 100644 index 0000000000..7a139e9d1e Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png new file mode 100644 index 0000000000..2dac8a1b86 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tank.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/plasmatank.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tank.png rename to Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/plasmatank.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png new file mode 100644 index 0000000000..0b6ed65457 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png new file mode 100644 index 0000000000..42f5921e27 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png new file mode 100644 index 0000000000..7c17370261 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png new file mode 100644 index 0000000000..d3dbe6ee92 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png new file mode 100644 index 0000000000..62edeeca76 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png new file mode 100644 index 0000000000..b987b130eb Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png new file mode 100644 index 0000000000..3a6d56cea9 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png new file mode 100644 index 0000000000..7656b6d528 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png new file mode 100644 index 0000000000..963763073e Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png new file mode 100644 index 0000000000..82e7661f89 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png new file mode 100644 index 0000000000..3e636ae5aa Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png new file mode 100644 index 0000000000..f85ff8262a Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png new file mode 100644 index 0000000000..540fb72065 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png differ diff --git a/Resources/Textures/Clothing/Belt/ce.rsi/meta.json b/Resources/Textures/Clothing/Belt/ce.rsi/meta.json index 49dac66974..a01a9c6cb9 100644 --- a/Resources/Textures/Clothing/Belt/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/ce.rsi/meta.json @@ -8,8 +8,7 @@ }, "states": [ { - "name": "icon", - "directions": 1 + "name": "icon" }, { "name": "equipped-BELT", diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json index 2a9fd063af..9e595cf518 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json @@ -9,7 +9,7 @@ "states": [ { "name": "icon", - "directions": 1 + "directions": 4 }, { "name": "equipped-EYES", diff --git a/Resources/Textures/Objects/Devices/pda.rsi/equipped-BELT.png b/Resources/Textures/Objects/Devices/pda.rsi/equipped-BELT.png new file mode 100644 index 0000000000..5c8b0666f1 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 2ea705a466..c8bab2621c 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -16,6 +16,10 @@ ] ] }, + { + "name": "equipped-BELT", + "directions": 4 + }, { "name": "insert_overlay", "directions": 1, diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png new file mode 100644 index 0000000000..95ff4de420 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json index b4eb2638bb..372b211e3f 100644 --- a/Resources/Textures/Objects/Fun/Instruments/bike_horn.rsi/meta.json +++ b/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 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png new file mode 100644 index 0000000000..4cd6eea346 Binary files /dev/null and b/Resources/Textures/Objects/Fun/bikehorn.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json b/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json index 6bdaa41229..f6d7eebf1b 100644 --- a/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json +++ b/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]]}]} \ No newline at end of file +{ + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json index 6f0fd01ae1..5ee04603b1 100644 --- a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/multitool.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d63eb66230 Binary files /dev/null and b/Resources/Textures/Objects/Tools/multitool.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json index 17ee736389..2b499a45c1 100644 --- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json +++ b/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, diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/rcd.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0b6ed65457 Binary files /dev/null and b/Resources/Textures/Objects/Tools/rcd.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/rcd.png b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Tools/rcd.rsi/rcd.png rename to Resources/Textures/Objects/Tools/rcd.rsi/icon.png diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json index ace9e5c739..41da78bc42 100644 --- a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json +++ b/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 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json index e78576c6fe..8611d9cd90 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json @@ -22,4 +22,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json index b6ae019734..6e2fe195a4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json @@ -80,4 +80,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/equipped-BELT.png new file mode 100644 index 0000000000..dbd600edbb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json index a49523ff93..f01ac01f35 100644 --- a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json +++ b/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 @@ ] } -