From e2741498b88a3e3b5d6312197525addb918bc53a Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Fri, 1 Mar 2024 07:41:14 +1000 Subject: [PATCH] Add fill levels to bowls (#25639) * fills * contrast --- .../Consumable/Food/Containers/bowl.yml | 17 +++++++++++++++-- .../Consumable/Food/bowl.rsi/fill-1.png | Bin 0 -> 166 bytes .../Consumable/Food/bowl.rsi/fill-2.png | Bin 0 -> 175 bytes .../Consumable/Food/bowl.rsi/fill-3.png | Bin 0 -> 213 bytes .../Consumable/Food/bowl.rsi/fill-4.png | Bin 0 -> 221 bytes .../Consumable/Food/bowl.rsi/fill-5.png | Bin 0 -> 227 bytes .../Objects/Consumable/Food/bowl.rsi/meta.json | 17 ++++++++++++++++- 7 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png 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 0000000000000000000000000000000000000000..4313fc7435aba78c5a32b460f03180e665560d34 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(Xzl6Z7!u+B_RL0J1_d5w$IWhTC;y$&h-7wg zab*={tv`FZ7pS-4`mI+JJ6>!~3#*K2kQ8>`d{QHGM#17(8A5T-G@y GGywn{NiU-S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..56b113f32add3a7efa3e304c62ea856d481a3d63 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(=;G<(7!u+B_S`{Upi$0&G0lND?0XJL&C(F> z-PG_u_ExkuP}TkHnc?s5ZT4F=Yps~zO)=x@cT?E?o-dr9CBV=y_XLCEB5vjjXAaB* Ps$}qV^>bP0l+XkKOz$RtvY3H^ z?+^$xifVW@00o^qT^vI!{NJ84$K`q#Wt`I5UHJbr>=8TRbb=>F zRLH&m2h*}&CzvyW|FJ5&Z!~-+XtBZtpL77qL-hE0uuTVHsu?K+^@ N44$rjF6*2UngG}mN}2!w literal 0 HcmV?d00001 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" }, -- 2.51.2