From: Tayrtahn Date: Tue, 4 Jun 2024 18:48:24 +0000 (-0400) Subject: Add "fill level" sprites to mops and damp rag (#28590) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a4881f56b021d6512955b2add88135ef446953d6;p=space-station-14.git Add "fill level" sprites to mops and damp rag (#28590) --- diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 868d012a87..cb5f875204 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -6,7 +6,17 @@ components: - type: Sprite sprite: Objects/Specific/Janitorial/mop.rsi - state: mop + layers: + - state: mop + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-3 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 3 + fillBaseName: fill- + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 2 - type: MeleeWeapon damage: types: @@ -49,7 +59,17 @@ components: - type: Sprite sprite: Objects/Specific/Janitorial/advmop.rsi - state: advmop + layers: + - state: advmop + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-2 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 2 + fillBaseName: fill- + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 2 - type: MeleeWeapon damage: types: @@ -244,7 +264,15 @@ components: - type: Sprite sprite: Objects/Specific/Janitorial/rag.rsi - state: rag + layers: + - state: rag + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-3 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 3 + fillBaseName: fill- - type: Spillable solution: absorbed - type: MeleeWeapon diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png new file mode 100644 index 0000000000..d7e1ad3ef2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png new file mode 100644 index 0000000000..b244e229a6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..3ab8564904 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..649c071254 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..8436423da2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..b5136f499b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json index 31192c23bf..b176776adb 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json @@ -1,30 +1,68 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo. Fill levels by Tayrtahn on GitHub.", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "advmop" + "name": "advmop" }, { - "name": "inhand-left", - "directions": 4 + "name": "fill-1" }, { - "name": "inhand-right", - "directions": 4 + "name": "fill-2" }, - { - "name": "wielded-inhand-left", - "directions": 4 + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 }, - { - "name": "wielded-inhand-right", - "directions": 4 + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-2", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..57c1acc26e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png new file mode 100644 index 0000000000..4f0245bb85 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000..07d042cc75 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png new file mode 100644 index 0000000000..b165da985c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png new file mode 100644 index 0000000000..71169a1df2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png new file mode 100644 index 0000000000..f8b37b577c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png new file mode 100644 index 0000000000..e367772c5c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..3007efa01e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..e8ee5a3f58 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..17495e7182 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..58c3bd2c42 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json index 5ef52189ca..34768c16f7 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json @@ -1,30 +1,71 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll, fill levels by Tayrtahn on GitHub.", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "mop" + "name": "mop" }, { - "name": "inhand-left", - "directions": 4 + "name": "fill-1" }, { - "name": "inhand-right", - "directions": 4 + "name": "fill-2" }, - { - "name": "wielded-inhand-left", - "directions": 4 + { + "name": "fill-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 }, - { - "name": "wielded-inhand-right", - "directions": 4 + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-2", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..997f3ae039 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png new file mode 100644 index 0000000000..288492b96a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000..956f9bbbd1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png new file mode 100644 index 0000000000..5f8cd98644 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png new file mode 100644 index 0000000000..6fb322fbdf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png new file mode 100644 index 0000000000..7114d9a2e7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png new file mode 100644 index 0000000000..0705b79b50 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json index b750bcc3d1..7051793e03 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json @@ -1,14 +1,23 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "rag" - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9. Fill levels by Tayrtahn on GitHub", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rag" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +}