From: Firewatch <54725557+musicmanvr@users.noreply.github.com> Date: Sat, 17 Feb 2024 23:55:58 +0000 (-0500) Subject: Newton Cradle Fix + Addition to Bureaucracy Crate (#25357) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=110437cc7f9b912093ec53560df6026c7873de51;p=space-station-14.git Newton Cradle Fix + Addition to Bureaucracy Crate (#25357) fixes makes the newton cradle not able to decimate ears while also adding it to the bureaucracy crate and lowering its volume and range a little bit --- diff --git a/Resources/Audio/Items/newton_cradle.ogg b/Resources/Audio/Items/newton_cradle.ogg index 6dfe528feb..875841ee84 100644 Binary files a/Resources/Audio/Items/newton_cradle.ogg and b/Resources/Audio/Items/newton_cradle.ogg differ diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 707a3929db..8f8c1a114f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -108,7 +108,7 @@ id: CrateServiceBureaucracy parent: CrateGenericSteel name: bureaucracy crate - description: Several stacks of paper and a few pens, what more can you ask for. + description: Several stacks of paper, a few pens and an office toy. What more could you ask for? components: - type: StorageFill contents: @@ -122,6 +122,7 @@ - id: BoxFolderBlue - id: BoxFolderRed - id: BoxFolderYellow + - id: NewtonCradle - type: entity id: CrateServicePersonnel diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 480db86441..f80079b18c 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1314,9 +1314,11 @@ True: { state: icon } False: { state: icon-off } - type: ItemToggle + - type: UseDelay + delay: 1 - type: ItemToggleActiveSound activeSound: path: /Audio/Items/newton_cradle.ogg params: - volume: -7 - maxDistance: 5 + volume: -9 + maxDistance: 3