diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 96a55abebce..114d6043e09 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -428,6 +428,21 @@ description = "A commemorative miniature of the NSS Aurora." path = /obj/item/toy/aurora +/datum/gear/instruments + display_name = "instrument selection" + description = "A selection of instruments for the musically inclined." + path = /obj/item/device/synthesized_instrument + allowed_roles = list("Off-Duty Crew Member", "Passenger") + +/datum/gear/instruments/New() + ..() + var/list/instruments = list() + instruments["guitar"] = /obj/item/device/synthesized_instrument/guitar + instruments["polyguitar"] = /obj/item/device/synthesized_instrument/guitar/multi + instruments["violin"] = /obj/item/device/synthesized_instrument/violin + instruments["Omnitrumpet"] = /obj/item/device/synthesized_instrument/trumpet + gear_tweaks += new /datum/gear_tweak/path(instruments) + /datum/gear/lore_radio display_name = "analog radio" path = /obj/item/lore_radio diff --git a/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm b/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm index 01cb71cf6b5..96cf920368e 100644 --- a/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm +++ b/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm @@ -6,6 +6,8 @@ /obj/item/device/synthesized_instrument/violin name = "violin" desc = "A wooden musical instrument with four strings and a bow, it is quite old" + icon = 'icons/obj/musician.dmi' icon_state = "violin" + item_state = "violin" sound_player = /datum/sound_player/violin path = /datum/instrument/obsolete/violin diff --git a/html/changelogs/instrumentstoloadout.yml b/html/changelogs/instrumentstoloadout.yml new file mode 100644 index 00000000000..eca5cd86803 --- /dev/null +++ b/html/changelogs/instrumentstoloadout.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: 4000daniel1 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added instruments to the loadout for use by off-duties and passengers under the general tab. Also ported some in-hand sprites for them from TG." diff --git a/icons/mob/items/device/lefthand_device.dmi b/icons/mob/items/device/lefthand_device.dmi index 4c9e2421a1e..1d675217314 100644 Binary files a/icons/mob/items/device/lefthand_device.dmi and b/icons/mob/items/device/lefthand_device.dmi differ diff --git a/icons/mob/items/device/righthand_device.dmi b/icons/mob/items/device/righthand_device.dmi index 8819b1535a5..0cbd0d21374 100644 Binary files a/icons/mob/items/device/righthand_device.dmi and b/icons/mob/items/device/righthand_device.dmi differ