From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Date: Fri, 31 Mar 2023 04:32:57 +0000 (+0100)
Subject: Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. (#14973)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ad31749b558d907e367d7a2c1e00d490ea5ba869;p=space-station-14.git

Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. (#14973)

* deskbell, poster rise fix, happyhonk mime inhand fix.

* cancollide: false
---

diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 08ba18afb0..277dcc01f7 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -29,6 +29,6 @@
   source: "https://github.com/tgstation/tgstation/blob/529d97cb1c105bcd548e95a9c9070bbf5253dd81/sound/items/AirHorn.ogg"
 
 - files: ["desk_bell_ring.ogg"]
-  license: "CC0-1.0"
-  copyright: "Created by NicholasJudy567, converted to OGG and mono"
-  source: "https://freesound.org/people/NicholasJudy567/sounds/672185/"
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by SamKolber, shortened and converted to OGG and mono"
+  source: "https://freesound.org/people/SamKolber/sounds/210022/"
diff --git a/Resources/Audio/Items/desk_bell_ring.ogg b/Resources/Audio/Items/desk_bell_ring.ogg
index 098aa9cccb..5222801dc1 100644
Binary files a/Resources/Audio/Items/desk_bell_ring.ogg and b/Resources/Audio/Items/desk_bell_ring.ogg differ
diff --git a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
index cd9d37f115..d4c8a8ca4d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
@@ -8,34 +8,45 @@
     sprite: Objects/Misc/desk_bell.rsi
     state: "normal"
     netsync: false
+  - type: InteractionPopup
+    successChance: 1
+    interactSuccessSound:
+      collection: DeskBell
+    params:
+      variation: 0.03
+      volume: 3
   - type: EmitSoundOnUse
     sound:
-      path: /Audio/Items/desk_bell_ring.ogg
+      collection: DeskBell
       params:
-          variation: 0.05
-          maxdistance: 60
-          volume: 2
-  - type: EmitSoundOnActivate
+          variation: 0.03
+          volume: 3
+  - type: EmitSoundOnTrigger
     sound:
-      path: /Audio/Items/desk_bell_ring.ogg
+      collection: DeskBell
       params:
-          variation: 0.05
-          maxdistance: 60
-          volume: 2
+          variation: 0.03
+          volume: 3
   - type: EmitSoundOnLand
     sound:
-      path: /Audio/Items/desk_bell_ring.ogg
+      collection: DeskBell
       params:
-          variation: 0.05
-          maxdistance: 60
-          volume: 2
+          variation: 0.03
+          volume: 3
   - type: ItemCooldown
   - type: UseDelay
     delay: 0.5
   - type: MeleeWeapon
     soundHit:
-      path: /Audio/Items/desk_bell_ring.ogg
+      collection: DeskBell
+      params:
+          variation: 0.03
+          volume: 3
     damage:
       types:
-        Blunt: 0.1
+        Blunt: 4
   - type: Anchorable
+  - type: Transform
+    anchored: true
+  - type: Physics
+    canCollide: false
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index ef9299e8d3..5f3184eab1 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -523,7 +523,7 @@
   parent: PosterBase
   id: PosterContrabandRise
   name: "Rise Up"
-  description: "A poster depicting a grey shirted man holding a crowbar with the words Rise written above it."
+  description: "A poster depicting a grey shirted man holding a crowbar with the word Rise written below it."
   components:
   - type: Sprite
     state: poster55_contraband
diff --git a/Resources/Prototypes/SoundCollections/bike_horn.yml b/Resources/Prototypes/SoundCollections/bike_horn.yml
index 7fab2d63e9..e7e33ca725 100644
--- a/Resources/Prototypes/SoundCollections/bike_horn.yml
+++ b/Resources/Prototypes/SoundCollections/bike_horn.yml
@@ -8,3 +8,8 @@
   files:
   - /Audio/Items/brokenbikehorn.ogg
 
+- type: soundCollection
+  id: DeskBell
+  files:
+  - /Audio/Items/desk_bell_ring.ogg
+
diff --git a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-left.png b/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-left.png
index 2d67cfa091..b4d2d6801c 100644
Binary files a/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-left.png and b/Resources/Textures/Objects/Storage/happyhonk/mime.rsi/box-inhand-left.png differ