Adds the clown recorder (Clown fix) (#15074)

diff --git a/Resources/Audio/Items/Toys/licensing.txt b/Resources/Audio/Items/Toys/licensing.txt
index 90466866c98607c734821cf794830a0ae33ab44f..8b68bfa553e5df4493462fd95f3e0e818b7b16cd 100644 (file)
--- a/Resources/Audio/Items/Toys/licensing.txt
+++ b/Resources/Audio/Items/Toys/licensing.txt
@@ -1,2 +1,4 @@
 "weh" and "muffled_weh" are licensed under CC0.
-"skub" is licensed under CC0.
\ No newline at end of file
+"skub" is licensed under CC0.
+"sitcom_laugh" taken from Kinoton at https://freesound.org/people/Kinoton/sounds/371562/ under CC0 1.0, clipped by github Henri215, turned into mono by github lapatison
+"sitcom_laugh2" taken from mrrap4food at https://freesound.org/people/mrrap4food/sounds/618972/ under CC0 1.0, clipped by Henri215

diff --git a/Resources/Audio/Items/Toys/sitcom_laugh.ogg b/Resources/Audio/Items/Toys/sitcom_laugh.ogg
new file mode 100644 (file)
index 0000000..381e39d
Binary files /dev/null and b/Resources/Audio/Items/Toys/sitcom_laugh.ogg differ

diff --git a/Resources/Audio/Items/Toys/sitcom_laugh2.ogg b/Resources/Audio/Items/Toys/sitcom_laugh2.ogg
new file mode 100644 (file)
index 0000000..af35ec4
Binary files /dev/null and b/Resources/Audio/Items/Toys/sitcom_laugh2.ogg differ

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 7a3882c484782027d726feef7eaae656c9026693..848993121cde7164834bb35aa179430578dbf580 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -845,3 +845,21 @@
           base: Sixteen
   - type: StaticPrice
     price: 3
+
+- type: entity
+  parent: BaseItem
+  id: ClownRecorder
+  name: clown recorder
+  description: When you just can't get those laughs coming the natural way!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/clownrecorder.rsi
+    state: icon
+  - type: EmitSoundOnUse
+    sound:
+      collection: ClownRecorder
+  - type: EmitSoundOnActivate
+    sound:
+      collection: ClownRecorder
+  - type: UseDelay
+    delay: 30.0

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index c388a9eb77af70c4da9d207e6e3661b2cdb0f9a0..719d127e85ad5f95df3f0dead8fb06ffbd60afd6 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -30,6 +30,7 @@
     shoes: ClothingShoesClown
     mask: ClothingMaskClown
     pocket1: BikeHorn
+    pocket2: ClownRecorder
     id: ClownPDA
     ears: ClothingHeadsetService
   satchel: ClothingBackpackSatchelFilled

diff --git a/Resources/Prototypes/SoundCollections/clownrecorder.yml b/Resources/Prototypes/SoundCollections/clownrecorder.yml
new file mode 100644 (file)
index 0000000..d7b1285
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/clownrecorder.yml
@@ -0,0 +1,6 @@
+- type: soundCollection
+  id: ClownRecorder
+  files:
+  - /Audio/Items/Toys/sitcom_laugh.ogg
+  - /Audio/Items/Toys/sitcom_laugh2.ogg
+  
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/icon.png b/Resources/Textures/Objects/Fun/clownrecorder.rsi/icon.png
new file mode 100644 (file)
index 0000000..fa8a90c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/clownrecorder.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json b/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json
new file mode 100644 (file)
index 0000000..84dd1f0
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/clownrecorder.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/pull/19710/commits/6fb423d9045d43f04e47770bbf505770f2d7b75a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}