-
Notifications
You must be signed in to change notification settings - Fork 210
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(synthesized_instruments): updated UI for old instruments
- Loading branch information
1 parent
1b2704f
commit daee15b
Showing
19 changed files
with
99 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
code/modules/synthesized_instruments/instrument_data/accordion.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /datum/instrument/accordion | ||
| name = "Generic accordion" | ||
| category = "Accordion" | ||
|
|
||
|
|
||
| /datum/instrument/accordion/crisis_accordian | ||
| name = "Crisis Accordian" | ||
| id = "craccordian" | ||
| samples = list("36"='code/modules/synthesized_instruments/samples/accordion/crisis_accordian/c2.ogg', | ||
| "48"='code/modules/synthesized_instruments/samples/accordion/crisis_accordian/c3.ogg', | ||
| "60"='code/modules/synthesized_instruments/samples/accordion/crisis_accordian/c4.ogg', | ||
| "72"='code/modules/synthesized_instruments/samples/accordion/crisis_accordian/c5.ogg') | ||
|
|
||
|
|
||
| /datum/instrument/accordion/crisis_tango_accordian | ||
| name = "Crisis Tango Accordian" | ||
| id = "crtangaccordian" | ||
| samples = list("36"='code/modules/synthesized_instruments/samples/accordion/crisis_tangaccordian/c2.ogg', | ||
| "48"='code/modules/synthesized_instruments/samples/accordion/crisis_tangaccordian/c3.ogg', | ||
| "60"='code/modules/synthesized_instruments/samples/accordion/crisis_tangaccordian/c4.ogg', | ||
| "72"='code/modules/synthesized_instruments/samples/accordion/crisis_tangaccordian/c5.ogg') |
11 changes: 11 additions & 0 deletions
11
code/modules/synthesized_instruments/instrument_data/harmonica.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /datum/instrument/harmonica | ||
| name = "Generic harmonica" | ||
| category = "Harmonica" | ||
|
|
||
|
|
||
| /datum/instrument/harmonica/crisis_harmonica | ||
| name = "Crisis Harmonica" | ||
| id = "crharmony" | ||
| samples = list("48"='code/modules/synthesized_instruments/samples/harmonica/crisis_harmonica/c3.ogg', | ||
| "60"='code/modules/synthesized_instruments/samples/harmonica/crisis_harmonica/c4.ogg', | ||
| "72"='code/modules/synthesized_instruments/samples/harmonica/crisis_harmonica/c5.ogg') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
code/modules/synthesized_instruments/real_instruments/Accordion/accordion.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /datum/sound_player/accordion | ||
| volume = 50 | ||
| range = 10 | ||
|
|
||
| /obj/item/device/synthesized_instrument/accordion | ||
| name = "accordion" | ||
| desc = "Sretch and squeeze it to make music." | ||
| icon = 'icons/obj/musician.dmi' | ||
| icon_state = "accordion" | ||
| force = 3 | ||
| path = /datum/instrument/accordion | ||
| sound_player = /datum/sound_player/accordion | ||
|
|
||
| /obj/structure/synthesized_instrument/synthesizer/shouldStopPlaying(mob/user) | ||
| return !(src && in_range(src, user)) |
15 changes: 15 additions & 0 deletions
15
code/modules/synthesized_instruments/real_instruments/Harmonica/harmonica.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /datum/sound_player/harmonica | ||
| volume = 50 | ||
| range = 10 | ||
|
|
||
| /obj/item/device/synthesized_instrument/harmonica | ||
| name = "harmonica" | ||
| desc = "If you see this, you should be in the prison." | ||
| icon = 'icons/obj/musician.dmi' | ||
| icon_state = "harmonica" | ||
| force = 0 | ||
| path = /datum/instrument/harmonica | ||
| sound_player = /datum/sound_player/harmonica | ||
|
|
||
| /obj/structure/synthesized_instrument/synthesizer/shouldStopPlaying(mob/user) | ||
| return !(src && in_range(src, user)) |
15 changes: 15 additions & 0 deletions
15
code/modules/synthesized_instruments/real_instruments/Recorder/recorder.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /datum/sound_player/recorder | ||
| volume = 50 | ||
| range = 10 | ||
|
|
||
| /obj/item/device/synthesized_instrument/recorder | ||
| name = "recorder" | ||
| desc = "Wooden stick with holes. Blow into it to make some music." | ||
| icon = 'icons/obj/musician.dmi' | ||
| icon_state = "recorder" | ||
| force = 0 | ||
| path = /datum/instrument | ||
| sound_player = /datum/sound_player/recorder | ||
|
|
||
| /obj/structure/synthesized_instrument/synthesizer/shouldStopPlaying(mob/user) | ||
| return !(src && in_range(src, user)) |
15 changes: 15 additions & 0 deletions
15
code/modules/synthesized_instruments/real_instruments/Saxophone/saxophone.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /datum/sound_player/saxophone | ||
| volume = 50 | ||
| range = 10 | ||
|
|
||
| /obj/item/device/synthesized_instrument/saxophone | ||
| name = "saxophone" | ||
| desc = "Curved metal stick with tube and multiple holes. Blow into it to make some music." | ||
| icon = 'icons/obj/musician.dmi' | ||
| icon_state = "saxophone" | ||
| force = 3 | ||
| path = /datum/instrument/brass | ||
| sound_player = /datum/sound_player/saxophone | ||
|
|
||
| /obj/structure/synthesized_instrument/synthesizer/shouldStopPlaying(mob/user) | ||
| return !(src && in_range(src, user)) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.