diff --git a/citadel.dme b/citadel.dme index fef46d3e6b9..0cfcb769574 100644 --- a/citadel.dme +++ b/citadel.dme @@ -3195,6 +3195,7 @@ #include "code\modules\loadout\loadout_general.dm" #include "code\modules\loadout\loadout_gloves.dm" #include "code\modules\loadout\loadout_head.dm" +#include "code\modules\loadout\loadout_instruments.dm" #include "code\modules\loadout\loadout_mask.dm" #include "code\modules\loadout\loadout_role_restricted.dm" #include "code\modules\loadout\loadout_seasonal.dm" diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index e8fcbfcf7f4..1875f53cb75 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -8,6 +8,7 @@ #define LOADOUT_CATEGORY_GLASSES "Glasses and Eyewear" #define LOADOUT_CATEGORY_GLOVES "Gloves and Handwear" #define LOADOUT_CATEGORY_HATS "Hats and Headwear" +#define LOADOUT_CATEGORY_INSTRUMENTS "Instruments" #define LOADOUT_CATEGORY_MASKS "Masks and Facewear" #define LOADOUT_CATEGORY_ROLE_RESTRICTED "Role Restricted" #define LOADOUT_CATEGORY_SEASONAL "Seasonal Items" diff --git a/code/modules/loadout/loadout_entry.dm b/code/modules/loadout/loadout_entry.dm index ca64bbdc684..de91d7ea0b2 100644 --- a/code/modules/loadout/loadout_entry.dm +++ b/code/modules/loadout/loadout_entry.dm @@ -55,6 +55,9 @@ var/list/gear_datums = list() if(!description) var/obj/O = path description = initial(O.desc) + if(!name) + var/obj/O = path + name = initial(O.name) if(isnull(display_name)) display_name = name diff --git a/code/modules/loadout/loadout_instruments.dm b/code/modules/loadout/loadout_instruments.dm new file mode 100644 index 00000000000..ff53d7735c6 --- /dev/null +++ b/code/modules/loadout/loadout_instruments.dm @@ -0,0 +1,38 @@ +/datum/loadout_entry/instrument + abstract_type = /datum/loadout_entry/instrument + category = LOADOUT_CATEGORY_INSTRUMENTS + slot = SLOT_ID_HANDS + +/datum/loadout_entry/instrument/violin + path = /obj/item/instrument/violin + +/datum/loadout_entry/instrument/piano_synth + path = /obj/item/instrument/piano_synth + +/datum/loadout_entry/instrument/guitar + path = /obj/item/instrument/guitar + +/datum/loadout_entry/instrument/eguitar + path = /obj/item/instrument/eguitar + +/datum/loadout_entry/instrument/glockenspiel + path = /obj/item/instrument/glockenspiel + +/datum/loadout_entry/instrument/accordion + path = /obj/item/instrument/accordion + +/datum/loadout_entry/instrument/trumpet + path = /obj/item/instrument/trumpet + +/datum/loadout_entry/instrument/saxophone + path = /obj/item/instrument/saxophone + +/datum/loadout_entry/instrument/trombone + path = /obj/item/instrument/trombone + +/datum/loadout_entry/instrument/recorder + path = /obj/item/instrument/recorder + +/datum/loadout_entry/instrument/banjo + path = /obj/item/instrument/banjo +