From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:41:14 +0000 (+1000) Subject: Add fill levels to bowls (#25639) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e2741498b88a3e3b5d6312197525addb918bc53a;p=space-station-14.git Add fill levels to bowls (#25639) * fills * contrast --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 52f6d42dc8..4595329635 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -14,7 +14,11 @@ 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: @@ -23,6 +27,10 @@ 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 index 0000000000..4313fc7435 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 index 0000000000..56b113f32a 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 index 0000000000..a698a13310 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 index 0000000000..a5ab9bdef4 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 index 0000000000..37ae8349cd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json index 509fedb6fe..8e2c4444fc 100644 --- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json @@ -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 @@ -70,6 +70,21 @@ { "name": "eyeball" }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, { "name": "fruit" },