Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(synthesized_instruments): updated UI for old instruments #12880

Merged
merged 2 commits into from
Oct 10, 2024
Merged

fix(synthesized_instruments): updated UI for old instruments #12880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4641ea2
fix(synthesized_instruments): updated UI for old instruments
HuKuTaPan4 Oct 7, 2024
a0df1e3
Merge branch 'ChaoticOnyx:dev' into dev
HuKuTaPan4 Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions baystation12.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2985,16 +2985,22 @@
#include "code\modules\synthesized_instruments\sound_player.dm"
#include "code\modules\synthesized_instruments\sound_token.dm"
#include "code\modules\synthesized_instruments\usage_info.dm"
#include "code\modules\synthesized_instruments\instrument_data\accordion.dm"
#include "code\modules\synthesized_instruments\instrument_data\brass.dm"
#include "code\modules\synthesized_instruments\instrument_data\chromatic_percussion.dm"
#include "code\modules\synthesized_instruments\instrument_data\fun.dm"
#include "code\modules\synthesized_instruments\instrument_data\guitar.dm"
#include "code\modules\synthesized_instruments\instrument_data\harmonica.dm"
#include "code\modules\synthesized_instruments\instrument_data\impossible_instruments.dm"
#include "code\modules\synthesized_instruments\instrument_data\obsolete.dm"
#include "code\modules\synthesized_instruments\instrument_data\organ.dm"
#include "code\modules\synthesized_instruments\instrument_data\piano.dm"
#include "code\modules\synthesized_instruments\real_instruments\Accordion\accordion.dm"
#include "code\modules\synthesized_instruments\real_instruments\Guitar\guitar.dm"
#include "code\modules\synthesized_instruments\real_instruments\Harmonica\harmonica.dm"
#include "code\modules\synthesized_instruments\real_instruments\Piano\piano.dm"
#include "code\modules\synthesized_instruments\real_instruments\Recorder\recorder.dm"
#include "code\modules\synthesized_instruments\real_instruments\Saxophone\saxophone.dm"
#include "code\modules\synthesized_instruments\real_instruments\Synthesizer\synthesizer.dm"
#include "code\modules\synthesized_instruments\real_instruments\Trumpet\trumpet.dm"
#include "code\modules\synthesized_instruments\real_instruments\Violin\violin.dm"
Expand Down
21 changes: 21 additions & 0 deletions code/modules/synthesized_instruments/instrument_data/accordion.dm
View file
Open in desktop
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 code/modules/synthesized_instruments/instrument_data/harmonica.dm
View file
Open in desktop
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')
28 changes: 1 addition & 27 deletions code/modules/synthesized_instruments/instrument_data/organ.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,4 @@
samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c2.ogg',
"48"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c3.ogg',
"60"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c4.ogg',
"72"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c5.ogg')


/datum/instrument/organ/crisis_accordian
name = "Crisis Accordian"
id = "crack"
samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c2.ogg',
"48"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c3.ogg',
"60"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c4.ogg',
"72"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c5.ogg')


/datum/instrument/organ/crisis_harmonica
name = "Crisis Harmonica"
id = "crharmony"
samples = list("48"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c3.ogg',
"60"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c4.ogg',
"72"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c5.ogg')


/datum/instrument/organ/crisis_tango_accordian
name = "Crisis Tango Accordian"
id = "crtango"
samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c2.ogg',
"48"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c3.ogg',
"60"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c4.ogg',
"72"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c5.ogg')
"72"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c5.ogg')
15 changes: 15 additions & 0 deletions code/modules/synthesized_instruments/real_instruments/Accordion/accordion.dm
View file
Open in desktop
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 code/modules/synthesized_instruments/real_instruments/Harmonica/harmonica.dm
View file
Open in desktop
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 code/modules/synthesized_instruments/real_instruments/Recorder/recorder.dm
View file
Open in desktop
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 code/modules/synthesized_instruments/real_instruments/Saxophone/saxophone.dm
View file
Open in desktop
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))
0 ...nts/samples/organ/crisis_accordian/c2.ogg → ...samples/accordion/crisis_accordian/c2.ogg
View file
Open in desktop
File renamed without changes.
0 ...nts/samples/organ/crisis_accordian/c3.ogg → ...samples/accordion/crisis_accordian/c3.ogg
View file
Open in desktop
File renamed without changes.
0 ...nts/samples/organ/crisis_accordian/c4.ogg → ...samples/accordion/crisis_accordian/c4.ogg
View file
Open in desktop
File renamed without changes.
0 ...nts/samples/organ/crisis_accordian/c5.ogg → ...samples/accordion/crisis_accordian/c5.ogg
View file
Open in desktop
File renamed without changes.
0 ...samples/organ/crisis_tangaccordian/c2.ogg → ...les/accordion/crisis_tangaccordian/c2.ogg
View file
Open in desktop
File renamed without changes.
0 ...samples/organ/crisis_tangaccordian/c3.ogg → ...les/accordion/crisis_tangaccordian/c3.ogg
View file
Open in desktop
File renamed without changes.
0 ...samples/organ/crisis_tangaccordian/c4.ogg → ...les/accordion/crisis_tangaccordian/c4.ogg
View file
Open in desktop
File renamed without changes.
0 ...samples/organ/crisis_tangaccordian/c5.ogg → ...les/accordion/crisis_tangaccordian/c5.ogg
View file
Open in desktop
File renamed without changes.
0 ...nts/samples/organ/crisis_harmonica/c3.ogg → ...samples/harmonica/crisis_harmonica/c3.ogg
View file
Open in desktop
File renamed without changes.
0 ...nts/samples/organ/crisis_harmonica/c4.ogg → ...samples/harmonica/crisis_harmonica/c4.ogg
View file
Open in desktop
File renamed without changes.
0 ...nts/samples/organ/crisis_harmonica/c5.ogg → ...samples/harmonica/crisis_harmonica/c5.ogg
View file
Open in desktop
File renamed without changes.
Loading