From 898744f4a96305c0187e9db8d34f1b740f10b089 Mon Sep 17 00:00:00 2001 From: Swept Date: Wed, 30 Sep 2020 10:43:06 +0000 Subject: [PATCH] Icon fixing and general cleanup (#2156) * Cable coils now look BEAUTIFUL and have inhands * Editors note * Materials have their own rsi + more icons fixed * Fixed Mimic [AI] * More icons fixed... * Tanks have own rsi and fixed tank icons * Airlock icons fixed * Fuel tank hotfix * Arcade fixed * ChairBase is now abstract * Fixes medical stuff * Fixes rechargers * Pump/Pipe icons * Misc hotfixes * All debug power icons fixed! * Fixes auto/proto/research computer icons --- .../Catalog/LatheRecipes/medical.yml | 4 +- .../Prototypes/Catalog/LatheRecipes/sheet.yml | 4 +- .../Entities/Clothing/Shoes/shoes.yml | 4 +- .../Constructible/Doors/airlock_base.yml | 4 - .../Constructible/Doors/airlock_types.yml | 22 - .../Constructible/Furniture/seats.yml | 1 + .../Constructible/Furniture/storage.yml | 6 +- .../Entities/Constructible/Ground/pipes.yml | 9 +- .../Entities/Constructible/Ground/pumps.yml | 4 +- .../Entities/Constructible/Power/arcade.yml | 13 +- .../Constructible/Power/booze_dispenser.yml | 4 +- .../Constructible/Power/chem_dispenser.yml | 7 +- .../Constructible/Power/chem_master.yml | 54 ++- .../Constructible/Power/debug_power.yml | 16 +- .../Constructible/Power/power_base.yml | 12 +- .../Constructible/Power/soda_dispenser.yml | 4 +- .../Constructible/{Ground => Power}/wires.yml | 12 +- .../{storage_tank.yml => base_tank.yml} | 0 .../Storage/StorageTanks/fuel_tank.yml | 4 +- .../Storage/StorageTanks/water_tank.yml | 4 +- .../Entities/Constructible/Walls/girder.yml | 5 +- .../Entities/Constructible/Walls/low_wall.yml | 3 + .../Entities/Constructible/Walls/windows.yml | 7 + .../Prototypes/Entities/Mobs/NPCs/mimic.yml | 4 +- .../Entities/Objects/Fun/instruments.yml | 5 +- .../Entities/Objects/Power/cable_coils.yml | 98 +++++ .../Entities/Objects/Power/powercells.yml | 9 + .../Entities/Objects/Specific/chemistry.yml | 50 +-- .../Entities/Objects/Specific/janitor.yml | 13 +- .../Entities/Objects/Specific/medical.yml | 12 +- .../Prototypes/Entities/Objects/materials.yml | 83 +--- Resources/Prototypes/technologies.yml | 4 +- .../Misc/furniture.rsi/meta.json | 18 + .../Misc/{ => furniture.rsi}/rack.png | Bin .../Misc/{ => furniture.rsi}/shelf.png | Bin .../{weldtank.png => tanks.rsi/fueltank.png} | Bin .../Constructible/Misc/tanks.rsi/meta.json | 27 ++ .../Misc/{ => tanks.rsi}/watertank.png | Bin .../Power/VendingMachines/cola.rsi/meta.json | 9 + .../Power/VendingMachines/cola.rsi/normal.png | Bin 0 -> 486 bytes .../Power/dispensers.rsi/meta.json | 39 +- .../Constructible/Power/mixer.rsi/meta.json | 64 ++- .../Power/mixer.rsi/mixer_broken.png | Bin 0 -> 732 bytes ...een_broken.png => mixer_screen_broken.png} | Bin .../Power/{ => power.rsi}/eightdirwire.png | Bin .../Power/{ => power.rsi}/generator.png | Bin .../Constructible/Power/power.rsi/meta.json | 64 +++ .../Power/{ => power.rsi}/provider.png | Bin .../Power/{ => power.rsi}/storage.png | Bin .../Power/{ => power.rsi}/wiredmachine.png | Bin .../Power/{ => power.rsi}/wirelessmachine.png | Bin .../Doors/airlock_basic.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_cargo.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_cargo_glass.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_command.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_command_glass.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_engineering.rsi/meta.json | 231 ++++++++++- .../airlock_engineering_glass.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_external.rsi/meta.json | 218 +++++++++- .../Doors/airlock_freezer.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_glass.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_maint.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_maint_cargo.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_command.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_common.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_engi.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_int.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_med.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_rnd.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_maint_sec.rsi/meta.json | 227 ++++++++++- .../Doors/airlock_medical.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_medical_glass.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_science.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_science_glass.rsi/meta.json | 231 ++++++++++- .../Doors/airlock_security.rsi/meta.json | 231 ++++++++++- .../airlock_security_glass.rsi/meta.json | 231 ++++++++++- .../Doors/firelock_glass.rsi/meta.json | 376 +++++++++--------- .../Structures/Walls/solid.rsi/meta.json | 291 +++++++++++++- .../Walls/{ => solid.rsi}/wall_girder.png | Bin .../otherinstruments.rsi/meta.json | 9 + .../{ => materials.rsi}/alienhide.png | Bin .../{ => materials.rsi}/banananium.png | Bin .../Materials/{ => materials.rsi}/cathide.png | Bin .../{ => materials.rsi}/copperbar_single.png | Bin .../{ => materials.rsi}/corgihide.png | Bin .../Materials/{ => materials.rsi}/diamond.png | Bin .../goldbar_10.png} | Bin .../Materials/materials.rsi/goldbar_20.png | Bin 0 -> 393 bytes .../Materials/materials.rsi/goldbar_30.png | Bin 0 -> 445 bytes .../{ => materials.rsi}/leadbar_single.png | Bin .../{ => materials.rsi}/liggerhide.png | Bin .../Objects/Materials/materials.rsi/meta.json | 107 +++++ .../{ => materials.rsi}/monkeyhide.png | Bin .../{ => materials.rsi}/phoron_gem.png | Bin .../{ => materials.rsi}/phoron_ore.png | Bin .../{ => materials.rsi}/phoron_sheet.png | Bin .../Materials/{ => materials.rsi}/rods.png | Bin .../{ => materials.rsi}/sheet_glass.png | Bin .../{ => materials.rsi}/sheet_metal.png | Bin .../{ => materials.rsi}/spent_phoron_gem.png | Bin .../{ => materials.rsi}/steelbar_single.png | Bin .../{ => materials.rsi}/tinbar_single.png | Bin .../Materials/{ => materials.rsi}/uranium.png | Bin .../wood_plank.png} | Bin .../Materials/{ => materials.rsi}/wool.png | Bin .../{ => janitorial.rsi}/bucket.png | Bin .../{ => janitorial.rsi}/bucket_water.png | Bin .../{ => janitorial.rsi}/cleaner.png | Bin .../Janitorial/janitorial.rsi/meta.json | 54 +++ .../{ => janitorial.rsi}/mopbucket.png | Bin .../{ => janitorial.rsi}/mopbucket_water.png | Bin .../Specific/Janitorial/janitorsuit.png | Bin 241 -> 0 bytes .../Medical/{ => medical.rsi}/brutepack.png | Bin .../Medical/{ => medical.rsi}/cast.png | Bin .../Medical/{ => medical.rsi}/gauze.png | Bin .../Specific/Medical/medical.rsi/medkit_r.png | Bin 0 -> 713 bytes .../Specific/Medical/medical.rsi/meta.json | 51 +++ .../Medical/{ => medical.rsi}/morphine.png | Bin .../Medical/{ => medical.rsi}/ointment.png | Bin .../Objects/Specific/Medical/medkit_r.png | Bin 675 -> 0 bytes .../Textures/Objects/Tools/cable_coil.png | Bin 171 -> 0 bytes .../Objects/Tools/cables.rsi/coil-10.png | Bin 0 -> 230 bytes .../Objects/Tools/cables.rsi/coil-20.png | Bin 0 -> 275 bytes .../Objects/Tools/cables.rsi/coil-30.png | Bin 0 -> 370 bytes .../Objects/Tools/cables.rsi/coilhv-10.png | Bin 0 -> 201 bytes .../Objects/Tools/cables.rsi/coilhv-20.png | Bin 0 -> 270 bytes .../Objects/Tools/cables.rsi/coilhv-30.png | Bin 0 -> 373 bytes .../Tools/cables.rsi/coilhv-inhand-left.png | Bin 0 -> 279 bytes .../Tools/cables.rsi/coilhv-inhand-right.png | Bin 0 -> 280 bytes .../Objects/Tools/cables.rsi/coillv-10.png | Bin 0 -> 201 bytes .../Objects/Tools/cables.rsi/coillv-20.png | Bin 0 -> 266 bytes .../Objects/Tools/cables.rsi/coillv-30.png | Bin 0 -> 375 bytes .../Tools/cables.rsi/coillv-inhand-left.png | Bin 0 -> 278 bytes .../Tools/cables.rsi/coillv-inhand-right.png | Bin 0 -> 279 bytes .../Objects/Tools/cables.rsi/coilmv-10.png | Bin 0 -> 201 bytes .../Objects/Tools/cables.rsi/coilmv-20.png | Bin 0 -> 270 bytes .../Objects/Tools/cables.rsi/coilmv-30.png | Bin 0 -> 356 bytes .../Tools/cables.rsi/coilmv-inhand-left.png | Bin 0 -> 279 bytes .../Tools/cables.rsi/coilmv-inhand-right.png | Bin 0 -> 280 bytes .../Objects/Tools/cables.rsi/meta.json | 227 +++++++++++ .../Textures/Objects/Tools/rcl.rsi/meta.json | 119 ++++++ .../Textures/Objects/Tools/rcl.rsi/rcl-0.png | Bin 0 -> 673 bytes .../Textures/Objects/Tools/rcl.rsi/rcl-10.png | Bin 0 -> 829 bytes .../Textures/Objects/Tools/rcl.rsi/rcl-20.png | Bin 0 -> 845 bytes .../Textures/Objects/Tools/rcl.rsi/rcl-30.png | Bin 0 -> 836 bytes .../Objects/Tools/rcl.rsi/rcl-inhand-left.png | Bin 0 -> 498 bytes .../Tools/rcl.rsi/rcl-inhand-right.png | Bin 0 -> 498 bytes .../Tools/rcl.rsi/rcle-inhand-left.png | Bin 0 -> 427 bytes .../Tools/rcl.rsi/rcle-inhand-right.png | Bin 0 -> 427 bytes 149 files changed, 7262 insertions(+), 404 deletions(-) rename Resources/Prototypes/Entities/Constructible/{Ground => Power}/wires.yml (88%) rename Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/{storage_tank.yml => base_tank.yml} (100%) create mode 100644 Resources/Prototypes/Entities/Objects/Power/cable_coils.yml rename Resources/Textures/Constructible/Misc/{ => furniture.rsi}/rack.png (100%) rename Resources/Textures/Constructible/Misc/{ => furniture.rsi}/shelf.png (100%) rename Resources/Textures/Constructible/Misc/{weldtank.png => tanks.rsi/fueltank.png} (100%) create mode 100644 Resources/Textures/Constructible/Misc/tanks.rsi/meta.json rename Resources/Textures/Constructible/Misc/{ => tanks.rsi}/watertank.png (100%) create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png create mode 100644 Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png rename Resources/Textures/Constructible/Power/mixer.rsi/{mixer_splicer_screen_broken.png => mixer_screen_broken.png} (100%) rename Resources/Textures/Constructible/Power/{ => power.rsi}/eightdirwire.png (100%) rename Resources/Textures/Constructible/Power/{ => power.rsi}/generator.png (100%) create mode 100644 Resources/Textures/Constructible/Power/power.rsi/meta.json rename Resources/Textures/Constructible/Power/{ => power.rsi}/provider.png (100%) rename Resources/Textures/Constructible/Power/{ => power.rsi}/storage.png (100%) rename Resources/Textures/Constructible/Power/{ => power.rsi}/wiredmachine.png (100%) rename Resources/Textures/Constructible/Power/{ => power.rsi}/wirelessmachine.png (100%) rename Resources/Textures/Constructible/Structures/Walls/{ => solid.rsi}/wall_girder.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/alienhide.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/banananium.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/cathide.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/copperbar_single.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/corgihide.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/diamond.png (100%) rename Resources/Textures/Objects/Materials/{goldbar_single.png => materials.rsi/goldbar_10.png} (100%) create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/goldbar_20.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/goldbar_30.png rename Resources/Textures/Objects/Materials/{ => materials.rsi}/leadbar_single.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/liggerhide.png (100%) create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/meta.json rename Resources/Textures/Objects/Materials/{ => materials.rsi}/monkeyhide.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/phoron_gem.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/phoron_ore.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/phoron_sheet.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/rods.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/sheet_glass.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/sheet_metal.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/spent_phoron_gem.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/steelbar_single.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/tinbar_single.png (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/uranium.png (100%) rename Resources/Textures/Objects/Materials/{wood.png => materials.rsi/wood_plank.png} (100%) rename Resources/Textures/Objects/Materials/{ => materials.rsi}/wool.png (100%) rename Resources/Textures/Objects/Specific/Janitorial/{ => janitorial.rsi}/bucket.png (100%) rename Resources/Textures/Objects/Specific/Janitorial/{ => janitorial.rsi}/bucket_water.png (100%) rename Resources/Textures/Objects/Specific/Janitorial/{ => janitorial.rsi}/cleaner.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json rename Resources/Textures/Objects/Specific/Janitorial/{ => janitorial.rsi}/mopbucket.png (100%) rename Resources/Textures/Objects/Specific/Janitorial/{ => janitorial.rsi}/mopbucket_water.png (100%) delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorsuit.png rename Resources/Textures/Objects/Specific/Medical/{ => medical.rsi}/brutepack.png (100%) rename Resources/Textures/Objects/Specific/Medical/{ => medical.rsi}/cast.png (100%) rename Resources/Textures/Objects/Specific/Medical/{ => medical.rsi}/gauze.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/medkit_r.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json rename Resources/Textures/Objects/Specific/Medical/{ => medical.rsi}/morphine.png (100%) rename Resources/Textures/Objects/Specific/Medical/{ => medical.rsi}/ointment.png (100%) delete mode 100644 Resources/Textures/Objects/Specific/Medical/medkit_r.png delete mode 100644 Resources/Textures/Objects/Tools/cable_coil.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coil-10.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coil-20.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coil-30.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilhv-10.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilhv-20.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilhv-30.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilhv-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilhv-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coillv-10.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coillv-20.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coillv-30.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coillv-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coillv-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilmv-10.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilmv-20.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilmv-30.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilmv-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilmv-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcl-0.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcl-10.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcl-20.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcl-30.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcl-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcl-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcle-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/rcl.rsi/rcle-inhand-right.png diff --git a/Resources/Prototypes/Catalog/LatheRecipes/medical.yml b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml index 5ba561ec72..18bb22e357 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/medical.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/medical.yml @@ -1,6 +1,6 @@ - type: latheRecipe id: Brutepack - icon: Objects/Specific/Medical/brutepack.png + icon: Objects/Specific/Medical/medical.rsi/brutepack.png result: Brutepack completetime: 500 materials: @@ -9,7 +9,7 @@ - type: latheRecipe id: Ointment - icon: Objects/Specific/Medical/ointment.png + icon: Objects/Specific/Medical/medical.rsi/ointment.png result: Ointment completetime: 500 materials: diff --git a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml index a65816b4b7..ae279888d0 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml @@ -1,6 +1,6 @@ - type: latheRecipe id: MetalStack - icon: Objects/Materials/sheet_metal.png + icon: Objects/Materials/materials.rsi/sheet_metal.png result: SteelSheet1 completetime: 500 materials: @@ -8,7 +8,7 @@ - type: latheRecipe id: GlassStack - icon: Objects/Materials/sheet_glass.png + icon: Objects/Materials/materials.rsi/sheet_glass.png result: GlassSheet1 completetime: 500 materials: diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml index 231befb942..0aabd7adbf 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml @@ -161,8 +161,8 @@ description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. components: - type: Sprite - sprite: Clothing/Shoes/magboots0.rsi - + sprite: Clothing/Shoes/magboots.rsi + state: icon - type: Clothing sprite: Clothing/Shoes/magboots.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml index fc27376454..3cde4a978d 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml @@ -23,9 +23,6 @@ map: ["enum.DoorVisualLayers.BaseBolted"] - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Icon - sprite: Constructible/Structures/Doors/airlock_basic.rsi - state: closed - type: Collidable shapes: - !type:PhysShapeAabb @@ -85,4 +82,3 @@ components: - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint.rsi - diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml index 4130fe5fd5..d82f1da00b 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml @@ -6,7 +6,6 @@ components: - type: Sprite sprite: Constructible/Structures/Doors/airlock_external.rsi - - type: Appearance visuals: - type: AirlockVisualizer @@ -23,7 +22,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_freezer.rsi - - type: entity parent: Airlock id: AirlockEngineering @@ -32,7 +30,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_engineering.rsi - - type: entity parent: Airlock id: AirlockCargo @@ -41,7 +38,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_cargo.rsi - - type: entity parent: Airlock id: AirlockMedical @@ -50,7 +46,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_medical.rsi - - type: entity parent: Airlock id: AirlockScience @@ -59,7 +54,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_science.rsi - - type: entity parent: Airlock id: AirlockCommand @@ -68,7 +62,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_command.rsi - - type: entity parent: Airlock id: AirlockSecurity @@ -77,7 +70,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_security.rsi - # Glass Airlocks - type: entity parent: AirlockGlass @@ -87,7 +79,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_engineering_glass.rsi - - type: entity parent: AirlockGlass id: AirlockCargoGlass @@ -96,7 +87,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_cargo_glass.rsi - - type: entity parent: AirlockGlass id: AirlockMedicalGlass @@ -105,7 +95,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_medical_glass.rsi - - type: entity parent: AirlockGlass id: AirlockScienceGlass @@ -114,7 +103,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_science_glass.rsi - - type: entity parent: AirlockGlass id: AirlockCommandGlass @@ -123,7 +111,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_command_glass.rsi - - type: entity parent: AirlockGlass id: AirlockSecurityGlass @@ -132,7 +119,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_security_glass.rsi - # Maintenance Hatchs - type: entity parent: AirlockMaint @@ -142,7 +128,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_cargo.rsi - - type: entity parent: AirlockMaint id: AirlockMaintCommand @@ -151,7 +136,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_command.rsi - - type: entity parent: AirlockMaint id: AirlockMaintCommon @@ -160,7 +144,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_common.rsi - - type: entity parent: AirlockMaint id: AirlockMaintEngi @@ -169,7 +152,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_engi.rsi - - type: entity parent: AirlockMaint id: AirlockMaintInt @@ -178,7 +160,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_int.rsi - - type: entity parent: AirlockMaint id: AirlockMaintMed @@ -187,7 +168,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_med.rsi - - type: entity parent: AirlockMaint id: AirlockMaintRnD @@ -196,7 +176,6 @@ - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_rnd.rsi - - type: entity parent: AirlockMaint id: AirlockMaintSec @@ -204,4 +183,3 @@ components: - type: Sprite sprite: Constructible/Structures/Doors/airlock_maint_sec.rsi - diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml index cb05a02c43..46ddfe50ae 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml @@ -1,6 +1,7 @@ - type: entity name: chair id: SeatBase + abstract: true description: You sit in this. Either by will or force. components: - type: Clickable diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml index ab00940ea1..dd89159891 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml @@ -7,7 +7,8 @@ - type: Clickable - type: InteractionOutline - type: Sprite - texture: Constructible/Misc/rack.png + sprite: Constructible/Misc/furniture.rsi + state: rack - type: Collidable shapes: - !type:PhysShapeAabb @@ -32,7 +33,8 @@ - type: Clickable - type: InteractionOutline - type: Sprite - texture: Constructible/Misc/shelf.png + sprite: Constructible/Misc/furniture.rsi + state: shelf - type: Collidable shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml index f1dca3b8e1..485dc319cd 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml @@ -9,7 +9,6 @@ - type: Collidable - type: SnapGrid offset: Center - - type: Sprite - type: Destructible thresholdvalue: 100 @@ -23,7 +22,9 @@ id: FourwayPipe name: Fourway Pipe components: - + - type: Icon + sprite: Constructible/Atmos/pipe.rsi + state: pipeFourway2 - type: NodeContainer nodes: - !type:PipeNode @@ -35,7 +36,9 @@ id: LongitudinalPipe name: Longitudinal Pipe components: - + - type: Icon + sprite: Constructible/Atmos/pipe.rsi + state: pipeLongitudinal2 - type: NodeContainer nodes: - !type:PipeNode diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml index b88d93b9d8..921f9d0263 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml @@ -9,8 +9,10 @@ - type: Collidable - type: SnapGrid offset: Center - - type: Sprite + - type: Icon + sprite: Constructible/Atmos/pressurepump.rsi + state: pumpEnabledSouth2North2 - type: Appearance visuals: - type: PipeVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml index 86354495ec..4c25e06311 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml @@ -3,15 +3,18 @@ name: arcade parent: ComputerBase components: - - type: PowerReceiver - type: Sprite + sprite: Constructible/Power/computers.rsi layers: - state: arcade map: ["enum.ComputerVisualizer+Layers.Body"] - state: invaders shader: unshaded map: ["enum.ComputerVisualizer+Layers.Screen"] + - type: Icon + sprite: Constructible/Power/computers.rsi + state: arcade - type: Appearance visuals: - type: ComputerVisualizer @@ -33,19 +36,21 @@ - type: entity id: BlockGameArcade - name: blockGameArcade + name: NT block game parent: ComputerBase components: - - type: Icon - state: arcade - type: PowerReceiver - type: Sprite + sprite: Constructible/Power/computers.rsi layers: - state: arcade map: ["enum.ComputerVisualizer+Layers.Body"] - state: invaders shader: unshaded map: ["enum.ComputerVisualizer+Layers.Screen"] + - type: Icon + sprite: Constructible/Power/computers.rsi + state: arcade - type: Appearance visuals: - type: ComputerVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml index 7baee4acff..347e8c582e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml @@ -5,8 +5,8 @@ parent: ReagentDispenserBase components: - type: Sprite - texture: Constructible/Power/dispensers.rsi/booze_dispenser.png - + sprite: Constructible/Power/dispensers.rsi + state: booze_dispenser - type: ReagentDispenser pack: BoozeDispenserInventory - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml index ad9dccd8a4..15dd91d390 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml @@ -5,8 +5,11 @@ description: An industrial grade chemical dispenser with a sizeable chemical supply. components: - type: Sprite - texture: Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png - + sprite: Constructible/Power/industrial_dispenser.rsi + state: industrial_dispenser + - type: Icon + sprite: Constructible/Power/industrial_dispenser.rsi + state: industrial_dispenser - type: ReagentDispenser pack: ChemDispenserStandardInventory - type: PowerReceiver diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml index 3aa76a5f7b..e232174202 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml @@ -4,8 +4,14 @@ description: An industrial grade chemical manipulator with pill and bottle production included. components: - type: Sprite - texture: Constructible/Power/mixer.rsi/mixer_loaded.png - + sprite: Constructible/Power/mixer.rsi + layers: + - state: mixer_empty + - state: mixer_screens + shader: unshaded + - type: Icon + sprite: Constructible/Power/mixer.rsi + state: mixer_loaded - type: ChemMaster - type: PowerReceiver - type: Clickable @@ -26,6 +32,50 @@ anchored: true - type: SnapGrid offset: Center + - type: Destructible + deadThreshold: 50 + spawnOnDestroy: chem_master_broken + - type: UserInterface + interfaces: + - key: enum.ChemMasterUiKey.Key + type: ChemMasterBoundUserInterface + - type: Pullable + +- type: entity + id: chem_master_broken + name: ChemMaster 4000 [Broken] + description: A broken industrial grade chemical manipulator. + components: + - type: Sprite + sprite: Constructible/Power/mixer.rsi + layers: + - state: mixer_empty + - state: mixer_screen_broken + shader: unshaded + - type: Icon + sprite: Constructible/Power/mixer.rsi + state: mixer_broken + - type: Clickable + - type: InteractionOutline + - type: Anchorable + - type: Collidable + shapes: + - !type:PhysShapeAabb + bounds: "-0.4,-0.25,0.4,0.25" + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + IsScrapingFloor: true + - type: Physics + mass: 25 + anchored: true + - type: SnapGrid + offset: Center + - type: Destructible + deadThreshold: 25 + spawnOnDestroy: MetalSheet1 - type: UserInterface interfaces: - key: enum.ChemMasterUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml index 0741b94f67..155a596cf2 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml @@ -19,8 +19,8 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Constructible/Power/wiredmachine.png - + sprite: Constructible/Power/power.rsi + state: wiredmachine - type: NodeContainer nodes: - !type:AdjacentNode @@ -48,8 +48,8 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Constructible/Power/provider.png - + sprite: Constructible/Power/power.rsi + state: provider - type: Battery - type: NodeContainer nodes: @@ -75,8 +75,8 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Constructible/Power/provider.png - + sprite: Constructible/Power/power.rsi + state: provider - type: Battery - type: NodeContainer nodes: @@ -117,7 +117,7 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Constructible/Power/wirelessmachine.png - + sprite: Constructible/Power/power.rsi + state: wirelessmachine - type: PowerReceiver - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml index cca6d3da53..f8cd6eb850 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml @@ -15,8 +15,8 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Constructible/Power/generator.png - + sprite: Constructible/Power/power.rsi + state: generator - type: NodeContainer nodes: - !type:AdjacentNode @@ -48,7 +48,6 @@ layers: - state: smes-display shader: unshaded - - type: Smes - type: Appearance visuals: @@ -85,9 +84,8 @@ - type: SnapGrid offset: Center - type: Sprite - texture: Constructible/Power/storage.png - - state: smes + sprite: Constructible/Power/power.rsi + state: storage - type: Battery maxCharge: 1000 startingCharge: 1000 @@ -127,7 +125,6 @@ texture: "" sprite: "Constructible/Power/apc.rsi" state: apc0 - - type: Appearance visuals: - type: ApcVisualizer @@ -169,7 +166,6 @@ - type: Sprite sprite: Constructible/Power/solar_panel.rsi state: normal - - type: NodeContainer nodes: - !type:AdjacentNode diff --git a/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml index aa90e01949..e8da7d0db0 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml @@ -5,8 +5,8 @@ description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers. components: - type: Sprite - texture: Constructible/Power/dispensers.rsi/soda_dispenser.png - + sprite: Constructible/Power/dispensers.rsi + state: soda_dispenser - type: ReagentDispenser pack: SodaDispenserInventory - type: reagentDispenserInventory diff --git a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml b/Resources/Prototypes/Entities/Constructible/Power/wires.yml similarity index 88% rename from Resources/Prototypes/Entities/Constructible/Ground/wires.yml rename to Resources/Prototypes/Entities/Constructible/Power/wires.yml index debdded41d..187a2a5f6a 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml @@ -10,7 +10,6 @@ - type: Collidable - type: SnapGrid offset: Center - - type: Sprite drawdepth: BelowFloor - type: IconSmooth @@ -28,6 +27,9 @@ - type: Sprite sprite: Constructible/Power/hv_cable.rsi state: hvcable_0 + - type: Icon + sprite: Constructible/Power/hv_cable.rsi + state: hvcable_4 - type: IconSmooth base: hvcable_ key: hv_cables @@ -51,6 +53,10 @@ color: Yellow sprite: Constructible/Power/mv_cable.rsi state: mvcable_0 + - type: Icon + color: Yellow + sprite: Constructible/Power/mv_cable.rsi + state: mvcable_4 - type: IconSmooth base: mvcable_ key: mv_cables @@ -74,6 +80,10 @@ color: Green sprite: Constructible/Power/lv_cable.rsi state: lvcable_0 + - type: Icon + color: Green + sprite: Constructible/Power/lv_cable.rsi + state: lvcable_4 - type: IconSmooth base: lvcable_ key: lv_cables diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml rename to Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml index 509071906b..5249cb04ea 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml @@ -5,8 +5,8 @@ description: A storage tank containing welding fuel. components: - type: Sprite - texture: Constructible/Misc/weldtank.png - + sprite: Constructible/Misc/tanks.rsi + state: fueltank - type: Explosive devastationRange: 0 heavyImpactRange: 2 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml index 2e441a29f8..b02d01d163 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml @@ -6,8 +6,8 @@ description: "A water tank. It is used to store high amounts of water." components: - type: Sprite - texture: Constructible/Misc/watertank.png - + sprite: Constructible/Misc/tanks.rsi + state: watertank - type: Anchorable - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml index 75f86154b5..ce23cd39b3 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml @@ -6,8 +6,8 @@ - type: Clickable - type: InteractionOutline - type: Sprite - texture: Constructible/Structures/Walls/wall_girder.png - + sprite: Constructible/Structures/Walls/solid.rsi + state: wall_girder - type: Collidable shapes: - !type:PhysShapeAabb @@ -18,7 +18,6 @@ spawnOnDestroy: SteelSheet1 - type: SnapGrid offset: Edge - placement: snap: - Wall diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml index ac0f27c25e..43e8df9870 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml @@ -15,6 +15,9 @@ color: "#889192" drawdepth: Walls sprite: Constructible/Structures/Walls/low_wall.rsi + - type: Icon + sprite: Constructible/Structures/Walls/low_wall.rsi + state: metal - type: Collidable shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index fe6d4a6e7e..a1e16822a8 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -15,6 +15,9 @@ netsync: false drawdepth: WallTops sprite: Constructible/Structures/Windows/window.rsi + - type: Icon + sprite: Constructible/Structures/Windows/window.rsi + state: full - type: Collidable shapes: - !type:PhysShapeAabb @@ -41,6 +44,8 @@ - type: Sprite drawdepth: WallTops sprite: Constructible/Structures/Windows/reinforced_window.rsi + - type: Icon + sprite: Constructible/Structures/Windows/reinforced_window.rsi - type: Destructible deadThreshold: 75 resistances: metallicResistances @@ -55,6 +60,8 @@ - type: Sprite drawdepth: WallTops sprite: Constructible/Structures/Windows/phoron_window.rsi + - type: Icon + sprite: Constructible/Structures/Windows/phoron_window.rsi - type: Destructible deadThreshold: 100 resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 85e716146e..6e3ed9bee7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml @@ -20,7 +20,9 @@ drawdepth: Mobs sprite: Constructible/Power/VendingMachines/cola.rsi state: normal - + - type: Icon + sprite: Constructible/Power/VendingMachines/cola.rsi + state: normal - type: Physics mass: 85 - type: Collidable diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index ca54c2f3a4..ddc6356f3e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -55,7 +55,6 @@ - type: Sprite sprite: Objects/Fun/Instruments/violin.rsi state: icon - - type: Item size: 24 sprite: Objects/Fun/Instruments/violin.rsi @@ -68,8 +67,8 @@ - type: Instrument program: 56 - type: Sprite - texture: Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png - + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: trumpet - type: entity name: electric guitar diff --git a/Resources/Prototypes/Entities/Objects/Power/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Power/cable_coils.yml new file mode 100644 index 0000000000..bfcda8a034 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Power/cable_coils.yml @@ -0,0 +1,98 @@ + +# If you're looking at the rsi for this file, you'll probably be confused why +# I didn't just use an alpha for most of this stuff. Well icons don't have the +# ability to have applied colors yet in GUIs. -Swept + +- type: entity + abstract: true + parent: BaseItem + id: CableStack1 + name: cable stack 1 + suffix: Full + components: + - type: Stack + stacktype: enum.StackType.Cable + - type: Sprite + sprite: Objects/Tools/cables.rsi + - type: Item + sprite: Objects/Tools/cables.rsi + - type: WirePlacer + - type: Clickable + +- type: entity + parent: CableStack1 + id: HVWireStack + name: HV Wire Coil + components: + - type: Sprite + state: coilhv-30 + - type: Item + size: 10 + HeldPrefix: coilhv + - type: WirePlacer + wirePrototypeID: HVWire + blockingWireType: HighVoltage + +- type: entity + parent: CableStack1 + id: MVWireStack + name: MV Wire Coil + components: + - type: Sprite + state: coilmv-30 + - type: Item + size: 10 + HeldPrefix: coilmv + - type: WirePlacer + wirePrototypeID: MVWire + blockingWireType: MediumVoltage + +- type: entity + parent: CableStack1 + id: ApcExtensionCableStack + name: Apc Extension Cable Coil + components: + - type: Sprite + state: coillv-30 + - type: Item + size: 10 + HeldPrefix: coillv + - type: WirePlacer + wirePrototypeID: ApcExtensionCable + blockingWireType: Apc + +- type: entity + parent: HVWireStack + id: HVWireStack1 + suffix: 1 + components: + - type: Sprite + state: coilhv-10 + - type: Item + size: 3 + - type: Stack + count: 1 + +- type: entity + parent: MVWireStack + id: MVWireStack1 + suffix: 1 + components: + - type: Sprite + state: coilmv-10 + - type: Item + size: 3 + - type: Stack + count: 1 + +- type: entity + parent: ApcExtensionCableStack + id: ApcExtensionCableStack1 + suffix: 1 + components: + - type: Sprite + state: coillv-10 + - type: Item + size: 3 + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 3636b34a84..034f7ff7f7 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -93,6 +93,9 @@ netsync: false sprite: Constructible/Power/cell_recharger.rsi drawdepth: Items + - type: Icon + sprite: Constructible/Power/cell_recharger.rsi + state: empty - type: PowerCellCharger transfer_efficiency: 0.85 - type: PowerReceiver @@ -120,6 +123,9 @@ netsync: false sprite: Constructible/Power/recharger.rsi drawdepth: Items + - type: Icon + sprite: Constructible/Power/recharger.rsi + state: empty - type: WeaponCapacitorCharger transfer_efficiency: 0.85 - type: PowerReceiver @@ -147,6 +153,9 @@ netsync: false sprite: Constructible/Power/wall_recharger.rsi drawdepth: Items + - type: Icon + sprite: Constructible/Power/wall_recharger.rsi + state: empty - type: WeaponCapacitorCharger transfer_efficiency: 0.95 - type: PowerReceiver diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 9211c7f91c..59d12f38a1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -5,8 +5,8 @@ id: Beaker components: - type: Sprite - texture: Objects/Specific/Chemistry/beakers.rsi/beaker.png - + sprite: Objects/Specific/Chemistry/beakers.rsi + state: beaker - type: Item sprite: Objects/Specific/Chemistry/beakers.rsi HeldPrefix: beaker @@ -25,8 +25,8 @@ id: LargeBeaker components: - type: Sprite - texture: Objects/Specific/Chemistry/beakers.rsi/beakerlarge.png - + sprite: Objects/Specific/Chemistry/beakers.rsi + state: beakerlarge - type: Item sprite: Objects/Specific/Chemistry/beakers.rsi HeldPrefix: beaker @@ -45,8 +45,8 @@ id: Dropper components: - type: Sprite - texture: Objects/Specific/Chemistry/dropper.rsi/dropper.png - + sprite: Objects/Specific/Chemistry/dropper.rsi + state: dropper - type: SolutionContainer fillingState: dropper fillingSteps: 2 @@ -63,8 +63,8 @@ id: Syringe components: - type: Sprite - texture: Objects/Specific/Chemistry/syringe.rsi/0.png - + sprite: Objects/Specific/Chemistry/syringe.rsi + state: 0 - type: SolutionContainer fillingState: syringe fillingSteps: 5 @@ -79,16 +79,16 @@ parent: BaseItem id: bottle components: - - type: Drink - - type: SolutionContainer - maxVol: 30 - caps: AddTo, RemoveFrom - - type: Pourable - transferAmount: 5 - - type: Sprite - texture: Objects/Specific/Chemistry/bottle.rsi/bottle.png - - - type: Spillable + - type: Sprite + sprite: Objects/Specific/Chemistry/bottle.rsi + state: bottle + - type: Drink + - type: SolutionContainer + maxVol: 30 + caps: AddTo, RemoveFrom + - type: Pourable + transferAmount: 5 + - type: Spillable - type: entity name: pill @@ -96,10 +96,10 @@ id: pill description: It's not a suppository. components: - - type: Pill - - type: SolutionContainer - maxVol: 50 - caps: RemoveFrom - - type: Sprite - texture: Objects/Specific/Chemistry/pills.rsi/pill.png - + - type: Sprite + sprite: Objects/Specific/Chemistry/pills.rsi + state: pill + - type: Pill + - type: SolutionContainer + maxVol: 50 + caps: RemoveFrom diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml index eedd17ec83..7bf50902fc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml @@ -23,7 +23,10 @@ components: - type: Clickable - type: Sprite - texture: Objects/Specific/Janitorial/mopbucket.png + sprite: Objects/Specific/Janitorial/janitorial.rsi + layers: + - state: mopbucket + - state: mopbucket_water drawdepth: Objects - type: InteractionOutline - type: Bucket @@ -55,7 +58,10 @@ components: - type: Clickable - type: Sprite - texture: Objects/Specific/Janitorial/bucket.png + sprite: Objects/Specific/Janitorial/janitorial.rsi + layers: + - state: bucket + - state: bucket_water drawdepth: Objects - type: Bucket - type: LoopingSound @@ -195,7 +201,8 @@ description: A spray bottle with an unscrewable top. components: - type: Sprite - texture: Objects/Specific/Janitorial/cleaner.png + sprite: Objects/Specific/Janitorial/janitorial.rsi + state: cleaner - type: SolutionContainer maxVol: 100 caps: AddTo, RemoveFrom diff --git a/Resources/Prototypes/Entities/Objects/Specific/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml index 1c378a6f7b..7576b3c912 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/medical.yml @@ -5,8 +5,8 @@ id: Medkit components: - type: Sprite - texture: Objects/Specific/Medical/medkit_r.png - + sprite: Objects/Specific/Medical/medical.rsi + state: medkit_r - type: Storage capacity: 60 - type: Item @@ -42,8 +42,8 @@ id: Ointment components: - type: Sprite - texture: Objects/Specific/Medical/ointment.png - + sprite: Objects/Specific/Medical/medical.rsi + state: ointment - type: Healing heal: Heat: 10 @@ -59,8 +59,8 @@ id: Brutepack components: - type: Sprite - texture: Objects/Specific/Medical/brutepack.png - + sprite: Objects/Specific/Medical/medical.rsi + state: medkit_r - type: Healing heal: Blunt: 10 diff --git a/Resources/Prototypes/Entities/Objects/materials.yml b/Resources/Prototypes/Entities/Objects/materials.yml index fe11f9306d..a7edaea2f4 100644 --- a/Resources/Prototypes/Entities/Objects/materials.yml +++ b/Resources/Prototypes/Entities/Objects/materials.yml @@ -60,77 +60,6 @@ - type: Stack count: 1 -- type: entity - abstract: true - parent: BaseItem - id: CableStack1 - name: cable stack 1 - suffix: Full - components: - - type: Stack - stacktype: enum.StackType.Cable - - type: Sprite - texture: Objects/Tools/cable_coil.png - - type: WirePlacer - - type: Clickable - -- type: entity - parent: CableStack1 - id: HVWireStack - name: HV Wire Coil - components: - - type: Sprite - color: Orange - - type: WirePlacer - wirePrototypeID: HVWire - blockingWireType: HighVoltage - -- type: entity - parent: CableStack1 - id: MVWireStack - name: MV Wire Coil - components: - - type: Sprite - color: Yellow - - type: WirePlacer - wirePrototypeID: MVWire - blockingWireType: MediumVoltage - -- type: entity - parent: CableStack1 - id: ApcExtensionCableStack - name: Apc Extension Cable Coil - components: - - type: Sprite - color: Green - - type: WirePlacer - wirePrototypeID: ApcExtensionCable - blockingWireType: Apc - -- type: entity - parent: HVWireStack - id: HVWireStack1 - suffix: 1 - components: - - type: Stack - count: 1 - -- type: entity - parent: MVWireStack - id: MVWireStack1 - suffix: 1 - components: - - type: Stack - count: 1 - -- type: entity - parent: ApcExtensionCableStack - id: ApcExtensionCableStack1 - suffix: 1 - components: - - type: Stack - count: 1 - - type: entity name: gold bar id: GoldStack @@ -143,13 +72,17 @@ - type: Stack stacktype: enum.StackType.Gold - type: Sprite - texture: Objects/Materials/goldbar_single.png + sprite: Objects/Materials/materials.rsi + state: goldbar_30 - type: entity id: GoldStack1 name: gold bar 1 parent: GoldStack components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: goldbar_10 - type: Stack count: 1 @@ -159,7 +92,8 @@ parent: BaseItem components: - type: Sprite - texture: Objects/Materials/phoron_ore.png + sprite: Objects/Materials/materials.rsi + state: phoron_ore - type: entity name: phoron sheet @@ -193,4 +127,5 @@ parent: BaseItem components: - type: Sprite - texture: Objects/Materials/wood.png + sprite: Objects/Materials/materials.rsi + state: wood_plank diff --git a/Resources/Prototypes/technologies.yml b/Resources/Prototypes/technologies.yml index 21963bc49b..561b730b83 100644 --- a/Resources/Prototypes/technologies.yml +++ b/Resources/Prototypes/technologies.yml @@ -47,7 +47,7 @@ name: material sheet printing id: Sheets description: Print those sheets! - icon: Objects/Materials/sheet_metal.png + icon: Objects/Materials/materials.rsi/sheet_metal.png requiredPoints: 250 requiredTechnologies: - IndustrialEngineering @@ -72,7 +72,7 @@ name: "basic bluespace theory" id: BluespaceTheory description: An experimental course on the mysterious technology known as bluespace. - icon: Objects/Misc/hand_tele.png + icon: Objects/Misc/skub.rsi/icon.png requiredPoints: 1000 requiredTechnologies: - BasicResearch diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json b/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json index f39c72dfd3..353a5c697a 100644 --- a/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json +++ b/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json @@ -418,6 +418,24 @@ 1 ] ] + }, + { + "name": "shelf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "rack", + "directions": 1, + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Constructible/Misc/rack.png b/Resources/Textures/Constructible/Misc/furniture.rsi/rack.png similarity index 100% rename from Resources/Textures/Constructible/Misc/rack.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/rack.png diff --git a/Resources/Textures/Constructible/Misc/shelf.png b/Resources/Textures/Constructible/Misc/furniture.rsi/shelf.png similarity index 100% rename from Resources/Textures/Constructible/Misc/shelf.png rename to Resources/Textures/Constructible/Misc/furniture.rsi/shelf.png diff --git a/Resources/Textures/Constructible/Misc/weldtank.png b/Resources/Textures/Constructible/Misc/tanks.rsi/fueltank.png similarity index 100% rename from Resources/Textures/Constructible/Misc/weldtank.png rename to Resources/Textures/Constructible/Misc/tanks.rsi/fueltank.png diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/meta.json b/Resources/Textures/Constructible/Misc/tanks.rsi/meta.json new file mode 100644 index 0000000000..9d8a0345cc --- /dev/null +++ b/Resources/Textures/Constructible/Misc/tanks.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "watertank", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "fueltank", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Misc/watertank.png b/Resources/Textures/Constructible/Misc/tanks.rsi/watertank.png similarity index 100% rename from Resources/Textures/Constructible/Misc/watertank.png rename to Resources/Textures/Constructible/Misc/tanks.rsi/watertank.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json index 35e8a5cd3f..89b9a58fa2 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json @@ -16,6 +16,15 @@ ] ] }, + { + "name": "normal", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, { "name": "eject-unshaded", "directions": 1, diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..0290132906ed14ea4e67b13fd0c00f586dd7650a GIT binary patch literal 486 zcmV@P)}VYj!;n51Je&~Um|D*MGinOs$t;3xg!vV@bb~t0oVYzF@n?}k*9_O7;nwM5OXz| z!N7>bW>Cu@t1m%x2qYC3Gwj>68$;a5&y`_bZ!d;8tT_gA)G8cJGNK&-vK(X?HgQ6h z;{!xH0Fawz5oCK07*qoM6N<$f){zYW&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json b/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json index bfa10c575d..f2a0fa068e 100644 --- a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json @@ -1 +1,38 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"booze_dispenser","directions":1,"delays":[[1.0]]},{"name":"dispenser","directions":1,"delays":[[1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "states": [ + { + "name": "booze_dispenser", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "soda_dispenser", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "dispenser", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/meta.json b/Resources/Textures/Constructible/Power/mixer.rsi/meta.json index 7ef2fc45bf..75a7e2133e 100644 --- a/Resources/Textures/Constructible/Power/mixer.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/mixer.rsi/meta.json @@ -1 +1,63 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"mixer_empty","directions":1,"delays":[[1.0]]},{"name":"mixer_loaded","directions":1,"delays":[[1.0]]},{"name":"mixer_screens","directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]]},{"name":"mixer_splicer_screen_broken","directions":1,"delays":[[1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "states": [ + { + "name": "mixer_empty", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "mixer_broken", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "mixer_loaded", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "mixer_screens", + "directions": 1, + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.1, + 0.2, + 0.1, + 0.2, + 0.1 + ] + ] + }, + { + "name": "mixer_screen_broken", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png b/Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..986a66c2805fa7369356296f6f527c858a68f04e GIT binary patch literal 732 zcmV<20wev2P)l&H6n<$kwW1)3Aegd(2E7*i!zStBLjZ{nW|*pr=@&1RJh+qSJPpwVbh#(NWpk+)hc zB>~N5)3qalo1IABZnu5eS}K+9lgT6uhr^YS{cm7hoC*yZ?+(E}dqe#~p#byw90r5I z)>9xIf~j^4(~DCgKv*B1K9HJsZl45d$B=eTr0lv$DB~{Zzh9F-BhpUiGqpH&MXl$^ z!u3G6+uf+*_dM$Wz&RXs0P6LF zXaaai$O9uV%&P19k6)_3oQNa<$wNa>{zOT5^!A)c4Rf&y1?9woo=5foNQ3~%ai zJP0xu)Fls?RVDHb0b!scR`ySF?}akG!{o~6C#4|eR*Q={LpU;QNmiio5Divy<>p587 zTtOn2hvkj4InLF7z7g^?Ka7c=o*_f@^sQ%>f?R4Tl9M zcswN9X`~!L!#wx1T?XF;J-|dVp~?c7fuI1<|2`3!vH+g3ZSju;0Qe2tgff#U<3P>; O0000O%ML3@)p(Kz62HWNB&JkWqN+1*5UGa7^kXcS#;1ghB0e4yp zFkBoC$x*)mpLSO`?(6rS8Oy)RL8buidg=Mmf~+DDc)nu_ZV!DvXpM8j_)>uG8ayK& zM-j{R--9K>n0W%puKlMu22H+0zzUhj&A_B*hSz|7Dpv$7EI=htWIl@~1j8sDLT7Pd zKL`*`Mfl=kVJ!4l97zC*(8>#AsV^fGVNXVSE*(Z0u&_W%QY1393+|=hdBq^IH^=|iw|4)|IYV=Jcd7x@c=LY{40RZ=r$AMefT}P zC;$rIOn;0)dI3;jKk$y3m(Tl8b4cFT`Fa=ZP*wf%ILU!9uZ5wPa0`HLELV*X z2(nt13l7Z4dVs5%=1J_%jLNS-u9}8RGgbiMdN0T_S}Dyr5Eo`_oInWy2twmrW@KA{ zAmYp5AZ*R3Z9)k|*%nWYht-QC@NeSNQ9y_%Ae;_vU@=(b@mP$OeWkY6x^!?PP{Ku(dT zi(`n!#N-4CpN7DbH#`I*9gY}UTySOZbhzOWazeth;o^;mz?(M&JP(|>apnd`2gz-&TtqJkC4}4EJ(Hi$5$qHW6q$gQu&X%Q~loCIBUHT?7CC diff --git a/Resources/Textures/Objects/Specific/Medical/brutepack.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/brutepack.png rename to Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png diff --git a/Resources/Textures/Objects/Specific/Medical/cast.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/cast.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/cast.png rename to Resources/Textures/Objects/Specific/Medical/medical.rsi/cast.png diff --git a/Resources/Textures/Objects/Specific/Medical/gauze.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/gauze.png rename to Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medkit_r.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medkit_r.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb5a3eebea2ef04f4678fe60297012d13b65ecb GIT binary patch literal 713 zcmV;)0yh1LP)#FA>Y8jIsF=2Ehv@n%nF-CGVR&}{w~s?{nC!-#ZjS(YPmxV|WTJIo*n%StRE z_*KoFU$cRd20YbuOwTOf!TqU70p~A_Lf7@pwLY%fuHUc-Nq`vq2Y?oU4GuJjoXui> zb{doApnxx5o15d(__)Jsg#3~}m56|VaBv^nLxsCo9F44iv2(Z5zRH6l{Qi?FKqMmP zn47(b+pkT4o|GWJV;V4Fch+l3Ty4Z}j?_>#Az_>Mw7q$B-zNiYuysWuN&!^<7asYS zXM4T{RTxy94oU%w9M}P1pI|%m7lD5QSO>7gWf1`ZYuxSres7)=$hp|F?ayd&brMnq zzH`7}?t&*A_~@0MI=G%Pcm}|6xXC@X-9#e=5P41@eB!_r4fvceSg~n2@ABSG+fpOH z^u{I!dIWx88@`EXG*Z5nPyk`BzM7aTRUqHA&=4F{&J5sW(?To4>4%{K=j~_iPAKAbP2bS7yZ0RU|58#{73kMi*%LYagZo{ZbA>`MG^b?fYzzE6Wz#azl zGj}J1FQzC&Wlq8A(q0LPkp7Y#%`%5_N~n!#2j^*Fdbi;Ip>u4eQgOyo1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json new file mode 100644 index 0000000000..d353161614 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brutepack", + "directions": 1, + "delays": [ + [1.0] + ] + }, + { + "name": "cast", + "directions": 1, + "delays": [ + [1.0] + ] + }, + { + "name": "gauze", + "directions": 1, + "delays": [ + [1.0] + ] + }, + { + "name": "medkit_r", + "directions": 1, + "delays": [ + [1.0] + ] + }, + { + "name": "morphine", + "directions": 1, + "delays": [ + [1.0] + ] + }, + { + "name": "ointment", + "directions": 1, + "delays": [ + [1.0] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/morphine.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/morphine.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/morphine.png rename to Resources/Textures/Objects/Specific/Medical/medical.rsi/morphine.png diff --git a/Resources/Textures/Objects/Specific/Medical/ointment.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/ointment.png rename to Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment.png diff --git a/Resources/Textures/Objects/Specific/Medical/medkit_r.png b/Resources/Textures/Objects/Specific/Medical/medkit_r.png deleted file mode 100644 index 8b9b34102a26066c55bd5ab810ae155e722809a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 675 zcmV;U0$lxxP)pugAp$9be7>*x5&cMaRh0~C4-@btzG4B0HbY{1qtj2Bd(6 zh2hA7oec9AqFVOs#alSLwWS5D?hTqFK;|J^$bxPW3~-~xKw^9XPM>k{3St$1`XALo z#ynPr{~!U71Ro>BS0K<2R8YvoKoR%}O#z@}F&AhaPUF7*XP`P@LFTYQ@n2Z*P-r;F zN1y&)pkk+~;5%(bES6mY8q5QvMUWJ#P+-X~ApQizSN|g{WO@D{k_r`& ze8_->O>P2FL65WdKtV1>h~yq1e()cWbgz?X5i<}QFhD%A8<-M7o??MX97c+thd_2I zFr7Xo(%|^F-@x=jVMLMwC9<_D378jeH&a?x`Vd~*2uQ{s}oCeUSXkQ5)Z zQe`j$iv7f4z&#sP6d%EW(vjOJ@-Y5VO=$)T0WL&pJaH4#U~FO_Acn_BAU$Ge`fY)h zfdHd6GsFM+z(_lVq~RbiLNl0%PaGg0fGtUOz$(8BXx`ob(BkS25Who;J9%KroB>qe zLS)j%6#@)s=7N0&Vz>aU6$a8mj0oS=Fr%hYQUS;!P(`%oAJj5Xvp|Q15p1M6Qn7sU zA1a?*a1v^fxQ#s{*s`;iZZX6gsnejGhk$|wn;DnS>0tl}FaWMd-noC9>J9(^002ov JPDHLkV1i4<9u@!q diff --git a/Resources/Textures/Objects/Tools/cable_coil.png b/Resources/Textures/Objects/Tools/cable_coil.png deleted file mode 100644 index a9cdc5f159b4358bb7dadad8aec3ee32ab3b553c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*Z&O-|NsBb%*<5#EV&*i z$XF8O7tG-B>_!@p6X5CM7$Pw>Ibi{}0B^&Eo=9&+o^5RF7}(eqoVyw|uWn>KaUvmM zhAFSgR0bC*g{{H|au!5MI6JjA3ND#q*m${7^hiQh!YnD)txnmDx-xtWW!XF#TB#3G Qfo3y!y85}Sb4q9e0Heh-9smFU diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coil-10.png b/Resources/Textures/Objects/Tools/cables.rsi/coil-10.png new file mode 100644 index 0000000000000000000000000000000000000000..b367322fee64c4a27fac9f44363513b846aec4eb GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C^*B@ z#WAE}&fCiyc@HS?usA5C3NK3#wGvyHAQ-kVna54>XULWxfp=~MP2u{xm$f|mZ05PO zv+@|2B@QqwXW09_v!3JOFWH6Gbo+HPKkCT*vTH+%E93OL2GTCy+%3a}_Hy%M1E zJm%sJ%j>TqW`E^pZ1|&pL*bXnj9XE+dtTaoQ98ks^n+W2W!X#Nrk@wnk4fdV OLkym-elF{r5}E*!TV^Q$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coil-30.png b/Resources/Textures/Objects/Tools/cables.rsi/coil-30.png new file mode 100644 index 0000000000000000000000000000000000000000..e7e24f116d1e1415619af1bcc916f95e4fbce6c0 GIT binary patch literal 370 zcmV-&0ge8NP)q z#L_hN1_=UyIEBly+{BV3S)l+TD?)JT_XcR1W`YRCWw{Y2R8>_g2u0!Ry3TyI%?p6y z$j~JYgOB%c$F2yWc`pb6rOUD`8iv7#)riiSn>m<8*FilR&{F{RoEgD*x=hA=-U=rG zgxNQi9OXp}{y976kFmdJcRm8hNoN)~F;sxUDPJ`_x5R?>!43fQM+1WxCVA=eW)Z>1 zDfi9Z32;WwR$w6IB0}a@wqfulq<}r)^oL}A89;*Ewcq_WQ~(7~fWHBF0~6r9sMS}^ QWdHyG07*qoM6N<$g3wNxw*UYD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-10.png b/Resources/Textures/Objects/Tools/cables.rsi/coilhv-10.png new file mode 100644 index 0000000000000000000000000000000000000000..707aed405cdc7d9a8530467f1b854c4da2bbc9c3 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ37#&FArY;~60D08M0%P8`6W(r zHazWIr17V?zy2@##k#5dRQbFoI~Em+Mwfl+m#p~+>26GfGZVqLoI xjABJ5jZHEwnp$mJ*+aJe1S0QsSXnT?H&;RknF@yz>rcYq#b N@O1TaS?83{1OTULWEubf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-30.png b/Resources/Textures/Objects/Tools/cables.rsi/coilhv-30.png new file mode 100644 index 0000000000000000000000000000000000000000..f26264bf3fca0d73f25cef3e07bf3538be43138b GIT binary patch literal 373 zcmV-*0gC>KP)CSuR9P41W}Y6v)s3Q z`8Gehwcj-1cJ?x}^G(($6bi+^$AJvs>0uF+N%{WM@ZX!yKXZFI^WN8m`^T+YJ&K(G z3E!o2kIT#2a%nORG7@b7;v}3ERf{`6n>bT2A`>CwSm((H8+cxSH4q_j88>(`wY)xY zMo1KEFR$NZz#*suB#skyiOYQu;fWZQ82%g80YrCoactf`e#f?2Kr}CF+k>pATv7W> z4;rAE!#%}M&n`$VEEG~LHZ40ZtSd0`}n zChvt>7ZKK| z$XF8O7tG-B>_!@pQ&1HWQR0$XoLrPyP?DLS$G}iACpfI2sPy}n;DV1|pJ;jOYMncC zK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jYg*bHtK03@Fx0mV?d&#I z-Mm6#$<%J+wHk)zqDRc01ceoREoPMFV_=YxnXp;S>@m=8M^6{W5R2aA1PRs>h8`V` zZOUbhOF53tOfV8qRNzvZcy@84v^(QjM(#XDcMjES4QdK67=%x>Y+j(i63Z~xpPhlh XUXJB!lE`iinQ)T|fL@t*izvxvd8#(yHS!#=j3aw1$CVjRNR6_~x8k~5YuPIxMl^hP9_ tk4fiA1{13#M{w3p4XE9X>^wX?47oGx-!Bssx(;+3gQu&X%Q~loCIDSALgoMf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-20.png b/Resources/Textures/Objects/Tools/cables.rsi/coillv-20.png new file mode 100644 index 0000000000000000000000000000000000000000..cf1c68ed97e82aff7b6662574fa2e23e730d7966 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJi=HlyArY;~60D08M0%P64Y=5( z43akA-x1ZGl5T7N?U(&@4fey^uiHzgtaaHqt9sj4t~Lp7JLW>kma|Dq6C!uq=yqQJ z|8X&gBYOi6t0ad}NBmUr<%;t8_5b)c|G0PSctPO|3B|t_vJ6E(_ipWf*yr$__sn&n zvPA{m6Q4R(CGsgg;g}QH@P=bX{)JkOO)}92hmTCKZ9FY#Aqx~t@s^y>G&?}%@E7jP z&&|%f(Tk41W+=J8pj(jHAuEyd*Uf*^k7P;1oF2r$%*@QNySBv3%HZV!pywDoUHx3v IIVCg!0O!1Ba{vGU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-30.png b/Resources/Textures/Objects/Tools/cables.rsi/coillv-30.png new file mode 100644 index 0000000000000000000000000000000000000000..b39d8cae70f351698d7a7363ce4e669f46788307 GIT binary patch literal 375 zcmV--0f_#IP)(sr@y*8>3z2_o6LRnvF-*)+!@EE z-ZsthUes@?gwz%QauP3-)m5(Q| zKaLdOp%OrHOn8eNK#k{cCUnFFj^W(;eWw=y>)J1oJMX_WT65BEn&mlICMzG*s({`V zz@2jiYmF34r=A zFtUdv7kj?Ch)`q7qkik}4%}1Eq$7~>BEsZ#Zo^6ezkvi{!YQuK>knv?>FNHaeCLNg+q7bZUX>Y7t#RtkAb0LPHXQS?tASQKdb&7bP0l+XkK%70#c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-10.png b/Resources/Textures/Objects/Tools/cables.rsi/coilmv-10.png new file mode 100644 index 0000000000000000000000000000000000000000..061bfd998768605bd92c7a090f63c3a98588e05f GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ37#&FArY;~60D08M0%P8`6W(r zHatD;8u;V+xxc^o7wz6{KPg8}c&Q=7CL5ie*$+=n-k79|NCMcgZ;L-Vc7lFk!vpKK5279q|iS8Ba7!x*#ztlObj29vkkX y)0!E$EoV76@*SEIWyj@qPy=NB14d?MW(LPy_D>}AF9-nL#^CAd=d#Wzp$P!8gh^Qd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-20.png b/Resources/Textures/Objects/Tools/cables.rsi/coilmv-20.png new file mode 100644 index 0000000000000000000000000000000000000000..93df81a835567ab3342f534ddf6611cf9e571fb9 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJtDY{7ArY;~60D08M0%P64Y=5( z43ak2|11ieGvUv=}YSRMBB=~QI}W1r$xb8VnWkYM$H|a zzRK6Gz2R~1|CbW6?+;w@-iA?YSU7cn#Bstd zak&p7JQ2eZ!+*Uxfanf~r8%G9V_R!Lv?%U%53=lLi`r*;&;ZRG?kRqHc0qD3U&XXf z7;*B*X?Ajk94>n#S`O26+i1FMGLKlA?&Bl|I{^2*Fp@))e?pCm2y4{xAaD+#ZD43_ z;4m5#QeH$jxzBCbYhVl{z#C5Hd`_-VC=`ks#+WZ#S-U;E@n0MO0000*7iAWdWaj5FFjUM54l5`s{r)Am;N#aPTHd-^=gyoD z-VkbV(fGk5o%24LCmD)*dUseD2N_>B_EMPhXws2MAqv5omiET#`;1K0)%VAAb{ng1 zULmn$YPa!P4MTI$BW6#6!V10?GfML@u*{d)V5xmY7HGGFr;B5VMQ?I~1ZxRXpTn6G zP3{eb!Y(?lLISLUjUG`F3oAr;OcfkF8Zx>CZe!KW zDSi#p~Mrl32+Z%s_qgwQ?z?J`4t^lV`+Vnq-#Pc3^PZ7x zHmiDxNKe@Z0{U9O-qB^FRD4wR(vx1_-dqp0yXo%1X`_(4^44L#q5zQR@6J>#HK%5m zw)M4@)wM=DBH#;h_!42hEdn;T_8W=hxc(0N^-)&QkuevqM>LaO_tx;QR^CE=S_Gt~ z=M|$TAOe|iWdZll*9?NESXGp4OGP{RXfmN{wVH~@}Xyw0~{cT9>s-7L1wdIFv)2_&Kij@6{rET;CS9%dRaggD-{@y4q14wRP`Dbd*&YQ z6?w%BkQ|xd7)Gi!U;R^C&IMB}*X96XVdENzt!;?jW-W9|9t7LY97JYYiUPWg9N-Y5 zm0A+_2cvHhK$y?+yzo0jQmm8#)&q~i7JZ8VMvsxq$eB(6SwIFL5NAswW+gZeNF4S^ z4jn`$xeHQO%yxFZknlx>Lq`IK58I0sZgzrsB(9ecpMW6PtJoyHuqfVRE3B^H3AN(p z2cy;8SQ^!cRw4&Z4l~W`85^f8z_yv|x4)u){}&7d{1<)z*L1T>)EOfg00000NkvXX Hu0mjfm@^@a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/rcl.rsi/rcl-10.png b/Resources/Textures/Objects/Tools/rcl.rsi/rcl-10.png new file mode 100644 index 0000000000000000000000000000000000000000..55bed97ff87f13db0461cfa96482a7abd6354697 GIT binary patch literal 829 zcmV-D1H$}?P)pv3~RVRV3^~ZxqY+ zT=k{9_KVdL0Ql#bN$N{w=+Lpt;@-(qr|mE#5DRd`viZe!5E#2~$4(>%#5H{D*An&Y z+#Q7L0v#MV>#h;ssQ>Vd=^&8WmnF`g4J4pMkP6ttv2qejP8aJTpk}Zh)5Q+%*&7(= zAs}bX%n!e-P?ok)o)+mE4Nxq1)yDl5>yc3j!~%Tr+k#8PbQB%}s{AVWMT*fETBTv? z6+~nbviv4esIRHV4?M)XngdM21SDq2|RuSrqdZgq__qmNYO4L z?BjxxVpKy-L4}|7hFHU+ORyJz?h&X4aGqv7h9R}UTV53&*~?_P{jin?5EnM?RV%Y( zY(tDmt_3`-US6P7DN8TL%XH=8ZC`NJxb5UYB)6rOfSmczrHTVypqu+ALV@!TVy|mS zmfV*B+xvSvoX<(h&un*mspET)WU@L1xE}Z@Oxbr3;B&`F<}+tGVNd}Ips;YZ48*Fa z^MHZ}W1$13Ya#i%f-j zRCl&@|1WrJS&=+c$ep*L!iE#rDDx#Cs}MU8p~T&%|6GZ`Zhym#Ile4{00000NkvXX Hu0mjf*>rM} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/rcl.rsi/rcl-20.png b/Resources/Textures/Objects/Tools/rcl.rsi/rcl-20.png new file mode 100644 index 0000000000000000000000000000000000000000..926f515ce4fcbeebf9968e9c8f1fd6c3df2b4e15 GIT binary patch literal 845 zcmV-T1G4;yP)ZlVL8GE5Zrmvd zLi|E8;zC3MLRYN|R|#ZOR1}16Bp?W)i;i7L#0cu93#mwKYbfc;LL~^}oY&sr&6_tf zNszV+FJ#`lncO+&p8LrpY#0Wur-j!Q{Xc;XP2l#}b946V2U?u{B=&D!zY4Yc(3^#l zIbC~c@BMtW1OWbda-8}SX*zK9s(@N> zZ0!%iwSo2xow4`uUuewv`nU)rc4vsAX9Ec+5u^gX!@hD5Oit(PAfQIjiRpZkJ9h>8 zIS9y6GxJ05s+6Hkl%qNg(*Q-X*Uc}qO#7*q9?}w>GoHDkf-k`9-)C$hUa4>pP~}&_ zFH?j7&igXW(Qx*H2@sSFbdZY~l%gcBmP1jcTNCV$PI>PG3PA%ToYZ34U-yV-qv)QC*G%D7f zKl5TecJ_wA)hYlvD>(V~!#X4_xt(bc#V68Gr}E;mFF_fc*TM8@`@SFmDNqAkBv|nq zP)Vf)kpituLP3hQN&6i{tMcm#3^fH6el`}w9xJ*8-^IsHfocHfX~tt1Qo|an5o0>a zWV!vYmj@6RHm=pGQ{>r(7?WHJcvzz}Ly2OBUW}FK+Jig3;Hq)k$%9C4ODzF8^1&-r z3p`J^_LSQK=OM(at|eJ=Ujl6JN48kUamr0@w$`HSK1ecIodR4BoC>e#T?9Dq=xxq9 z%L#)DPymI6+%gcWqRs;b_WMcp9YivCkm*$6_W|q!Ur6{x1Xa(`tA^_hs|C5exWeU5 zkW&)$GU6bh8d`=QGIa2;_B&pM)%81}U~GLbS`kUB^;`Vl6llujh-h`-u;OUmx}NvK z)Duu2b|jlM0iH6Rh9=s2RCl&<{};S9j8G0LWG|XfVa*AwmH85oRfrr9QS9E6f3Cz| Xk9EbKGdP^?00000NkvXXu0mjfb)tne literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/rcl.rsi/rcl-30.png b/Resources/Textures/Objects/Tools/rcl.rsi/rcl-30.png new file mode 100644 index 0000000000000000000000000000000000000000..44d82ee06c900454cfd14bff2047f2b7d801b308 GIT binary patch literal 836 zcmV-K1H1f*P)X{q*6&R@TJ8ESXYn}w1& zQ+Z*}{d~0q0RCxmlzNkCI(Y1gym#`{X|o*?@C7)0+5CK42%Nuo$BZZX`>H`OIi0VAfIEUtOy`^0wL8$y zK|qa~nIC>vrVMSO998K$^-(l?&HPL&bbxwjjFxGH=IJq|h$7_h1$g!AoK3_l6%GP! z`Q6}`C`th5IfGBrZ-@Lk11Z$k_@f7oG<4MmKF~h#z3d63Mi0ZamkKrkcMdy=9?#y2 zLhZ&nR=_WMopD2&saSKQfuA8AVfW3|G=OhU#HrC}P%IXcW8~L@9FL#7A#t?|AdeHc z`0`DBrG(thG(dhU4ORJk%tsLwoX3Im8T+{;04Y!dTqGFr4w&dqOCklbI-w**+m!jv ze@L1FLrp=2@AXAF$B12m_3^P&;5LABH{&*(=_xHAl?@`K4ZWd#)iF9M~RCwC9|j)q=kz!ttc@!6~s2=QdV&Fa{(I)0QgoJPx4%?AOHXX z6iGxuR7i>KR6%aTAP@w*zO%&K4He2Yt^5EJ)O$d3e~=GU>i>fcCXT7$&|@+Ow7WB~ zg9MAv3r`0emmO5~P!H8AkIPcf4(E)ZnFL=M2SE^A;7cIPvfs4;emJ|p=cMsvc0WT2 z%T?x96t2I9l6yXzB&!`G05hw6dji5z@<-?0_9hAya4HGjN&+{06FbEqRjX}@I zYB&Uw%!tm1)f6WlfW!62hsSTA=`|6R5UK!{r@S*StPi9hfAJ27nZO@AbQ}T0uE0~d oNimOr%s(!-=%*z+DNad;8zmkaLZu~RVE_OC07*qoM6N<$g0$hm7XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/rcl.rsi/rcl-inhand-right.png b/Resources/Textures/Objects/Tools/rcl.rsi/rcl-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7265c08ae334fe1cee59825882b0005aed173bca GIT binary patch literal 498 zcmViF9M~RCwC9|j)q=kz!ttc@!6~s2=QdV&Fa{(I)0QgoJPx4%?AOHXX z6iGxuR7i>KR6%aTAP@w*zO%&K4He2Yt^5EJ)O$d3e~=GU>i>fcCXT7$&|@+Ow7WB~ zg9MAv3r`0emmO5~P!H8AkIPcf4(E)ZnFL=M2SE^A;7cIPvfs4;emJ|p=cMsvc0WT2 z%T?x96t2I9l6yXzB&!`G05hw6dji5z@<-?0_9hAya4HGjN&+{06FbEqRjX}@I zYB&Uw%!tm1)f6WlfW!62hsSTA=`|6R5UK!{r@S*StPi9hfAJ27nZO@AbQ}T0uE0~d oNimOr%s(!-=%*z+DNad;8zmkaLZu~RVE_OC07*qoM6N<$g0$hm7XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/rcl.rsi/rcle-inhand-left.png b/Resources/Textures/Objects/Tools/rcl.rsi/rcle-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..20ed426622dbbf3d28eb10c7edf39b693a053b3b GIT binary patch literal 427 zcmV;c0aX5pP)V=-0C=2J zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5 zsVF%|*FcGjGbOXA7^I1dGp#5wHxYCm3jinS8LZ1K(I)@^0MtoDK~zYI z?Nq@L!ypVZumFYy0(5}bbb@C8ok~I=DWvJUZS>%5BzzKg0C3^&AnNi4vM$H{XMw^5 zd*VRZ7^5vN#JCbv&Vw}Qj7dfAwaVMuOyN8`caqBBG?CF;znIj!6ES(DUEfXs5rTsk z3~iFLd%SSrJAoSOLlG#j6L`n*GGJUUWi}(DxTe1 V56?H(0=@tM002ovPDHLkV1iZ6tET_} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/rcl.rsi/rcle-inhand-right.png b/Resources/Textures/Objects/Tools/rcl.rsi/rcle-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..20ed426622dbbf3d28eb10c7edf39b693a053b3b GIT binary patch literal 427 zcmV;c0aX5pP)V=-0C=2J zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5 zsVF%|*FcGjGbOXA7^I1dGp#5wHxYCm3jinS8LZ1K(I)@^0MtoDK~zYI z?Nq@L!ypVZumFYy0(5}bbb@C8ok~I=DWvJUZS>%5BzzKg0C3^&AnNi4vM$H{XMw^5 zd*VRZ7^5vN#JCbv&Vw}Qj7dfAwaVMuOyN8`caqBBG?CF;znIj!6ES(DUEfXs5rTsk z3~iFLd%SSrJAoSOLlG#j6L`n*GGJUUWi}(DxTe1 V56?H(0=@tM002ovPDHLkV1iZ6tET_} literal 0 HcmV?d00001