Add "fill level" sprites to mops and damp rag (#28590)

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

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": "wielded-inhand-right",
-      "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-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
     }
   ]
 }

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": "wielded-inhand-right",
-      "directions": 4
+    {
+        "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": "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
     }
   ]
 }

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"
-    }
-  ]
-}
+    "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"
+        }
+    ]
+}