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.

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

Adds instruments to the loadout and also ports some TG in-hand sprites for them. #18389

Merged
15 changes: 15 additions & 0 deletions code/modules/client/preference_setup/loadout/items/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
41 changes: 41 additions & 0 deletions html/changelogs/instrumentstoloadout.yml
Original file line number Diff line number Diff line change
@@ -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."
Binary file modified icons/mob/items/device/lefthand_device.dmi
Binary file not shown.
Binary file modified icons/mob/items/device/righthand_device.dmi
Binary file not shown.
Loading