From 372807673b15a296170599f62c0576de0b7daa23 Mon Sep 17 00:00:00 2001 From: Rio <110139251+Riolume@users.noreply.github.com> Date: Thu, 9 May 2024 00:56:13 -0500 Subject: [PATCH] Drinking from spray bottles (#27815) Added drinking from spray bottles --- Resources/Audio/Effects/spray3.ogg | Bin 0 -> 12266 bytes .../Objects/Specific/Janitorial/spray.yml | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 Resources/Audio/Effects/spray3.ogg diff --git a/Resources/Audio/Effects/spray3.ogg b/Resources/Audio/Effects/spray3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a9f493198c78e125bdc69bb0b6432a00cea36037 GIT binary patch literal 12266 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 LYWYO5ALai5WeH8u literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index 64b3568adf..cddf7f6075 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -5,6 +5,12 @@ suffix: Empty description: A spray bottle with an unscrewable top. components: + - type: Drink + solution: spray + ignoreEmpty: true + useSound: + path: /Audio/Effects/spray3.ogg + transferAmount: 10 - type: Tag tags: - Spray -- 2.52.0