diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index f67ff53d7c..ff9cbd744a 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -20,8 +20,7 @@ - type: StorageFill contents: - id: PowerDrill - - id: Wirecutter - - id: Crowbar + - id: JawsOfLife - id: WelderExperimental - id: Multitool - id: CableApcStack diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 0de2b383f7..3990eb4dcd 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -1,72 +1,167 @@ -- type: entity - parent: ClothingBeltBase - id: ClothingBeltAssault - name: assault belt - description: "A tactical assault belt." - components: - - type: Sprite - sprite: Clothing/Belt/assault.rsi - - type: Clothing - sprite: Clothing/Belt/assault.rsi - - type: Storage - capacity: 40 +# Belts that need/have visualizers - type: entity parent: ClothingBeltBase - id: ClothingBeltBandolier - name: bandolier - description: "A bandolier for holding shotgun ammunition." + id: ClothingBeltUtility + name: utility belt + description: Can hold various things. components: - type: Sprite - sprite: Clothing/Belt/bandolier.rsi + sprite: Clothing/Belt/utility.rsi - type: Clothing - sprite: Clothing/Belt/bandolier.rsi + sprite: Clothing/Belt/utility.rsi - type: Storage capacity: 40 + # TODO: Fill this out more. + # whitelist: + # tags: + # - Wirecutter + # - Crowbar + # - CrowbarRed + # - Screwdriver + # - Flashlight + # - Welder + # - Wrench + # - Painter + # - GeigerCounter + # - Flare + # - Coilsofwire + # - + # - + # components: + # - SignalLinker + - type: ItemCounter + mapLayers: + cutters_red: + whitelist: + tags: + - Wirecutter + crowbar: + whitelist: + tags: + - Crowbar + crowbar_red: + whitelist: + tags: + - CrowbarRed + screwdriver_nuke: + whitelist: + tags: + - Screwdriver + wrench: + whitelist: + tags: + - Wrench + multitool: + whitelist: + components: + - SignalLinker + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi - type: entity parent: ClothingBeltBase id: ClothingBeltChiefEngineer - name: chief's toolbelt - description: "Holds tools, looks snazzy." + name: chief's toolbelt + description: Holds tools, looks snazzy. components: - type: Sprite sprite: Clothing/Belt/ce.rsi - type: Clothing sprite: Clothing/Belt/ce.rsi - type: Storage + # TODO: Fill this out more. + # whitelist: + # tags: + # - Wirecutter + # - Crowbar + # - CrowbarRed + # - Screwdriver + # - Flashlight + # - Welder + # - Wrench + # - Painter + # - GeigerCounter + # - Flare + # - Coilsofwire + # - + # - + # components: + # - SignalLinker capacity: 100 + - type: ItemCounter + mapLayers: + drill: + whitelist: + tags: + - Powerdrill + cutters_red: + whitelist: + tags: + - Wirecutter + crowbar: + whitelist: + tags: + - Crowbar + crowbar_red: + whitelist: + tags: + - CrowbarRed + jaws: + whitelist: + tags: + - JawsOfLife + screwdriver_nuke: + whitelist: + tags: + - Screwdriver + multitool: + whitelist: + components: + - SignalLinker + wrench: + whitelist: + tags: + - Wrench + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi - type: entity parent: ClothingBeltBase - id: ClothingBeltChampion - name: championship belt - description: "Proves to the world that you are the strongest!" + id: ClothingBeltAssault + name: assault belt + description: A tactical assault belt. components: - type: Sprite - sprite: Clothing/Belt/champion.rsi + sprite: Clothing/Belt/assault.rsi - type: Clothing - sprite: Clothing/Belt/champion.rsi - QuickEquip: true - -- type: entity - parent: ClothingBeltBase - id: ClothingBeltHolster - name: shoulder holster - description: "A holster to carry a handgun and ammo. WARNING: Badasses only." - components: - - type: Sprite - sprite: Clothing/Belt/holster.rsi - - type: Clothing - sprite: Clothing/Belt/holster.rsi + sprite: Clothing/Belt/assault.rsi - type: Storage - capacity: 20 + capacity: 40 + - type: ItemCounter + mapLayers: + flashbang: + whitelist: + components: + - FlashExplosive + stunbaton: + whitelist: + components: + - Stunbaton + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi - type: entity parent: ClothingBeltBase id: ClothingBeltJanitor - name: janibelt - description: "A belt used to hold most janitorial supplies." + name: janibelt + description: A belt used to hold most janitorial supplies. components: - type: Sprite sprite: Clothing/Belt/janitor.rsi @@ -74,12 +169,26 @@ sprite: Clothing/Belt/janitor.rsi - type: Storage capacity: 40 + - type: ItemCounter + mapLayers: + bottle: + whitelist: + tags: + - Bottle + bottle_spray: + whitelist: + tags: + - Spray + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi - type: entity parent: ClothingBeltBase id: ClothingBeltMedical - name: medical belt - description: "Can hold various medical equipment." + name: medical belt + description: Can hold various medical equipment. components: - type: Sprite sprite: Clothing/Belt/medical.rsi @@ -87,12 +196,99 @@ sprite: Clothing/Belt/medical.rsi - type: Storage capacity: 40 + - type: ItemCounter + mapLayers: + bottle: + whitelist: + tags: + - Bottle + hypo: + whitelist: + components: + - Hypospray + pill: + whitelist: + components: + - Pill + bottle_spray: + whitelist: + tags: + - Spray + # spray_med: + # whitelist: + # tags: + # - SprayMedical + # wrench_medical: + # whitelist: + # tags: + # - WrenchMedical + wrench: + whitelist: + tags: + - Wrench + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltPlant + name: botanical belt + description: A belt used to hold most hydroponics supplies. Suprisingly, not green. + components: + - type: Sprite + sprite: Clothing/Belt/plant.rsi + - type: Clothing + sprite: Clothing/Belt/plant.rsi + - type: Storage + # whitelist: + # tags: + # - BotanyHoe + # - PlantAnalyzer + # - BotanyHoe + # - BotanyShovel + # - PlantBGone + # - Bottle + # components: + # - Seed + capacity: 40 + - type: ItemCounter + mapLayers: + hatchet: + whitelist: + tags: + - BotanyHatchet + hydro: + whitelist: + tags: + - PlantAnalyzer # Dunno what to put here, should be aight. + hoe: + whitelist: + tags: + - BotanyHoe + secateurs: # We don't have secateurs and this looks similar enough. + whitelist: + tags: + - BotanyShovel + plantbgone: + whitelist: + tags: + - PlantBGone + bottle: + whitelist: + tags: + - Bottle + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi - type: entity parent: ClothingBeltBase id: ClothingBeltSecurity - name: security belt - description: "Can hold security gear like handcuffs and flashes." + name: security belt + description: Can hold security gear like handcuffs and flashes. components: - type: Sprite sprite: Clothing/Belt/security.rsi @@ -100,38 +296,26 @@ sprite: Clothing/Belt/security.rsi - type: Storage capacity: 40 - -- type: entity - parent: ClothingBeltBase - id: ClothingBeltSecurityWebbing - name: security webbing - description: "Unique and versatile chest rig, can hold security gear." - components: - - type: Sprite - sprite: Clothing/Belt/securitywebbing.rsi - - type: Clothing - sprite: Clothing/Belt/securitywebbing.rsi - - type: Storage - capacity: 40 - -- type: entity - parent: ClothingBeltBase - id: ClothingBeltMilitaryWebbing - name: chest rig - description: "A set of tactical webbing worn by Syndicate boarding parties." - components: - - type: Sprite - sprite: Clothing/Belt/militarywebbing.rsi - - type: Clothing - sprite: Clothing/Belt/militarywebbing.rsi - - type: Storage - capacity: 40 + - type: ItemCounter + mapLayers: + flashbang: + whitelist: + components: + - FlashExplosive + stunbaton: + whitelist: + components: + - Stunbaton + - type: Appearance + visuals: + - type: MappedItemVisualizer + sprite: Clothing/Belt/belt_overlay.rsi - type: entity parent: ClothingBeltBase id: ClothingBeltSheath - name: sabre sheath - description: "An ornate sheath designed to hold an officer's blade." + name: sabre sheath + description: An ornate sheath designed to hold an officer's blade. components: - type: Sprite sprite: Clothing/Belt/sheath.rsi @@ -143,12 +327,87 @@ - type: StorageFill contents: - id: CaptainSabre + - type: ItemCounter + mapLayers: + sheath-sabre: + whitelist: + tags: + - CaptainSabre + - type: Appearance + visuals: + - type: MappedItemVisualizer + +# Belts without visualizers + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltBandolier + name: bandolier + description: A bandolier for holding shotgun ammunition. + components: + - type: Sprite + sprite: Clothing/Belt/bandolier.rsi + - type: Clothing + sprite: Clothing/Belt/bandolier.rsi + - type: Storage + capacity: 40 + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltChampion + name: championship belt + description: Proves to the world that you are the strongest! + components: + - type: Sprite + sprite: Clothing/Belt/champion.rsi + - type: Clothing + sprite: Clothing/Belt/champion.rsi + QuickEquip: true + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltHolster + name: shoulder holster + description: 'A holster to carry a handgun and ammo. WARNING: Badasses only.' + components: + - type: Sprite + sprite: Clothing/Belt/holster.rsi + - type: Clothing + sprite: Clothing/Belt/holster.rsi + - type: Storage + capacity: 20 + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltSecurityWebbing + name: security webbing + description: Unique and versatile chest rig, can hold security gear. + components: + - type: Sprite + sprite: Clothing/Belt/securitywebbing.rsi + - type: Clothing + sprite: Clothing/Belt/securitywebbing.rsi + - type: Storage + capacity: 40 + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltMilitaryWebbing + name: chest rig + description: A set of tactical webbing worn by Syndicate boarding parties. + components: + - type: Sprite + sprite: Clothing/Belt/militarywebbing.rsi + - type: Clothing + sprite: Clothing/Belt/militarywebbing.rsi + - type: Storage + capacity: 40 - type: entity parent: ClothingBeltBase id: ClothingBeltSuspenders name: suspenders - description: "For holding your pants up." + description: For holding your pants up. components: - type: Sprite sprite: Clothing/Belt/suspenders.rsi @@ -156,16 +415,3 @@ - type: Clothing sprite: Clothing/Belt/suspenders.rsi QuickEquip: true - -- type: entity - parent: ClothingBeltBase - id: ClothingBeltUtility - name: utility belt - description: "Can hold various things." - components: - - type: Sprite - sprite: Clothing/Belt/utility.rsi - - type: Clothing - sprite: Clothing/Belt/utility.rsi - - type: Storage - capacity: 40 diff --git a/Resources/Prototypes/Entities/Clothing/clothing_base.yml b/Resources/Prototypes/Entities/Clothing/clothing_base.yml index d5dac994e8..b8b2438ec1 100644 --- a/Resources/Prototypes/Entities/Clothing/clothing_base.yml +++ b/Resources/Prototypes/Entities/Clothing/clothing_base.yml @@ -3,5 +3,7 @@ parent: BaseItem id: Clothing components: + - type: Sprite + netsync: false - type: Clothing size: 5 diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 158d3979ee..9f61b04da0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -1,30 +1,3 @@ -- type: Tag - id: Crayon - -- type: Tag - id: CrayonBlack - -- type: Tag - id: CrayonBlue - -- type: Tag - id: CrayonGreen - -- type: Tag - id: CrayonOrange - -- type: Tag - id: CrayonPurple - -- type: Tag - id: CrayonRed - -- type: Tag - id: CrayonWhite - -- type: Tag - id: CrayonYellow - - type: entity abstract: true parent: BaseItem @@ -237,4 +210,3 @@ - type: Appearance visuals: - type: MappedItemVisualizer - diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml index 02a79ceb62..a53113ae72 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml @@ -5,6 +5,9 @@ description: Kills those pesky weeds! suffix: "Filled" components: + - type: Tag + tags: + - PlantBGone - type: Sprite sprite: Objects/Tools/Hydroponics/sprays.rsi state: plantbgone diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index 4350e841fa..738561200d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -7,6 +7,7 @@ - type: Tag tags: - Hoe + - BotanyHoe - type: Sprite sprite: Objects/Tools/Hydroponics/hoe.rsi state: icon @@ -40,6 +41,7 @@ components: - type: Tag tags: + - BotanyHatchet - BotanySharp - type: Sprite sprite: Objects/Tools/Hydroponics/hatchet.rsi @@ -58,6 +60,7 @@ - type: Tag tags: - Shovel + - BotanyShovel - type: Sprite sprite: Objects/Tools/Hydroponics/spade.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index 0bae25cef0..6bec76ccb7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -5,6 +5,9 @@ suffix: Empty description: A spray bottle with an unscrewable top. components: + - type: Tag + tags: + - Spray - type: Sprite netsync: false sprite: Objects/Specific/Janitorial/janitorial.rsi @@ -29,12 +32,12 @@ suffix: Filled parent: SprayBottle components: - - type: SolutionContainer - maxVol: 100 - contents: - reagents: - - ReagentId: Water - Quantity: 100 + - type: SolutionContainer + maxVol: 100 + contents: + reagents: + - ReagentId: Water + Quantity: 100 - type: entity name: space cleaner @@ -43,12 +46,12 @@ parent: SprayBottle suffix: "" components: - - type: SolutionContainer - maxVol: 100 - contents: - reagents: - - ReagentId: SpaceCleaner - Quantity: 100 + - type: SolutionContainer + maxVol: 100 + contents: + reagents: + - ReagentId: SpaceCleaner + Quantity: 100 # Vapor diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 77b16231c6..bca4d61823 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -4,12 +4,12 @@ description: A sterile injector for rapid administration of drugs to patients. id: Hypospray components: - - type: Sprite - sprite: Objects/Specific/Medical/hypospray.rsi - state: hypo - - type: Item - sprite: Objects/Specific/Medical/hypospray.rsi - - type: SolutionContainer - maxVol: 30 - caps: Refillable, CanExamine - - type: Hypospray + - type: Sprite + sprite: Objects/Specific/Medical/hypospray.rsi + state: hypo + - type: Item + sprite: Objects/Specific/Medical/hypospray.rsi + - type: SolutionContainer + maxVol: 30 + caps: Refillable, CanExamine + - type: Hypospray diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 918ebe9b26..a00d264ce3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -5,6 +5,9 @@ abstract: true description: A small bottle. components: + - type: Tag + tags: + - Bottle - type: Sprite sprite: Objects/Specific/Chemistry/bottle.rsi netsync: false @@ -29,7 +32,7 @@ sprite: Objects/Specific/Chemistry/bottle.rsi layers: - state: bottle-1 - - state: bottle-1-1 + - state: bottle-1-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: Appearance @@ -47,7 +50,7 @@ sprite: Objects/Specific/Chemistry/bottle.rsi layers: - state: bottle-2 - - state: bottle-2-1 + - state: bottle-2-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: Appearance @@ -65,7 +68,7 @@ sprite: Objects/Specific/Chemistry/bottle.rsi layers: - state: bottle-3 - - state: bottle-3-1 + - state: bottle-3-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: Appearance @@ -83,7 +86,7 @@ sprite: Objects/Specific/Chemistry/bottle.rsi layers: - state: bottle-4 - - state: bottle-4-1 + - state: bottle-4-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 79d0dc5eca..532d847ac8 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -4,30 +4,33 @@ id: JawsOfLife description: A set of jaws of life, compressed through the magic of science. components: - - type: Sprite - sprite: Objects/Tools/jaws_of_life.rsi - state: jaws_pry - - type: Clothing - sprite: Objects/Tools/jaws_of_life.rsi - size: 50 - QuickEquip: false - Slots: - - Belt - - type: TilePrying - - type: Tool - qualities: - - Prying - statusShowBehavior: true - - type: MultiTool - tools: - - behavior: Prying - state: jaws_pry - useSound: /Audio/Items/jaws_pry.ogg - changeSound: /Audio/Items/change_jaws.ogg - - behavior: Cutting - state: jaws_cutter - useSound: /Audio/Items/jaws_cut.ogg - changeSound: /Audio/Items/change_jaws.ogg + - type: Tag + tags: + - JawsOfLife + - type: Sprite + sprite: Objects/Tools/jaws_of_life.rsi + state: jaws_pry + - type: Clothing + sprite: Objects/Tools/jaws_of_life.rsi + size: 50 + QuickEquip: false + Slots: + - Belt + - type: TilePrying + - type: Tool + qualities: + - Prying + statusShowBehavior: true + - type: MultiTool + tools: + - behavior: Prying + state: jaws_pry + useSound: /Audio/Items/jaws_pry.ogg + changeSound: /Audio/Items/change_jaws.ogg + - behavior: Cutting + state: jaws_cutter + useSound: /Audio/Items/jaws_cut.ogg + changeSound: /Audio/Items/change_jaws.ogg - type: entity name: syndicate jaws of life @@ -35,11 +38,11 @@ id: SyndicateJawsOfLife description: Useful for entering the station or its departments. components: - - type: Sprite - state: syn_jaws_pry - - type: MultiTool - tools: - - behavior: Prying - state: syn_jaws_pry - - behavior: Cutting - state: syn_jaws_cutter + - type: Sprite + state: syn_jaws_pry + - type: MultiTool + tools: + - behavior: Prying + state: syn_jaws_pry + - behavior: Cutting + state: syn_jaws_cutter diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 709a08bc0d..990ad18342 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -7,6 +7,7 @@ - type: Tag tags: - PlantSampleTaker + - Wirecutter - type: Sprite sprite: Objects/Tools/wirecutters.rsi layers: @@ -37,6 +38,9 @@ id: Screwdriver description: Industrial grade torque in a small screwdriving package. components: + - type: Tag + tags: + - Screwdriver - type: Sprite sprite: Objects/Tools/screwdriver.rsi layers: @@ -67,6 +71,9 @@ id: Wrench description: A common tool for assembly and disassembly, righty tighty lefty loosey. components: + - type: Tag + tags: + - Wrench - type: Sprite sprite: Objects/Tools/wrench.rsi state: icon @@ -86,6 +93,9 @@ id: Crowbar description: A multipurpose tool to pry open doors and fight interdimensional invaders. components: + - type: Tag + tags: + - Crowbar - type: Sprite sprite: Objects/Tools/crowbar.rsi state: icon @@ -107,6 +117,9 @@ id: CrowbarRed description: A multipurpose tool to pry open doors and fight interdimensional invaders. components: + - type: Tag + tags: + - CrowbarRed - type: Sprite sprite: Objects/Tools/crowbar_red.rsi state: icon @@ -151,26 +164,29 @@ id: PowerDrill description: A simple powered hand drill. components: - - type: Sprite - sprite: Objects/Tools/drill.rsi - state: drill_screw - - type: Item - sprite: Objects/Tools/drill.rsi - size: 20 - - type: Tool - qualities: - - Screwing - statusShowBehavior: true - - type: MultiTool - tools: - - behavior: Screwing - state: drill_screw - useSound: /Audio/Items/drill_use.ogg - changeSound: /Audio/Items/change_drill.ogg - - behavior: Anchoring - state: drill_bolt - useSound: /Audio/Items/drill_use.ogg - changeSound: /Audio/Items/change_drill.ogg + - type: Tag + tags: + - Powerdrill + - type: Sprite + sprite: Objects/Tools/drill.rsi + state: drill_screw + - type: Item + sprite: Objects/Tools/drill.rsi + size: 20 + - type: Tool + qualities: + - Screwing + statusShowBehavior: true + - type: MultiTool + tools: + - behavior: Screwing + state: drill_screw + useSound: /Audio/Items/drill_use.ogg + changeSound: /Audio/Items/change_drill.ogg + - behavior: Anchoring + state: drill_bolt + useSound: /Audio/Items/drill_use.ogg + changeSound: /Audio/Items/change_drill.ogg - type: entity name: RCD @@ -208,13 +224,13 @@ id: Shovel description: A large tool for digging and moving dirt. components: - - type: Tag - tags: - - Shovel - - type: Sprite - sprite: Objects/Tools/shovel.rsi - state: icon - - type: ItemCooldown - - type: MeleeWeapon - - type: Item - sprite: Objects/Tools/shovel.rsi + - type: Tag + tags: + - Shovel + - type: Sprite + sprite: Objects/Tools/shovel.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + - type: Item + sprite: Objects/Tools/shovel.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 5cb81d3571..f244df99a5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -13,6 +13,9 @@ size: 15 sprite: Objects/Weapons/Melee/captain_sabre.rsi prefix: inhand + - type: Tag + tags: + - CaptainSabre - type: entity name: katana diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 0e914366ca..07adc2a9fc 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1,9 +1,57 @@ +- type: Tag + id: BotanyHatchet + +- type: Tag + id: BotanyHoe + - type: Tag id: BotanySharp +- type: Tag + id: BotanyShovel + +- type: Tag + id: Bottle + - type: Tag id: CanPilot +- type: Tag + id: CaptainSabre + +- type: Tag + id: Crayon + +- type: Tag + id: CrayonBlack + +- type: Tag + id: CrayonBlue + +- type: Tag + id: CrayonGreen + +- type: Tag + id: CrayonOrange + +- type: Tag + id: CrayonPurple + +- type: Tag + id: CrayonRed + +- type: Tag + id: CrayonWhite + +- type: Tag + id: CrayonYellow + +- type: Tag + id: Crowbar + +- type: Tag + id: CrowbarRed + - type: Tag id: ConveyorAssembly @@ -34,24 +82,48 @@ - type: Tag id: Ingot +- type: Tag + id: JawsOfLife + - type: Tag id: NoSpinOnThrow - type: Tag id: Ore +- type: Tag + id: PlantAnalyzer + +- type: Tag + id: PlantBGone + - type: Tag id: PlantSampleTaker +- type: Tag + id: Powerdrill + +- type: Tag + id: Screwdriver + - type: Tag id: Sheet - type: Tag id: Shovel +- type: Tag + id: Spray + - type: Tag id: Wall +- type: Tag + id: Wirecutter + +- type: Tag + id: Wrench + - type: Tag id: Write diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_large.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_large.png deleted file mode 100644 index f5e98598fa..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_large.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_screw.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_screw.png deleted file mode 100644 index 1be285ec4f..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_screw.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_pry.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_pry.png deleted file mode 100644 index ba81110284..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_pry.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json deleted file mode 100644 index 9f6a2130c7..0000000000 --- a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json +++ /dev/null @@ -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" - } - ] -} diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_red.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_red.png deleted file mode 100644 index 008bd7995f..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_red.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_yellow.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_yellow.png deleted file mode 100644 index 008bd7995f..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool_yellow.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_active.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_active.png deleted file mode 100644 index 784617bd4f..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_active.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_nocell.png b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_nocell.png deleted file mode 100644 index 784617bd4f..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton_nocell.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/baton.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/baton.png deleted file mode 100644 index dbd600edbb..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/baton.png and /dev/null 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 deleted file mode 100644 index 5f5347c2c5..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cutters.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/handcuff.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/handcuff.png deleted file mode 100644 index f22fd5cb89..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/handcuff.png and /dev/null 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 deleted file mode 100644 index 4cd6eea346..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn.png and /dev/null 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 deleted file mode 100644 index 95ff4de420..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/horn_gold.png and /dev/null 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 deleted file mode 100644 index 4930783ae7..0000000000 --- a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png deleted file mode 100644 index 0b6ed65457..0000000000 Binary files a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rcd.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/analyzer-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/analyzer.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/analyzer-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle.png new file mode 100644 index 0000000000..ba92aff420 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle_spray.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle_spray.png new file mode 100644 index 0000000000..c32081513d Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/bottle_spray.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/c4-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/c4.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/c4-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_brass.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_brass.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_brass.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_red.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_red.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/crowbar_red.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/crowbar_red.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_blade.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_blade.png new file mode 100644 index 0000000000..9f22b439c4 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_blade.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_brass.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_brass.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_brass.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_handle.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_handle.png new file mode 100644 index 0000000000..eb50f2ce67 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_handle.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_red.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_red.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_red.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_red.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_yellow.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_yellow.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/cutters_yellow.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/cutters_yellow.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_bolt.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/drill.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/drill_bolt.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/drill.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/electronic-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/electronic.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/electronic-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/flashbang.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/flashbang.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/flashbang.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/flashbang.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/geiger_counter-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/geiger_counter.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/geiger_counter-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hatchet.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hatchet.png new file mode 100644 index 0000000000..af8a113900 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hatchet.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hoe.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hoe.png new file mode 100644 index 0000000000..e700e7be27 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hoe.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hydro.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hydro.png new file mode 100644 index 0000000000..bb8b2d7f83 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hydro.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hypo.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hypo.png new file mode 100644 index 0000000000..0c4b98709f Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/hypo.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/injector.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/injector-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/injector.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/injector-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_cutter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/jaws.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/jaws_cutter.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/jaws.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/lighter-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/lighter.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/lighter-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/medipen-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/medipen.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/medipen-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json new file mode 100644 index 0000000000..e9e604644d --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/multitool.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/multitool.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/multitool.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/painter-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/painter.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/painter-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/pill.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/pill.png new file mode 100644 index 0000000000..58ea92e1ff Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/pill.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plantbgone.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plantbgone.png new file mode 100644 index 0000000000..955b07b643 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plantbgone.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/plasmatank.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plasmatank-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/plasmatank.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/plasmatank-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rolling_pin.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/rolling_pin-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rpd-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rpd.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/rpd-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/rped-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/rped.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/rped-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_brass.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_brass.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_brass.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_head.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_head.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_head.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_head.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_nuke.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_nuke.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/screwdriver_nuke.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/screwdriver_nuke.png diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/secateurs.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/secateurs.png new file mode 100644 index 0000000000..214a8893a8 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/secateurs.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_brute.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_brute.png new file mode 100644 index 0000000000..e16a364c2e Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_brute.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_burn.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_burn.png new file mode 100644 index 0000000000..06934b8c01 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_burn.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_med.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_med.png new file mode 100644 index 0000000000..7adc899fe5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_med.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_synth.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_synth.png new file mode 100644 index 0000000000..eb56ecbdff Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/spray_synth.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/stunbaton.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/stunbaton.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/stunbaton.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/tele_baton-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tele_baton.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/tele_baton-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/tray-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/tray.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/tray-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_brass.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_brass.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_brass.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_brass.png diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_medical.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_medical.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/wrench_medical.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/wrench_medical.png diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/x4-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/x4.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/x4-equipped-BELT.png diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png new file mode 100644 index 0000000000..fef3d8dd0c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/icon.png b/Resources/Textures/Clothing/Belt/plant.rsi/icon.png new file mode 100644 index 0000000000..3bf8ef0e3c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png new file mode 100644 index 0000000000..cee67a711c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png new file mode 100644 index 0000000000..9397945917 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/meta.json b/Resources/Textures/Clothing/Belt/plant.rsi/meta.json new file mode 100644 index 0000000000..bdd8cab3bf --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png index 4a7ce37df2..462d997cf3 100644 Binary files a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png and b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/cigpack.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json index 0da0f0cd38..892cbe9a31 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json index 0da0f0cd38..892cbe9a31 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json index 0da0f0cd38..892cbe9a31 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d49b6f112c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json index 0da0f0cd38..892cbe9a31 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png b/Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraycan.png rename to Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json index e6b752420d..8efba5e0dc 100644 --- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json @@ -54,6 +54,10 @@ }, { "name": "spray_colors" + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/clipboard.png rename to Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard-equipped-BELT.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index c0ce516165..32ed9fd76b 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -296,6 +296,10 @@ 0.1 ] ] + }, + { + "name": "clipboard-equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png b/Resources/Textures/Objects/Misc/flare.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flare.png rename to Resources/Textures/Objects/Misc/flare.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Misc/flare.rsi/meta.json b/Resources/Textures/Objects/Misc/flare.rsi/meta.json index 8df37b582f..83f2a049b8 100644 --- a/Resources/Textures/Objects/Misc/flare.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/flare.rsi/meta.json @@ -45,6 +45,10 @@ { "name": "unlit-inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/beaker.png rename to Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json index 9310fc8467..6403659e68 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -38,6 +38,10 @@ }, { "name": "beaker6" + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spraybottle.png rename to Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json index 80d57ef5eb..a52e53539a 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json @@ -23,6 +23,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/hypo.png rename to Resources/Textures/Objects/Specific/Medical/hypospray.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json index 4ee2261384..0095919b63 100644 --- a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json @@ -26,6 +26,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/spade.png rename to Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json index ab98f8e78a..bb2b1a2866 100644 --- a/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Hydroponics/spade.rsi/meta.json @@ -17,6 +17,10 @@ }, { "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coil-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/coil.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coil-equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-equipped-BELT.png new file mode 100644 index 0000000000..90d0917741 Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-equipped-BELT.png new file mode 100644 index 0000000000..f6d9e49bc9 Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png new file mode 100644 index 0000000000..1f7b0e8f69 Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json index 9bda8c2580..97ce32a860 100644 --- a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json +++ b/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 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png b/Resources/Textures/Objects/Tools/crowbar.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar.png rename to Resources/Textures/Objects/Tools/crowbar.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index 53afd4d476..0fa78806cf 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -17,6 +17,10 @@ }, { "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png b/Resources/Textures/Objects/Tools/crowbar_red.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/crowbar_red.png rename to Resources/Textures/Objects/Tools/crowbar_red.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json index 670262b2a6..0244c0470e 100644 --- a/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json @@ -15,6 +15,10 @@ }, { "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png b/Resources/Textures/Objects/Tools/drill.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/drill.png rename to Resources/Textures/Objects/Tools/drill.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json index cc1eaf2707..61e637a46a 100644 --- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json @@ -20,6 +20,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png b/Resources/Textures/Objects/Tools/flashlight.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashlight.png rename to Resources/Textures/Objects/Tools/flashlight.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json index f12b27f709..9214fb0c88 100644 --- a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json @@ -31,6 +31,10 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/jawsoflife.png rename to Resources/Textures/Objects/Tools/jaws_of_life.rsi/equipped-BELT.png 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 e6bc717f1c..f244507fa7 100644 --- a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json @@ -26,6 +26,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/screwdriver.png rename to Resources/Textures/Objects/Tools/screwdriver.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json index 5a96c2337b..17ec25991a 100644 --- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -23,6 +23,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png b/Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/welder.png rename to Resources/Textures/Objects/Tools/welder.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json index d6adbc81ac..ad660c7299 100644 --- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json @@ -70,6 +70,10 @@ 0.1 ] ] + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-equipped-BELT.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-equipped-BELT.png new file mode 100644 index 0000000000..5808754981 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-left.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-left.png new file mode 100644 index 0000000000..84cbd4a0f2 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-right.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-right.png new file mode 100644 index 0000000000..6a26de375d Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-equipped-BELT.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-equipped-BELT.png new file mode 100644 index 0000000000..06f82e1b54 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-left.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-left.png new file mode 100644 index 0000000000..dee5a83227 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-right.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-right.png new file mode 100644 index 0000000000..f48633761c Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/handle-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json index f0d83902d1..cd29490826 100644 --- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json @@ -23,6 +23,30 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "cutters-inhand-left", + "directions": 4 + }, + { + "name": "cutters-inhand-right", + "directions": 4 + }, + { + "name": "handle-inhand-left", + "directions": 4 + }, + { + "name": "handle-inhand-right", + "directions": 4 + }, + { + "name": "cutters-equipped-BELT", + "directions": 4 + }, + { + "name": "handle-equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png b/Resources/Textures/Objects/Tools/wrench.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/wrench.png rename to Resources/Textures/Objects/Tools/wrench.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json index 4845380cc0..9f7b9badd5 100644 --- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/flashbang.png rename to Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json index 67a112dc09..28d3e6969a 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json @@ -18,6 +18,10 @@ 0.1 ] ] + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/grenade.png rename to Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json index 67a112dc09..28d3e6969a 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json @@ -18,6 +18,10 @@ 0.1 ] ] + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/minibomb.png rename to Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json index 708cdc54de..a7f808a399 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json @@ -19,6 +19,10 @@ 0.2 ] ] + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/gun.png b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/gun.png rename to Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-BELT.png 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 0a9e915eb0..f0d5f9dfc9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json @@ -73,6 +73,10 @@ { "name": "taser4-inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/knife.png rename to Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json index 4da2fb5bd2..87686c8a63 100644 --- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000..288f9fbce5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json index 8e9c566c5c..9fac57fa05 100644 --- a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] }