diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml new file mode 100644 index 0000000000..1e6111f77e --- /dev/null +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -0,0 +1,47 @@ +- type: cargoProduct + name: "LV cables crate" + id: cargo.engineeringcablelv + description: "3 coils of LV cables." + icon: + sprite: Objects/Tools/cable-coils.rsi + state: coillv-30 + product: CrateEngineeringCableLV + cost: 1000 + category: Engineering + group: market + +- type: cargoProduct + name: "MV cables crate" + id: cargo.engineeringcablemv + description: "3 coils of MV cables." + icon: + sprite: Objects/Tools/cable-coils.rsi + state: coilmv-30 + product: CrateEngineeringCableMV + cost: 1500 + category: Engineering + group: market + +- type: cargoProduct + name: "HV cables crate" + id: cargo.engineeringcablehv + description: "3 coils of HV cables." + icon: + sprite: Objects/Tools/cable-coils.rsi + state: coilhv-30 + product: CrateEngineeringCableHV + cost: 2000 + category: Engineering + group: market + +- type: cargoProduct + name: "bulk cables crate" + id: cargo.engineeringcablebulk + description: "2 coils each for every cable type." + icon: + sprite: Objects/Tools/cable-coils.rsi + state: coilall-30 + product: CrateEngineeringCableBulk + cost: 3000 + category: Engineering + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml index f721c41c82..8b97dde8ad 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml @@ -43,3 +43,47 @@ # amount: 3 # - name: PowerCellSmallAutorecharge # amount: 3 + +- type: entity + id: CrateEngineeringCableLV + name: LV cable crate + parent: CrateElectrical + components: + - type: StorageFill + contents: + - name: ApcExtensionCableStack + amount: 3 + +- type: entity + id: CrateEngineeringCableMV + name: MV cable crate + parent: CrateElectrical + components: + - type: StorageFill + contents: + - name: MVWireStack + amount: 3 + +- type: entity + id: CrateEngineeringCableHV + name: HV cable crate + parent: CrateElectrical + components: + - type: StorageFill + contents: + - name: HVWireStack + amount: 3 + +- type: entity + id: CrateEngineeringCableBulk + name: bulk cable crate + parent: CrateElectrical + components: + - type: StorageFill + contents: + - name: HVWireStack + amount: 2 + - name: MVWireStack + amount: 2 + - name: ApcExtensionCableStack + amount: 2 diff --git a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml index d3eb293116..29ee9a7827 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml @@ -31,6 +31,10 @@ - cargo.hydroponicsseedsexotic - cargo.servicejanitorial - cargo.servicelightsreplacement + - cargo.engineeringcablelv + - cargo.engineeringcablemv + - cargo.engineeringcablehv + - cargo.engineeringcablebulk - cargo.engineameshielding - cargo.engineamejar - cargo.engineamecontrol diff --git a/Resources/Prototypes/Entities/Constructible/Power/wires.yml b/Resources/Prototypes/Entities/Constructible/Power/wires.yml index 85f4647af5..c348c4692a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml @@ -36,10 +36,10 @@ decription: "An orange high voltage power cable." components: - type: Sprite - sprite: Constructible/Power/hv_cable.rsi + sprite: Constructible/Power/Wires/hv_cable.rsi state: hvcable_0 - type: Icon - sprite: Constructible/Power/hv_cable.rsi + sprite: Constructible/Power/Wires/hv_cable.rsi state: hvcable_4 - type: IconSmooth base: hvcable_ @@ -75,11 +75,11 @@ components: - type: Sprite color: Yellow - sprite: Constructible/Power/mv_cable.rsi + sprite: Constructible/Power/Wires/mv_cable.rsi state: mvcable_0 - type: Icon color: Yellow - sprite: Constructible/Power/mv_cable.rsi + sprite: Constructible/Power/Wires/mv_cable.rsi state: mvcable_4 - type: IconSmooth base: mvcable_ @@ -115,11 +115,11 @@ components: - type: Sprite color: Green - sprite: Constructible/Power/lv_cable.rsi + sprite: Constructible/Power/Wires/lv_cable.rsi state: lvcable_0 - type: Icon color: Green - sprite: Constructible/Power/lv_cable.rsi + sprite: Constructible/Power/Wires/lv_cable.rsi state: lvcable_4 - type: IconSmooth base: lvcable_ @@ -172,7 +172,7 @@ name: HV Connector Wire components: - type: Sprite - sprite: Constructible/Power/hv_cable.rsi + sprite: Constructible/Power/Wires/hv_cable.rsi state: hvcable_0 - type: IconSmooth base: hvcable_ @@ -185,7 +185,7 @@ name: MV Connector Wire components: - type: Sprite - sprite: Constructible/Power/mv_cable.rsi + sprite: Constructible/Power/Wires/mv_cable.rsi state: mvcable_0 color: Yellow - type: IconSmooth @@ -199,7 +199,7 @@ name: LV Connector Wire components: - type: Sprite - sprite: Constructible/Power/lv_cable.rsi + sprite: Constructible/Power/Wires/lv_cable.rsi state: lvcable_0 color: Green - type: IconSmooth diff --git a/Resources/Prototypes/Entities/Objects/Power/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml similarity index 94% rename from Resources/Prototypes/Entities/Objects/Power/cable_coils.yml rename to Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index e1c9a25f01..b439ea6730 100644 --- a/Resources/Prototypes/Entities/Objects/Power/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -1,6 +1,6 @@ # 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 +# ability to have applied colors yet in GUIs. And also inhands... -Swept - type: entity id: CableStack @@ -12,10 +12,10 @@ - type: Stack stackType: Cable - type: Sprite - sprite: Objects/Tools/cables.rsi + sprite: Objects/Tools/cable-coils.rsi netsync: false - type: Item - sprite: Objects/Tools/cables.rsi + sprite: Objects/Tools/cable-coils.rsi - type: WirePlacer - type: Clickable diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_0.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_0.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_0.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_1.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_1.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_1.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_10.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_10.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_10.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_11.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_11.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_11.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_12.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_12.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_12.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_13.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_13.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_13.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_14.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_14.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_14.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_15.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_15.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_15.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_2.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_2.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_2.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_3.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_3.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_3.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_4.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_4.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_4.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_5.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_5.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_5.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_6.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_6.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_6.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_7.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_7.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_7.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_8.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_8.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_8.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_9.png b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/hvcable_9.png rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_9.png diff --git a/Resources/Textures/Constructible/Power/hv_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/hv_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_0.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_0.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_0.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_1.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_1.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_1.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_10.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_10.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_10.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_11.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_11.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_11.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_12.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_12.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_12.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_13.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_13.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_13.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_14.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_14.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_14.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_15.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_15.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_15.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_2.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_2.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_2.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_3.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_3.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_3.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_4.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_4.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_4.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_5.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_5.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_5.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_6.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_6.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_6.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_7.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_7.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_7.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_8.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_8.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_8.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_9.png b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/lvcable_9.png rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_9.png diff --git a/Resources/Textures/Constructible/Power/lv_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/lv_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/meta.json rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_0.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_0.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_0.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_1.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_1.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_1.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_10.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_10.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_10.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_11.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_11.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_11.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_12.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_12.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_12.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_13.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_13.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_13.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_14.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_14.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_14.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_15.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_15.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_15.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_2.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_2.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_2.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_3.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_3.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_3.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_4.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_4.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_4.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_5.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_5.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_5.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_6.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_6.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_6.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_7.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_7.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_7.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_8.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_8.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_8.png diff --git a/Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_9.png b/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/mv_cable.rsi/mvcable_9.png rename to Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_9.png diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_0.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_0.png deleted file mode 100644 index 580528df53..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_0.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_1.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_1.png deleted file mode 100644 index fdebed5fa9..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_1.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_10.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_10.png deleted file mode 100644 index 17c40b2276..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_10.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_11.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_11.png deleted file mode 100644 index 76b20ffa8d..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_11.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_12.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_12.png deleted file mode 100644 index 8364d69509..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_12.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_13.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_13.png deleted file mode 100644 index 6f03458fd3..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_13.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_14.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_14.png deleted file mode 100644 index 6cdb9d20bc..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_14.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_15.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_15.png deleted file mode 100644 index d45a733324..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_15.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_2.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_2.png deleted file mode 100644 index ce3ffea8a4..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_2.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_3.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_3.png deleted file mode 100644 index 2edb689b55..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_3.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_4.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_4.png deleted file mode 100644 index fb782f3cad..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_4.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_5.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_5.png deleted file mode 100644 index 6e0ffe9db5..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_5.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_6.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_6.png deleted file mode 100644 index 2d855fe035..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_6.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_7.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_7.png deleted file mode 100644 index e382deeda1..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_7.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_8.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_8.png deleted file mode 100644 index 408fdf51ea..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_8.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_9.png b/Resources/Textures/Constructible/Power/power_cable.rsi/cable_9.png deleted file mode 100644 index 2b988d3ffe..0000000000 Binary files a/Resources/Textures/Constructible/Power/power_cable.rsi/cable_9.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/power_cable.rsi/meta.json b/Resources/Textures/Constructible/Power/power_cable.rsi/meta.json deleted file mode 100644 index 53e6d6a156..0000000000 --- a/Resources/Textures/Constructible/Power/power_cable.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fcf375d7d9ce6ceed5c7face899725e5655ab640", - "states": [ - { - "name": "cable_0" - }, - { - "name": "cable_1" - }, - { - "name": "cable_2" - }, - { - "name": "cable_3" - }, - { - "name": "cable_4" - }, - { - "name": "cable_5" - }, - { - "name": "cable_6" - }, - { - "name": "cable_7" - }, - { - "name": "cable_8" - }, - { - "name": "cable_9" - }, - { - "name": "cable_10" - }, - { - "name": "cable_11" - }, - { - "name": "cable_12" - }, - { - "name": "cable_13" - }, - { - "name": "cable_14" - }, - { - "name": "cable_15" - }, - ] -} diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coil-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coil-10.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coil-10.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coil-10.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coil-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coil-20.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coil-20.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coil-20.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coil-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coil-30.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coil-30.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coil-30.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilall-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilall-30.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilall-30.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilall-30.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilhv-10.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-10.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilhv-20.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-20.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilhv-30.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-inhand-left.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilhv-inhand-left.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-inhand-left.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilhv-inhand-right.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilhv-inhand-right.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilhv-inhand-right.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-10.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coillv-10.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-10.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-20.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coillv-20.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-20.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-30.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coillv-30.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-30.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-inhand-left.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coillv-inhand-left.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-inhand-left.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coillv-inhand-right.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coillv-inhand-right.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coillv-inhand-right.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilmv-10.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-10.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilmv-20.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-20.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilmv-30.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-inhand-left.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilmv-inhand-left.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-left.png diff --git a/Resources/Textures/Objects/Tools/cables.rsi/coilmv-inhand-right.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Tools/cables.rsi/coilmv-inhand-right.png rename to Resources/Textures/Objects/Tools/cable-coils.rsi/coilmv-inhand-right.png diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json new file mode 100644 index 0000000000..9bda8c2580 --- /dev/null +++ b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "license": "CC BY-SA 3.0", + "copyright": "Taken from tgstation and modified by SweptWasTaken at commit https://github.com/tgstation/tgstation/commit/77608a9f46b06a46f0f6b1be061755f68cc255a3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "coilhv-inhand-left", + "directions": 4 + }, + { + "name": "coilhv-inhand-right", + "directions": 4 + }, + { + "name": "coilmv-inhand-left", + "directions": 4 + }, + { + "name": "coilmv-inhand-right", + "directions": 4 + }, + { + "name": "coillv-inhand-left", + "directions": 4 + }, + { + "name": "coillv-inhand-right", + "directions": 4 + }, + { + "name": "coil-30" + }, + { + "name": "coil-20" + }, + { + "name": "coil-10" + }, + { + "name": "coilhv-30" + }, + { + "name": "coilhv-20" + }, + { + "name": "coilhv-10" + }, + { + "name": "coilmv-30" + }, + { + "name": "coilmv-20" + }, + { + "name": "coilmv-10" + }, + { + "name": "coillv-30" + }, + { + "name": "coillv-20" + }, + { + "name": "coillv-10" + }, + { + "name": "coilall-30" + } + ] +} diff --git a/Resources/Textures/Objects/Tools/cables.rsi/meta.json b/Resources/Textures/Objects/Tools/cables.rsi/meta.json deleted file mode 100644 index a8ec21f293..0000000000 --- a/Resources/Textures/Objects/Tools/cables.rsi/meta.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "version": 1, - "license": "CC BY-SA 3.0", - "copyright": "Taken from tgstation and modified by SweptWasTaken at commit https://github.com/tgstation/tgstation/commit/77608a9f46b06a46f0f6b1be061755f68cc255a3", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "coilhv-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "coilhv-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "coilmv-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "coilmv-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "coillv-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "coillv-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "coil-30", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coil-20", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coil-10", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilhv-30", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilhv-20", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilhv-10", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilmv-30", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilmv-20", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilmv-10", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coillv-30", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coillv-20", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coillv-10", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "coilall-30", - "delays": [ - [ - 1 - ] - ] - } - ] -}