diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 43db28946b..dfafbb49b3 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -1,168 +1,121 @@ - type: entity - parent: BackpackClothing - id: Satchel + parent: Clothing + id: SatchelBase name: satchel description: A trendy looking satchel. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel.rsi - state: satchel + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel.rsi - state: satchel + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel.rsi - ClothingPrefix: satchel - type: Storage - capacity: 300 + capacity: 100 - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelEngineering name: engineering satchel description: A tough satchel with extra pockets. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_engineering.rsi - state: satchel-engineering + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_engineering.rsi - state: satchel-engineering + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_engineering.rsi - HeldPrefix: engineering - ClothingPrefix: satchel-engineering - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelMedical name: medical satchel description: A sterile satchel used in medical departments. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_medical.rsi - state: satchel-medical + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_medical.rsi - state: satchel-medical + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_medical.rsi - HeldPrefix: medical - ClothingPrefix: satchel-medical - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelChemistry name: chemistry satchel description: A sterile satchel with chemist colours. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_chemistry.rsi - state: satchel-chemistry + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_chemistry.rsi - state: satchel-chemistry + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_chemistry.rsi - HeldPrefix: medical - ClothingPrefix: satchel-chemistry - type: entity - parent: BackpackClothing - id: SatchelGenetics - name: genetics satchel - description: A sterile satchel with geneticist colours. - components: - - type: Sprite - sprite: Clothing/Back/Satchels/satchel_genetics.rsi - state: satchel-genetics - - type: Icon - sprite: Clothing/Back/Satchels/satchel_genetics.rsi - state: satchel-genetics - - type: Clothing - sprite: Clothing/Back/Satchels/satchel_genetics.rsi - HeldPrefix: medical - ClothingPrefix: satchel-genetics - -- type: entity - parent: BackpackClothing - id: SatchelVirology - name: virology satchel - description: A sterile satchel with virologist colours. - components: - - type: Sprite - sprite: Clothing/Back/Satchels/satchel_virology.rsi - state: satchel-virology - - type: Icon - sprite: Clothing/Back/Satchels/satchel_virology.rsi - state: satchel-virology - - type: Clothing - sprite: Clothing/Back/Satchels/satchel_virology.rsi - HeldPrefix: medical - ClothingPrefix: satchel-virology - -- type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelScience name: science satchel description: Useful for holding research materials. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_science.rsi - state: satchel-science + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_science.rsi - state: satchel-science + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_science.rsi - ClothingPrefix: satchel-science - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelSecurity name: security satchel description: A robust satchel for security related needs. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_security.rsi - state: satchel-security + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_security.rsi - state: satchel-security + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_security.rsi - HeldPrefix: security - ClothingPrefix: satchel-security - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelCaptain name: captain's satchel description: An exclusive satchel for Nanotrasen officers. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_captain.rsi - state: satchel-captain + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_captain.rsi - state: satchel-captain + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_captain.rsi - HeldPrefix: captain - ClothingPrefix: satchel-captain - type: entity - parent: BackpackClothing + parent: SatchelBase id: SatchelHydroponics name: hydroponics satchel description: A satchel made of all natural fibers. components: - type: Sprite sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi - state: satchel-hydroponics + state: icon - type: Icon sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi - state: satchel-hydroponics + state: icon - type: Clothing sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi - ClothingPrefix: satchel-hydroponics diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel.rsi/satchel.png rename to Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-left.png new file mode 100644 index 0000000000..2f5f5f35cd Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-right.png new file mode 100644 index 0000000000..7952889f7d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json index 3d3e0fd83e..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "satchel-equipped-BACKPACK", - "directions": 4 - }, { - "name": "satchel", + "name": "icon", "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain.png b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/satchel-captain.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-left.png new file mode 100644 index 0000000000..32cc456a07 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-right.png new file mode 100644 index 0000000000..0df9cc21c1 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json index 5c36b9da60..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-captain-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-captain", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry.png b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/satchel-chemistry.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-left.png new file mode 100644 index 0000000000..987d684afa Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-right.png new file mode 100644 index 0000000000..772211909b Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json index d20399567e..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-chemistry-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-chemistry", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering.png b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/satchel-engineering.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-left.png new file mode 100644 index 0000000000..09db285b13 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-right.png new file mode 100644 index 0000000000..5d60aa8c33 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json index 2f47544f5a..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-engineering-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-engineering", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json deleted file mode 100644 index 541db6f2dc..0000000000 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "satchel-genetics-equipped-BACKPACK", - "directions": 4 - }, - { - "name": "satchel-genetics", - "directions": 1 - } - ] -} diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics-equipped-BACKPACK.png deleted file mode 100644 index 53a3c3c8a6..0000000000 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics-equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png b/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png deleted file mode 100644 index ceb3eedb7b..0000000000 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel_genetics.rsi/satchel-genetics.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/satchel-hydroponics.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png new file mode 100644 index 0000000000..3a99826f69 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png new file mode 100644 index 0000000000..f486b2d0b9 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json index dc674418b9..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-hydroponics-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-hydroponics", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/satchel-medical.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png new file mode 100644 index 0000000000..bb089a8d44 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-right.png new file mode 100644 index 0000000000..9b292a1d3d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json index 62340a94b0..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-medical-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-medical", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/satchel-science.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-left.png new file mode 100644 index 0000000000..b910c8a3dc Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png new file mode 100644 index 0000000000..a3d1c9fe22 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json index 8c4a68e1f8..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json @@ -1,16 +1,26 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-science", + "name": "icon", "directions": 1 }, { - "name": "satchel-science-equipped-BACKPACK", + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security-equipped-BACKPACK.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/satchel-security.png rename to Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png new file mode 100644 index 0000000000..2311df1b11 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-right.png new file mode 100644 index 0000000000..6219205405 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json index 01776a4c20..e84a910cb3 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json @@ -1,17 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "satchel-security-equipped-BACKPACK", + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", "directions": 4 }, { - "name": "satchel-security", - "directions": 1 + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json deleted file mode 100644 index a29abae487..0000000000 --- a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "satchel-virology", - "directions": 1 - }, - { - "name": "satchel-virology-equipped-BACKPACK", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png deleted file mode 100644 index 49725f781d..0000000000 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology-equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png b/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png deleted file mode 100644 index 809f1b86e0..0000000000 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel_virology.rsi/satchel-virology.png and /dev/null differ