]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add fill levels to bowls (#25639)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Thu, 29 Feb 2024 21:41:14 +0000 (07:41 +1000)
committerGitHub <noreply@github.com>
Thu, 29 Feb 2024 21:41:14 +0000 (16:41 -0500)
* fills

* contrast

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json

index 52f6d42dc88a6aca183bae64c367e4d5ce043435..45953296351272334d17a83b98fcdc759c6ef0ec 100644 (file)
         maxVol: 50 # enough to make cheese in.
   - type: Sprite
     sprite: Objects/Consumable/Food/bowl.rsi
-    state: bowl
+    layers:
+    - state: bowl
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
   - type: DamageOnLand
     damage:
       types:
     damage:
       types:
         Blunt: 5
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: fill-
   - type: SolutionTransfer
     canChangeTransferAmount: true
   - type: UserInterface
@@ -76,4 +84,9 @@
   description: A fancy bowl, used for SPECIAL soups and salads.
   components:
   - type: Sprite
-    state: bowl2
+    sprite: Objects/Consumable/Food/bowl.rsi
+    layers:
+    - state: bowl2
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..4313fc7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..56b113f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..a698a13
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..a5ab9bd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png
new file mode 100644 (file)
index 0000000..37ae834
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png differ
index 509fedb6fef0dd0df6920054935b9793e6e7cc52..8e2c4444fc4b48f59744ae3e0cf14fea3b36cdb0 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "eyeball"
     },
+    {
+      "name": "fill-1"
+    },
+    {
+      "name": "fill-2"
+    },
+    {
+      "name": "fill-3"
+    },
+    {
+      "name": "fill-4"
+    },
+    {
+      "name": "fill-5"
+    },
     {
       "name": "fruit"
     },