shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15966 from SandPoot/accessory-equip

Browse Source 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
This commit is contained in:
Timothy Teakettle
2023-02-09 21:39:05 +00:00
committed by GitHub
parent 7e77bc8023 9e2851b76b
commit 390dcbcea0
16 changed files with 125 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/inventory.dm
+3 -1
View File
@@ -46,9 +46,11 @@
#define ITEM_SLOT_HANDCUFFED (1<<18)
/// Legcuff slot (bolas, beartraps)
#define ITEM_SLOT_LEGCUFFED (1<<19)
/// To attach to a jumpsuit
#define ITEM_SLOT_ACCESSORY (1<<20)
/// Total amount of slots
#define SLOTS_AMT 20 // Keep this up to date!
#define SLOTS_AMT 21 // Keep this up to date!
//SLOT GROUP HELPERS
#define ITEM_SLOT_POCKETS (ITEM_SLOT_LPOCKET|ITEM_SLOT_RPOCKET)
code/__DEFINES/loadout.dm
+3 -1
View File
@@ -4,10 +4,12 @@
#define LOADOUT_SUBCATEGORY_NONE "Miscellaneous"
#define LOADOUT_SUBCATEGORIES_NONE list("Miscellaneous")
//accessory
#define LOADOUT_CATEGORY_ACCESSORY "Accessory"
//backpack
#define LOADOUT_CATEGORY_BACKPACK "In backpack"
#define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory
#define LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES "Accessories" //maybe one day someone will make loadouts have accessory compatibility
#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS "Toys"
//neck
#define LOADOUT_CATEGORY_NECK "Neck"