diff --git a/Resources/Audio/Items/license.txt b/Resources/Audio/Items/license.txt index 4032a1d4b5..0bccb3cac2 100644 --- a/Resources/Audio/Items/license.txt +++ b/Resources/Audio/Items/license.txt @@ -1 +1 @@ -pill.ogg contains audio from '437480__ruanza__swallowing.wav' by user RuanZA, used under CC BY-NC 3.0 (https://freesound.org/people/RuanZA/sounds/437480/), as well as part of '330657__diniunicorn__popping-pills.wav' by user diniunicorn, used under CC0 1.0 (https://freesound.org/people/diniunicorn/sounds/330657/). \ No newline at end of file +pill.ogg contains audio from '437480__ruanza__swallowing.wav' by user RuanZA, used under CC BY-NC 3.0 (https://freesound.org/people/RuanZA/sounds/437480/), as well as part of '330657__diniunicorn__popping-pills.wav' by user diniunicorn, used under CC0 1.0 (https://freesound.org/people/diniunicorn/sounds/330657/). ring.ogg used udner CC-BY-SA-3.0, taken from /tg/station commit https://github.com/tgstation/tgstation/commit/c61c452d78425d89920b41ed5f95fd190e733a3c. diff --git a/Resources/Audio/Items/ring.ogg b/Resources/Audio/Items/ring.ogg new file mode 100644 index 0000000000..c134a0077a Binary files /dev/null and b/Resources/Audio/Items/ring.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index 31da3c9ea0..898f1c5eb0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -254,3 +254,19 @@ - type: Sprite sprite: Structures/Furniture/instruments.rsi state: xylophone + +- type: entity + parent: BaseHandheldInstrument + id: PhoneInstrument + name: red phone + description: Should anything ever go wrong... + components: + - type: Sprite + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: red_phone + - type: EmitSoundOnLand + sound: + path: /Audio/Items/ring.ogg + - type: Instrument + program: 124 + diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json index ddafbbb98b..70b35fbffe 100644 --- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json @@ -5,11 +5,14 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, red_phone from /tg/station at commit https://github.com/tgstation/tgstation/commit/6681c3b347b8ec5c845f980c4c309c61223d9942", "states": [ { "name": "bike_horn" }, + { + "name": "red_phone" + }, { "name": "drum" }, diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png new file mode 100644 index 0000000000..e2ce5bfcf7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png differ